Изменено условие использования сборки серверной или десктопной версии ядра

eclass/calculate-kernel-7.eclass

@@ -39,7 +39,7 @@ RDEPEND="${CDEPEND} vmlinuz? ( sys-kernel/dracut )"
 detect_version
 detect_arch
 
-IUSE="+vmlinuz pae minimal themes firmware +grub"
+IUSE="+vmlinuz desktop pae minimal themes firmware +grub"
 
 if [[ ${KV_MAJOR} -lt 3 ]]
 then

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae

@@ -1,2 +1,2 @@
-# Calculate format=kernel name=.config os_linux_system==desktop merge(sys-kernel/calculate-sources[pae])!=
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[pae,desktop])!=
 CONFIG_HIGHMEM64G=y

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server

@@ -1,4 +1,4 @@
-# Calculate format=kernel name=.config os_linux_system==server
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[-desktop])!=
 # CONFIG_BT is not set
 # CONFIG_GAMEPORT is not set
 # CONFIG_HZ_1000 is not set

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop merge(sys-kernel/calculate-sources[muqss])!=
+# Calculate format=diff merge(sys-kernel/calculate-sources[muqss,desktop])!=
 The MuQSS (Multiple Queue Skiplist Scheduler - pronounced mux) v0.162 by
 Con Kolivas.
 

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop merge(sys-kernel/calculate-sources[muqss])!=&&merge(sys-kernel/calculate-sources)>=4.14.15
+# Calculate format=diff merge(sys-kernel/calculate-sources[muqss,desktop])>=4.14.15
 From 25849740d77dfc089fdbfb53623e50d38a972aff Mon Sep 17 00:00:00 2001
 From: loqs <loqs@users.noreply.github.com>
 Date: Thu, 25 Jan 2018 18:09:55 +0000

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.15/20-pae

@@ -1,2 +1,2 @@
-# Calculate format=kernel name=.config os_linux_system==desktop merge(sys-kernel/calculate-sources[pae])!=
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[pae,desktop])!=
 CONFIG_HIGHMEM64G=y

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.15/30-server

@@ -1,4 +1,4 @@
-# Calculate format=kernel name=.config os_linux_system==server
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[-desktop])!=
 # CONFIG_BT is not set
 # CONFIG_GAMEPORT is not set
 # CONFIG_HZ_1000 is not set

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.15/4501_muqss.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop merge(sys-kernel/calculate-sources[muqss])!=
+# Calculate format=diff merge(sys-kernel/calculate-sources[muqss,desktop])!=
 From 1a62481815118810b99167748a74f907358c6198 Mon Sep 17 00:00:00 2001
 From: Con Kolivas <kernel@kolivas.org>
 Date: Sat, 17 Feb 2018 16:14:25 +1100

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.16/20-pae

@@ -1,2 +1,2 @@
-# Calculate format=kernel name=.config os_linux_system==desktop merge(sys-kernel/calculate-sources[pae])!=
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[pae,desktop])!=
 CONFIG_HIGHMEM64G=y

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.16/30-server

@@ -1,4 +1,4 @@
-# Calculate format=kernel name=.config os_linux_system==server
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[-desktop])!=
 # CONFIG_BT is not set
 # CONFIG_GAMEPORT is not set
 # CONFIG_HZ_1000 is not set

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop
+# Calculate format=diff merge(sys-kernel/calculate-sources[desktop])!=
 From 465ed48c05de63f5bdd34d83915f1b8998a62134 Mon Sep 17 00:00:00 2001
 From: Paolo Valente <paolo.valente@unimore.it>
 Date: Tue, 7 Apr 2015 13:39:12 +0200

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop
+# Calculate format=diff merge(sys-kernel/calculate-sources[desktop])!=
 From a43c7e21bccd510d72a003e350247b1b4c6b71c3 Mon Sep 17 00:00:00 2001
 From: Paolo Valente <paolo.valente@unimore.it>
 Date: Thu, 9 May 2013 19:10:02 +0200

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop
+# Calculate format=diff merge(sys-kernel/calculate-sources[desktop])!=
 From 52135041a6bf118c80a6858f63aff70b325389c4 Mon Sep 17 00:00:00 2001
 From: Mauro Andreolini <mauro.andreolini@unimore.it>
 Date: Sun, 6 Sep 2015 16:09:05 +0200

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop
+# Calculate format=diff merge(sys-kernel/calculate-sources[desktop])!=
 From 0432a5c7bfc4a11531c1e58f574c733a2552f149 Mon Sep 17 00:00:00 2001
 From: Paolo Valente <paolo.valente@linaro.org>
 Date: Tue, 17 May 2016 08:28:04 +0200

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq

@@ -1,4 +1,4 @@
-# Calculate format=kernel name=.config os_linux_system==desktop
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[desktop])!=
 CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_BFQ=y
 # CONFIG_DEFAULT_CFQ is not set

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae

@@ -1,2 +1,2 @@
-# Calculate format=kernel name=.config os_linux_system==desktop merge(sys-kernel/calculate-sources[pae])!=
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[pae,desktop])!=
 CONFIG_HIGHMEM64G=y

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop merge(sys-kernel/calculate-sources[muqss])!=
+# Calculate format=diff merge(sys-kernel/calculate-sources[muqss,desktop])!=
 The MuQSS (Multiple Queue Skiplist Scheduler - pronounced mux) v0.150 by
 Con Kolivas.
 

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server

@@ -1,4 +1,4 @@
-# Calculate format=kernel name=.config os_linux_system==server
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[-desktop])!=
 # CONFIG_BT is not set
 # CONFIG_GAMEPORT is not set
 # CONFIG_HZ_1000 is not set

profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server

@@ -1,4 +1,4 @@
-# Calculate format=kernel name=.config os_linux_system==server
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[-desktop])!=
 # CONFIG_BT is not set
 # CONFIG_GAMEPORT is not set
 # CONFIG_HZ_1000 is not set

profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop
+# Calculate format=diff merge(sys-kernel/calculate-sources[desktop])!=
 From f54f3003586bf00ba0ee5974a92b732477b834e3 Mon Sep 17 00:00:00 2001
 From: Paolo Valente <paolo.valente@unimore.it>
 Date: Tue, 7 Apr 2015 13:39:12 +0200

profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop
+# Calculate format=diff merge(sys-kernel/calculate-sources[desktop])!=
 From 03d30cc06a5436c05ee338bd21903802181bafe9 Mon Sep 17 00:00:00 2001
 From: Paolo Valente <paolo.valente@unimore.it>
 Date: Thu, 9 May 2013 19:10:02 +0200

profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff os_linux_system==desktop
+# Calculate format=diff merge(sys-kernel/calculate-sources[desktop])!=
 From d3deade9dc903f58c2bf79e316b785f6eaf2441f Mon Sep 17 00:00:00 2001
 From: Mauro Andreolini <mauro.andreolini@unimore.it>
 Date: Sun, 6 Sep 2015 16:09:05 +0200

profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.4/20-bfq

@@ -1,4 +1,4 @@
-# Calculate format=kernel name=.config os_linux_system==desktop
+# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[desktop])!=
 CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_BFQ=y
 # CONFIG_DEFAULT_CFQ is not set

sys-kernel/calculate-sources/metadata.xml

@@ -6,33 +6,27 @@
 		Full sources including the Calculate patchset for the kernel.
 	</longdescription>
 	<use>
-		<flag name='vmlinuz'>Build kernel, modules and initramfs</flag>
+		<flag name='desktop'>Desktop kernel configuration</flag>
 	</use>
 	<use>
-		<flag name='bfq'>Apply kernel patch for BFQ I/O scheduler</flag>
+		<flag name='firmware'>Install linux kernel firmware</flag>
 	</use>
 	<use>
-		<flag name='bfs'>Apply kernel patch for BF scheduler</flag>
+		<flag name='grub'>Adds sys-boot/grub dependence</flag>
 	</use>
 	<use>
-		<flag name='hardened'>Apply Gentoo's hardened patchset</flag>
+		<flag name='muqss'>Build kernel with MuQSS</flag>
 	</use>
 	<use>
-		<flag name='firmware'>Install linux kernel firmware</flag>
+		<flag name='pae'>Build kernel with PAE</flag>
 	</use>
 	<use>
 		<flag name='themes'>Adds Calculate themes dependence</flag>
 	</use>
-	<use>
-		<flag name='grub'>Adds sys-boot/grub dependence</flag>
-	</use>
 	<use>
 		<flag name='uksm'>Build kernel with UKSM</flag>
 	</use>
 	<use>
-		<flag name='pae'>Build kernel with PAE</flag>
-	</use>
-	<use>
-		<flag name='muqss'>Build kernel with MuQSS</flag>
+		<flag name='vmlinuz'>Build kernel, modules and initramfs</flag>
 	</use>
 </pkgmetadata>