From 57b3c458320219e9d12b8641f682eaeddd616cc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2015 05:17:52 +0100 Subject: less patching is good patching, disable patching of calamares modules configuration && create a sepparate package instead --- .../calamares-config-kogaion-2.0.ebuild | 25 ++++++++ .../files/modules/bootloader.conf | 26 ++++++++ .../files/modules/keyboard.conf | 8 +++ .../files/modules/packages.conf | 45 +++++++++++++ .../files/modules/removeuser.conf | 2 + .../files/modules/unpackfs.conf | 5 ++ .../calamares-config-kogaion/files/settings.conf | 73 ++++++++++++++++++++++ 7 files changed, 184 insertions(+) create mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild create mode 100644 app-misc/calamares-config-kogaion/files/modules/bootloader.conf create mode 100644 app-misc/calamares-config-kogaion/files/modules/keyboard.conf create mode 100644 app-misc/calamares-config-kogaion/files/modules/packages.conf create mode 100644 app-misc/calamares-config-kogaion/files/modules/removeuser.conf create mode 100644 app-misc/calamares-config-kogaion/files/modules/unpackfs.conf create mode 100644 app-misc/calamares-config-kogaion/files/settings.conf (limited to 'app-misc/calamares-config-kogaion') diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild new file mode 100644 index 00000000..f5d560ae --- /dev/null +++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="Kogaion Linux Calamares modules config" +HOMEPAGE="" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="app-admin/calamares" +RDEPEND="${DEPEND}" + +S="${FILESDIR}" + +src_install() { + dodir "/etc/calamares" || die + insinto "/etc/calamares" || die + doins -r "${S}/"* || die +} diff --git a/app-misc/calamares-config-kogaion/files/modules/bootloader.conf b/app-misc/calamares-config-kogaion/files/modules/bootloader.conf new file mode 100644 index 00000000..8ee8e661 --- /dev/null +++ b/app-misc/calamares-config-kogaion/files/modules/bootloader.conf @@ -0,0 +1,26 @@ +--- +# Define which bootloader you want to use for EFI installations +# Possible options are 'grub' and 'systemd-boot'. +efiBootLoader: "grub" + +# systemd-boot configuration files settings, set kernel and initramfs file names +# and amount of time before default selection boots +kernel: "/boot/bzImage" +img: "/boot/Initrd" +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. +# bootloaderEntryName: "Generic GNU/Linux" +# kernelLine: ", with Stable-Kernel" +# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)" + +# GRUB 2 binary names and boot directory +# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. +grubInstall: "grub2-install" +grubMkconfig: "grub2-mkconfig" +grubCfg: "/boot/grub/grub.cfg" +# Optionally set the --bootloader-id to use for EFI. If not set, this defaults +# to the bootloaderEntryName from branding.desc with problematic characters +# replaced. If an efiBootloaderId is specified here, it is taken to already be a +# valid directory name, so no such postprocessing is done in this case. +# efiBootloaderId: "dirname" diff --git a/app-misc/calamares-config-kogaion/files/modules/keyboard.conf b/app-misc/calamares-config-kogaion/files/modules/keyboard.conf new file mode 100644 index 00000000..ff60ed60 --- /dev/null +++ b/app-misc/calamares-config-kogaion/files/modules/keyboard.conf @@ -0,0 +1,8 @@ +--- +# The name of the file to write X11 keyboard settings to +# The default value is the name used by upstream systemd-localed. +# Relative paths are assumed to be relative to /etc/X11/xorg.conf.d +xOrgConfFileName: "/usr/share/X11/xorg.conf.d/00-keyboard.conf" +# The path to search for keymaps converted from X11 to kbd format +# Leave this empty if the setting does not make sense on your distribution. +convertedKeymapPath: "/usr/share/keymaps/" diff --git a/app-misc/calamares-config-kogaion/files/modules/packages.conf b/app-misc/calamares-config-kogaion/files/modules/packages.conf new file mode 100644 index 00000000..f8c72ad0 --- /dev/null +++ b/app-misc/calamares-config-kogaion/files/modules/packages.conf @@ -0,0 +1,45 @@ +--- +# +# Which package manager to use, options are: +# - packagekit - PackageKit CLI tool +# - zypp - Zypp RPM frontend +# - yum - Yum RPM frontend +# - dnf - DNF, the new RPM frontend +# - urpmi - Mandriva package manager +# - apt - APT frontend for DEB and RPM +# - pacman - Pacman +# - portage - Gentoo package manager +# - entropy - Sabayon package manager +# +backend: entropy +# +# List of maps with package operations such as install or remove. +# Distro developers can provide a list of packages to remove +# from the installed system (for instance packages meant only +# for the live system). +# +# A job implementing a distro specific logic to determine other +# packages that need to be installed or removed can run before +# this one. Distro developers may want to install locale packages +# or remove drivers not needed on the installed system. +# This job will populate a list of dictionaries in the global +# storage called "packageOperations" and it is processed +# after the static list in the job configuration. +# +#operations: +# - install: +# - pkg1 +# - pkg2 +# - remove: +# - pkg3 +# - pkg4 +# - install: +# - pkg5 +# - remove: +# - pkg2 +# - pkg1 +# install: +# - pkgs6 +# - pkg7 +# - localInstall: +# - /path/to/pkg8 diff --git a/app-misc/calamares-config-kogaion/files/modules/removeuser.conf b/app-misc/calamares-config-kogaion/files/modules/removeuser.conf new file mode 100644 index 00000000..748822da --- /dev/null +++ b/app-misc/calamares-config-kogaion/files/modules/removeuser.conf @@ -0,0 +1,2 @@ +--- +username: kogaionuser diff --git a/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf b/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf new file mode 100644 index 00000000..641f5ae0 --- /dev/null +++ b/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf @@ -0,0 +1,5 @@ +--- +unpack: + - source: "/mnt/cdrom/livecd.squashfs" + sourcefs: "squashfs" + destination: "" diff --git a/app-misc/calamares-config-kogaion/files/settings.conf b/app-misc/calamares-config-kogaion/files/settings.conf new file mode 100644 index 00000000..94ef7951 --- /dev/null +++ b/app-misc/calamares-config-kogaion/files/settings.conf @@ -0,0 +1,73 @@ +# Configuration file for Calamares +# Syntax is YAML 1.2 +--- +# Modules can be job modules (with different interfaces) and QtWidgets view modules. +# They could all be placed in a number of different paths. +# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules +modules-search: [ local ] + +# We define the module names in the order they should show up (QtWidget view modules, +# with one or more pages) OR be executed if enqueued (all other modules). +# Pages can also enqueue jobs for delayed execution in the order specified for the +# install phase. + +# Phase 1 - prepare. +# View modules are shown as UI pages, jobs from job modules are executed immediately in +# the background. +# Jobs should be executed sparingly (if at all) in this phase. +prepare: +- welcome +- locale +- keyboard +- partition +- users +- summary + +# Phase 2 - install. +# View modules are not shown. Only the view modules shown in the previous phase are +# allowed, their names should be added here as placeholders to specify the order in +# which view module jobs should be enqueued. Job modules are also allowed. +install: +#- dummyprocess +#- dummypython +- partition +- mount +- unpackfs +- machineid +- fstab +- locale +- keyboard +- localecfg +#- initcpiocfg +#- initcpio +- users +- displaymanager +- networkcfg +- hwclock +- services +#- dracut +#- initramfs +- grubcfg +- bootloader +- umount + +# Phase 3 - postinstall. +# View modules are shown as UI pages, jobs from job modules are executed immediately in +# the background. +# Jobs should be executed sparingly (if at all) in this phase. +postinstall: +- finished + + +# A branding component is a directory, either in SHARE/calamares/branding or in +# /etc/calamares/branding (the latter takes precedence). The directory must contain a +# YAML file branding.desc which may reference additional resources (such as images) as +# paths relative to the current directory. +# Only the name of the branding component (directory) should be specified here, Calamares +# then takes care of finding it and loading the contents. +branding: kogaion_branding + +# If this is set to true, Calamares will show an "are you sure?" prompt right before the +# install phase, i.e. at the point of no return. If it's false, no prompt is shown. +# Default is false. +prompt-install: false -- cgit v1.2.3 From e9db7e0b938f6021f5ec9efbf65f96d1d0c250f6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2015 05:45:00 +0100 Subject: remove circular dep between calamares && calamares-config-kogaion --- app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app-misc/calamares-config-kogaion') diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild index f5d560ae..e46b065f 100644 --- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild +++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0.ebuild @@ -13,8 +13,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="app-admin/calamares" -RDEPEND="${DEPEND}" +RDEPEND="app-admin/calamares" S="${FILESDIR}" -- cgit v1.2.3