[gentoo-dev] [PATCH 0/5] (linux-mod.eclass) Subslot module rebuilds for dist-kernel

[gentoo-dev] [PATCH 0/5] (linux-mod.eclass) Subslot module rebuilds for dist-kernel

[Michał Górny]

Hello,

Here's a proposal to add support for automatically rebuilding kernel
modules when dist-kernels are upgraded.  The behavior is entirely
opt-in, so the users of other kernels are not affected.

The proposal adds a new global flag 'dist-kernel'.  It is off by default
and has no functional effect for people who do not enable it.  However,
when it is enabled, it causes linux-mod.eclass to inject a := dependency
on virtual/dist-kernel in the packages installing kernel modules.

When the user upgrades one of the dist-kernel packages to a newer
version, an update of virtual/dist-kernel is triggered.  This in turn
causes a change of subslot and provokes rebuilds of all kernel modules.

This represents the next step towards enabling kernel maintenance free
of manual intervention.


Michał Górny (5):
  virtual/dist-kernel: New virtual
  sys-kernel/gentoo-kernel: Add a PDEP on virtual/prebuilt-kernel
  sys-kernel/gentoo-kernel-bin: Add a PDEP on virtual/prebuilt-kernel
  sys-kernel/vanilla-kernel: Add a PDEP on virtual/prebuilt-kernel
  linux-mod.eclass: Add a prebuilt-kernel rebuild flag

 eclass/linux-mod.eclass                       | 13 ++++++++++---
 profiles/arch/amd64/use.mask                  |  4 ++++
 profiles/arch/amd64/use.stable.mask           |  6 +++++-
 profiles/arch/base/use.mask                   |  6 +++++-
 profiles/arch/powerpc/ppc64/64le/package.mask |  1 +
 profiles/arch/powerpc/ppc64/package.mask      |  1 +
 profiles/use.desc                             |  1 +
 .../gentoo-kernel-bin-5.10.4-r1.ebuild        |  2 ++
 .../gentoo-kernel-bin-5.10.4.ebuild           |  2 ++
 .../gentoo-kernel-bin-5.4.86-r1.ebuild        |  2 ++
 .../gentoo-kernel-bin-5.4.86.ebuild           |  2 ++
 .../gentoo-kernel/gentoo-kernel-5.10.4.ebuild |  2 ++
 .../gentoo-kernel/gentoo-kernel-5.4.86.ebuild |  2 ++
 .../vanilla-kernel-5.10.4.ebuild              |  2 ++
 .../vanilla-kernel-5.4.86.ebuild              |  2 ++
 virtual/dist-kernel/dist-kernel-5.10.4.ebuild | 19 +++++++++++++++++++
 virtual/dist-kernel/dist-kernel-5.4.86.ebuild | 19 +++++++++++++++++++
 virtual/dist-kernel/metadata.xml              |  8 ++++++++
 18 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 virtual/dist-kernel/dist-kernel-5.10.4.ebuild
 create mode 100644 virtual/dist-kernel/dist-kernel-5.4.86.ebuild
 create mode 100644 virtual/dist-kernel/metadata.xml

-- 
2.30.0

[gentoo-dev] [PATCH 1/5] virtual/dist-kernel: New virtual

[Michał Górny]

Add a new virtual that can be used to provide subslot rebuilds
for kernel modules.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 profiles/arch/powerpc/ppc64/64le/package.mask |  1 +
 profiles/arch/powerpc/ppc64/package.mask      |  1 +
 virtual/dist-kernel/dist-kernel-5.10.4.ebuild | 19 +++++++++++++++++++
 virtual/dist-kernel/dist-kernel-5.4.86.ebuild | 19 +++++++++++++++++++
 virtual/dist-kernel/metadata.xml              |  8 ++++++++
 5 files changed, 48 insertions(+)
 create mode 100644 virtual/dist-kernel/dist-kernel-5.10.4.ebuild
 create mode 100644 virtual/dist-kernel/dist-kernel-5.4.86.ebuild
 create mode 100644 virtual/dist-kernel/metadata.xml

diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 784790b1ea86..c42fe27f4868 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -17,6 +17,7 @@
 # little-endian power8 ppc64 configs are provided
 -sys-kernel/gentoo-kernel
 -sys-kernel/vanilla-kernel
+-virtual/dist-kernel
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
 # libva unmasked on little-endian profile
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index f36237c2c003..f78c971cc95f 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -16,6 +16,7 @@ dev-java/openjfx:11
 # however users can unmask and use savedconfig feature
 sys-kernel/gentoo-kernel
 sys-kernel/vanilla-kernel
+virtual/dist-kernel
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
 # buggy on big-endian
diff --git a/virtual/dist-kernel/dist-kernel-5.10.4.ebuild b/virtual/dist-kernel/dist-kernel-5.10.4.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.86.ebuild b/virtual/dist-kernel/dist-kernel-5.4.86.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.86.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/metadata.xml b/virtual/dist-kernel/metadata.xml
new file mode 100644
index 000000000000..20e07cdc2be9
--- /dev/null
+++ b/virtual/dist-kernel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>dist-kernel@gentoo.org</email>
+		<name>Distribution Kernel Project</name>
+	</maintainer>
+</pkgmetadata>
-- 
2.30.0

[gentoo-dev] [PATCH 2/5] sys-kernel/gentoo-kernel: Add a PDEP on virtual/prebuilt-kernel

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild | 2 ++
 sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
index 5ec7b92ee625..7bf6ab8f32ed 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
@@ -47,6 +47,8 @@ RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
 BDEPEND="
 	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 src_prepare() {
 	local PATCHES=(
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
index 0c806189a34d..5878b6bcd6c1 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
 BDEPEND="
 	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 pkg_pretend() {
 	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-- 
2.30.0

[gentoo-dev] [PATCH 3/5] sys-kernel/gentoo-kernel-bin: Add a PDEP on virtual/prebuilt-kernel

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild | 2 ++
 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild    | 2 ++
 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild | 2 ++
 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild    | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild
index 1b430cf56222..7be52665980a 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild
@@ -22,6 +22,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild
index 68ca59b57351..f663ccda5cc5 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild
index 2378adc3f352..91ed43da6b79 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild
@@ -30,6 +30,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild
index d6e61fa69369..2f563a9ece0d 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
-- 
2.30.0

[gentoo-dev] [PATCH 4/5] sys-kernel/vanilla-kernel: Add a PDEP on virtual/prebuilt-kernel

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild | 2 ++
 sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild
index cc953811ce28..7d34d6e93d00 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild
@@ -48,6 +48,8 @@ RDEPEND="
 BDEPEND="
 	debug? ( dev-util/dwarves )
 	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
 
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
index 7f4ea0861252..eedfdb40bc65 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
 BDEPEND="
 	debug? ( dev-util/dwarves )
 	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
 
-- 
2.30.0

[gentoo-dev] [PATCH 5/5] linux-mod.eclass: Add a prebuilt-kernel rebuild flag

[Michał Górny]

Add a 'prebuilt-kernel' USE flag that controls a bound-slot dependency
on virtual/prebuilt-kernel.  If the flag is enabled, it should ensure
that the module will be rebuilt automatically on future kernel upgrades.

TODO: unmask the flag on other architectures

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/linux-mod.eclass             | 13 ++++++++++---
 profiles/arch/amd64/use.mask        |  4 ++++
 profiles/arch/amd64/use.stable.mask |  6 +++++-
 profiles/arch/base/use.mask         |  6 +++++-
 profiles/use.desc                   |  1 +
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index f5a5a4276369..e0444eacc61a 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: linux-mod.eclass
@@ -144,9 +144,16 @@ esac
 	0) die "EAPI=${EAPI} is not supported with MODULES_OPTIONAL_USE_IUSE_DEFAULT due to lack of IUSE defaults" ;;
 esac
 
-IUSE="kernel_linux ${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}"
+IUSE="kernel_linux dist-kernel
+	${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}"
 SLOT="0"
-RDEPEND="${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} kernel_linux? ( sys-apps/kmod[tools] ) ${MODULES_OPTIONAL_USE:+)}"
+RDEPEND="
+	${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (}
+		kernel_linux? (
+			sys-apps/kmod[tools]
+			dist-kernel? ( virtual/dist-kernel:= )
+		)
+	${MODULES_OPTIONAL_USE:+)}"
 DEPEND="${RDEPEND}
     ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (}
 	sys-apps/sed
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 2334ab319381..e4f5aa002053 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -6,6 +6,10 @@
 
 # SECTION: Unmask
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-03)
+# Prebuilt kernels are supported here.
+-dist-kernel
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl works on amd64
 -mkl
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index b83b8507d91c..07bd75f7024c 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-03)
+# Prebuilt kernel rebuilds are supported on stable yet.
+dist-kernel
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index ba124ae0487a..704b33512f21 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-03)
+# Prebuilt kernels are not supported on all architectures.
+dist-kernel
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is only supported on specific architectures
 mkl
diff --git a/profiles/use.desc b/profiles/use.desc
index e51db5982020..a1ea2238b3ee 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -62,6 +62,7 @@ dbus - Enable dbus support for anything that needs it (gpsd, gnomemeeting, etc)
 debug - Enable extra debug codepaths, like asserts and extra output. If you want to get meaningful backtraces see https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Backtraces
 dedicated - Add support for dedicated game servers (some packages do not provide clients and servers at the same time)
 dga - Add DGA (Direct Graphic Access) support for X
+dist-kernel - Enable subslot rebuilds on Distribution Kernel upgrades
 djvu - Support DjVu, a PDF-like document format esp. suited for scanned documents
 doc - Add extra documentation (API, Javadoc, etc). It is recommended to enable per package instead of globally
 dri - Enable direct rendering: used for accelerated 3D and some 2D, like DMA
-- 
2.30.0