From 30e59401e7cd92ff8deed6d3e33a0955169274f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Aug 2016 13:06:14 +0100 Subject: configure calamares hooks --- .../calamares-config-kogaion-3.0-r6.ebuild | 24 ---- .../calamares-config-kogaion-3.1.ebuild | 24 ++++ .../files/modules/bootloader.conf | 4 +- .../files/modules/displaymanager.conf | 1 - .../files/modules/packages.conf | 25 ---- .../calamares-config-kogaion/files/settings.conf | 138 ++++++++++++++------- 6 files changed, 119 insertions(+), 97 deletions(-) delete mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r6.ebuild create mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-3.1.ebuild (limited to 'app-misc') diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r6.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r6.ebuild deleted file mode 100644 index 11600728..00000000 --- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r6.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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="" - -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-kogaion/calamares-config-kogaion-3.1.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.1.ebuild new file mode 100644 index 00000000..11600728 --- /dev/null +++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.1.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="Kogaion 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-kogaion/files/modules/bootloader.conf b/app-misc/calamares-config-kogaion/files/modules/bootloader.conf index 134ae9a9..57c162da 100644 --- a/app-misc/calamares-config-kogaion/files/modules/bootloader.conf +++ b/app-misc/calamares-config-kogaion/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-3.14.50-kogaion" -img: "/boot/initramfs-genkernel-x86_64-3.14.50-kogaion" +kernel: "/boot/kernel-genkernel-x86_64-4.4.4-kogaion" +img: "/boot/initramfs-genkernel-x86_64-4.4.4-kogaion" 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-kogaion/files/modules/displaymanager.conf b/app-misc/calamares-config-kogaion/files/modules/displaymanager.conf index dc53dbb5..2e764a9b 100644 --- a/app-misc/calamares-config-kogaion/files/modules/displaymanager.conf +++ b/app-misc/calamares-config-kogaion/files/modules/displaymanager.conf @@ -4,7 +4,6 @@ #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. displaymanagers: - lightdm - - lxdm #Enable the following settings to force a desktop environment in your displaymanager configuration file: #defaultDesktopEnvironment: diff --git a/app-misc/calamares-config-kogaion/files/modules/packages.conf b/app-misc/calamares-config-kogaion/files/modules/packages.conf index 937eb1f6..eaec5a1f 100644 --- a/app-misc/calamares-config-kogaion/files/modules/packages.conf +++ b/app-misc/calamares-config-kogaion/files/modules/packages.conf @@ -32,31 +32,6 @@ operations: - app-misc/calamares-config-kogaion - app-misc/calamares-runtime - app-misc/kogaion-live - - dev-cpp/yaml-cpp - - dev-qt/designer:5 - - dev-qt/linguist-tools:5 - - dev-qt/qtconcurrent:5 - - dev-qt/qtcore:5 - - dev-qt/qtdbus:5 - - dev-qt/qtdeclarative:5 - - dev-qt/qtgui:5 - - dev-qt/qtnetwork:5 - - dev-qt/qtopengl:5 - - dev-qt/qtprintsupport:5 - - dev-qt/qtscript:5 - - dev-qt/qtsvg:5 - - dev-qt/qttest:5 - - dev-qt/qtwidgets:5 - - dev-qt/qtxml:5 - - dev-qt/qtxmlpatterns:5 - - kde-frameworks/extra-cmake-modules - - kde-frameworks/kconfig - - kde-frameworks/kcoreaddons - - kde-frameworks/kf-env - - kde-frameworks/ki18n - - kde-frameworks/solid - - sys-apps/dmidecode - - sys-auth/polkit-qt5 - x11-themes/kogaion-artwork-calamares # - install: # - pkg1 diff --git a/app-misc/calamares-config-kogaion/files/settings.conf b/app-misc/calamares-config-kogaion/files/settings.conf index 9e485c60..4631ab9c 100644 --- a/app-misc/calamares-config-kogaion/files/settings.conf +++ b/app-misc/calamares-config-kogaion/files/settings.conf @@ -3,63 +3,111 @@ --- # 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" is a list of strings, each of these can either be a full path to a +# directory or the keyword "local". +# "local" means LIBDIR/calamares/modules with settings in SHARE/calamares/modules or +# /etc/calamares/modules. +# YAML: list of strings. 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. +# Instances section. This section is optional, and it defines custom instances for +# modules of any kind. An instance entry has an instance name, a module name, and +# a configuration file name. +# The primary goal of this mechanism is to allow loading multiple instances of the +# same module, with different configuration. If you don't need this, the instances +# section can safely be left empty. +# Module name plus instance name makes an instance key, e.g. "webview@owncloud", +# where "webview" is the module name (for the webview viewmodule) and "owncloud" +# is the instance name, which loads a configuration file named "owncloud.conf" from +# any of the configuration file paths, including the webview module directory. +# This instance key can then be referenced in the sequence section. +# For all modules without a custom instance specification, a default instance is +# generated automatically by Calamares. Therefore a statement such as "webview" in +# the sequence section automatically implies an instance key of "webview@webview" +# even without explicitly defining this instance, and the configuration file for +# this default instance "@" is always assumed to be +# ".conf". +# For more information on running module instances, run Calamares in debug mode +# and check the Modules page in the Debug information interface. +# YAML: list of maps of string:string key-value pairs. -# 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: -- partition -- mount -- unpackfs -- machineid -- fstab -- locale -- keyboard -- localecfg -- users -#- displaymanager -- hwclock -- packages -- 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 +#instances: +#- id: owncloud +# module: webview +# config: owncloud.conf +# Sequence section. This section describes the sequence of modules, both +# viewmodules and jobmodules, as they should appear and/or run. +# A jobmodule instance key (or name) can only appear in an exec phase, whereas +# a viewmodule instance key (or name) can appear in both exec and show phases. +# There is no limit to the number of show or exec phases. However, the same module +# instance key should not appear more than once per phase, and deployers should +# take notice that the global storage structure is persistent throughout the +# application lifetime, possibly influencing behavior across phases. +# A show phase defines a sequence of viewmodules (and therefore pages). These +# viewmodules can offer up jobs for the execution queue. +# An exec phase displays a progress page (with brandable slideshow). This progress +# page iterates over the modules listed in the *immediately preceding* show phase, +# and enqueues their jobs, as well as any other jobs from jobmodules, in the order +# defined in the current exec phase. +# It then executes the job queue and clears it. If a viewmodule offers up a job +# for execution, but the module name (or instance key) isn't listed in the +# immediately following exec phase, this job will not be executed. +# WARNING: when upgrading from Calamares 1.1, this section requires manual +# intervention. There are no fixed prepare/install/postinstall phases any more, +# and all limitations on the number of phases, number of pages, and number of +# instances are lifted. +# YAML: list of lists of strings. +sequence: +- show: + - welcome + - locale + - keyboard + - partition + - users + - summary +- exec: + - partition + - mount + - unpackfs + - machineid + - fstab + - locale + - keyboard + - localecfg + - users +# - displaymanager + - hwclock + - dracut + - bootloader + - umount +- show: + - 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. +# A branding component can also ship a QML slideshow for execution pages, along with +# translation files. # Only the name of the branding component (directory) should be specified here, Calamares # then takes care of finding it and loading the contents. +# YAML: string. 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. +# If this is set to true, Calamares will show an "Are you sure?" prompt right before +# each execution phase, i.e. at points of no return. If this is set to false, no prompt +# is shown. # Default is false. +# YAML: boolean. prompt-install: true + +# If this is set to true, Calamares will execute all target environment commands in the +# current environment, without chroot. This setting is considered experimental, and it +# should only be used when setting up Calamares as a post-install configuration tool, as +# opposed to a full operating system installer. +# Some official Calamares modules are not expected to function with this setting. +# Packagers beware, here be dragons. +# Default is false. +# YAML: boolean. +dont-chroot: false -- cgit v1.2.3