From 63fa236a7c452e9819a1e937e69847b2f8696a09 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Jun 2017 13:22:38 +0100 Subject: adjust calamares-config-redcore && calamares-runtime packages to v3.1.0 of calamares --- .../calamares-config-redcore-1706.ebuild | 24 +++++++++ .../files/modules/bootloader.conf | 4 +- .../files/modules/machineid.conf | 8 +++ .../files/modules/users.conf | 1 - .../files/modules/welcome.conf | 1 + .../calamares-runtime-1706.ebuild | 59 ++++++++++++++++++++++ 6 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 app-misc/calamares-config-redcore/calamares-config-redcore-1706.ebuild create mode 100644 app-misc/calamares-config-redcore/files/modules/machineid.conf create mode 100644 app-misc/calamares-runtime/calamares-runtime-1706.ebuild diff --git a/app-misc/calamares-config-redcore/calamares-config-redcore-1706.ebuild b/app-misc/calamares-config-redcore/calamares-config-redcore-1706.ebuild new file mode 100644 index 00000000..9f6639d2 --- /dev/null +++ b/app-misc/calamares-config-redcore/calamares-config-redcore-1706.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="Redcore Linux Calamares modules config" +HOMEPAGE="" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="app-admin/calamares" + +S="${FILESDIR}" + +src_install() { + dodir "/etc/calamares" || die + insinto "/etc/calamares" || die + doins -r "${S}/"* || die +} diff --git a/app-misc/calamares-config-redcore/files/modules/bootloader.conf b/app-misc/calamares-config-redcore/files/modules/bootloader.conf index 5798c14f..85db8995 100644 --- a/app-misc/calamares-config-redcore/files/modules/bootloader.conf +++ b/app-misc/calamares-config-redcore/files/modules/bootloader.conf @@ -5,8 +5,8 @@ efiBootLoader: "grub" # systemd-boot configuration files settings, set kernel and initramfs file names # and amount of time before default selection boots -kernel: "/boot/kernel-genkernel-x86_64-4.9.15-redcore" -img: "/boot/initramfs-genkernel-x86_64-4.9.15-redcore" +kernel: "/boot/kernel-genkernel-x86_64-4.9.30-redcore" +img: "/boot/initramfs-genkernel-x86_64-4.9.30-redcore" timeout: "10" # Optionally set the menu entry name and kernel name to use in systemd-boot. # If not specified here, these settings will be taken from branding.desc. diff --git a/app-misc/calamares-config-redcore/files/modules/machineid.conf b/app-misc/calamares-config-redcore/files/modules/machineid.conf new file mode 100644 index 00000000..341caf7e --- /dev/null +++ b/app-misc/calamares-config-redcore/files/modules/machineid.conf @@ -0,0 +1,8 @@ +--- +# Whether to create /etc/machine-id for systemd. +systemd: false +# Whether to create /var/lib/dbus/machine-id for D-Bus. +dbus: true +# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id +# (ignored if dbus is false, or if there is no /etc/machine-id to point to). +symlink: true diff --git a/app-misc/calamares-config-redcore/files/modules/users.conf b/app-misc/calamares-config-redcore/files/modules/users.conf index 048a3d75..6c220e27 100644 --- a/app-misc/calamares-config-redcore/files/modules/users.conf +++ b/app-misc/calamares-config-redcore/files/modules/users.conf @@ -1,5 +1,4 @@ --- -userGroup: users defaultGroups: - lp - video diff --git a/app-misc/calamares-config-redcore/files/modules/welcome.conf b/app-misc/calamares-config-redcore/files/modules/welcome.conf index 7e4f3404..d7940420 100644 --- a/app-misc/calamares-config-redcore/files/modules/welcome.conf +++ b/app-misc/calamares-config-redcore/files/modules/welcome.conf @@ -6,6 +6,7 @@ showReleaseNotesUrl: true requirements: requiredStorage: 10.0 requiredRam: 1.0 + internetCheckUrl: http://google.com check: - storage - ram diff --git a/app-misc/calamares-runtime/calamares-runtime-1706.ebuild b/app-misc/calamares-runtime/calamares-runtime-1706.ebuild new file mode 100644 index 00000000..15bb23da --- /dev/null +++ b/app-misc/calamares-runtime/calamares-runtime-1706.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python3_4 ) + +DESCRIPTION="Calamares distribution-independent installer framework runtime meta-package (containing all the runtime dependencies)" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="+branding +python" + +DEPEND="" +RDEPEND=" + python? ( + >=dev-libs/boost-1.55.0-r2[python_targets_python3_4] + ) + branding? ( >=x11-themes/redcore-artwork-calamares-1.0 ) + >=app-misc/calamares-config-redcore-1.0 + >=dev-qt/designer-5.6.0:5 + >=dev-qt/linguist-tools-5.6.0:5 + >=dev-qt/qtconcurrent-5.6.0:5 + >=dev-qt/qtcore-5.6.0:5 + >=dev-qt/qtdbus-5.6.0:5 + >=dev-qt/qtdeclarative-5.6.0:5 + >=dev-qt/qtgui-5.6.0:5 + >=dev-qt/qtnetwork-5.6.0:5 + >=dev-qt/qtopengl-5.6.0:5 + >=dev-qt/qtprintsupport-5.6.0:5 + >=dev-qt/qtscript-5.6.0:5 + >=dev-qt/qtsvg-5.6.0:5 + >=dev-qt/qttest-5.6.0:5 + >=dev-qt/qtwebengine-5.6.0:5 + >=dev-qt/qtwebchannel-5.6.0:5 + >=dev-qt/qtwidgets-5.6.0:5 + >=dev-qt/qtxml-5.6.0:5 + >=dev-qt/qtxmlpatterns-5.6.0:5 + >=dev-cpp/yaml-cpp-0.5.1 + >=dev-libs/libatasmart-0.19 + >=kde-frameworks/kconfig-5.18.0 + >=kde-frameworks/ki18n-5.18.0 + >=kde-frameworks/kcoreaddons-5.18.0 + >=kde-frameworks/kparts-5.18.0 + >=kde-frameworks/solid-5.18.0 + >=net-misc/rsync-3.1[xattr] + >=sys-block/parted-3.0 + >=sys-apps/gptfdisk-0.8.10 + >=sys-apps/dmidecode-2.12-r1 + >=sys-fs/squashfs-tools-4.3:0[xattr] + >=sys-power/upower-0.99.0-r1 + >=sys-libs/kpmcore-3.0.2 + sys-boot/os-prober + sys-auth/polkit-qt5 + sys-fs/udisks:2 + virtual/udev" -- cgit v1.2.3