commit: bdb8aeba6fabfd4695add019170706afb805b432
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 20:30:07 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 20:30:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb8aeba
sys-kernel/installkernel: explicitly pull in plugin rdeps
Too many people have complained this is confusing. The original
to do it this way was because the grub flag does it this way.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
profiles/arch/amd64/package.use.mask | 1 +
profiles/arch/arm/package.use.mask | 1 +
profiles/arch/arm64/package.use.mask | 3 ++-
profiles/arch/base/package.use.mask | 1 +
profiles/arch/loong/package.use.mask | 1 +
profiles/arch/riscv/package.use.mask | 1 +
profiles/arch/s390/package.use.mask | 4 ++++
profiles/arch/x86/package.use.mask | 1 +
.../{installkernel-14-r1.ebuild => installkernel-14-r2.ebuild} | 7 +++++++
9 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/profiles/arch/amd64/package.use.mask
b/profiles/arch/amd64/package.use.mask
index e29940c01844..d4342c7d883c 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -398,6 +398,7 @@ sys-boot/grub:2 -grub_platforms_xen-32
# sd-boot is not supported on all archs.
sys-apps/systemd -boot -gnuefi -ukify
sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
# Ben de Groot <[email protected]> (2015-03-15)
# media-libs/libbdplus is keyworded on amd64, so unmask the useflag
diff --git a/profiles/arch/arm/package.use.mask
b/profiles/arch/arm/package.use.mask
index 97cd804fbc99..43c53495a4f5 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -139,6 +139,7 @@ net-im/prosody selinux
# bug #729720
sys-apps/systemd -boot -gnuefi -ukify
sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
# Joonas Niilola <[email protected]> (2021-01-15)
# Dependency not keyworded on this arch.
diff --git a/profiles/arch/arm64/package.use.mask
b/profiles/arch/arm64/package.use.mask
index 11f13e8431bc..f81227a0ad83 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Andrew Ammerlaan <[email protected]> (2023-12-18)
@@ -167,6 +167,7 @@ media-sound/bluez-alsa man
# bug #729720
sys-apps/systemd -boot -gnuefi -ukify
sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
# Joonas Niilola <[email protected]> (2021-01-15)
# Dependency not keyworded on this arch.
diff --git a/profiles/arch/base/package.use.mask
b/profiles/arch/base/package.use.mask
index 7d3c676a98fb..d7c804f7b184 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -369,6 +369,7 @@ net-misc/moonlight mmal
# sd-boot and ukify are not supported on all archs.
sys-apps/systemd boot gnuefi ukify
sys-apps/systemd-utils boot ukify
+sys-kernel/installkernel ukify
# Ben de Groot <[email protected]> (2015-03-15)
# Mask bdplus support and unmask on arches where libbdplus is keyworded.
diff --git a/profiles/arch/loong/package.use.mask
b/profiles/arch/loong/package.use.mask
index 44dc74f4cdd8..c4927819cfed 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -111,6 +111,7 @@ app-accessibility/at-spi2-core dbus-broker
# Newer sd-boot does not use gnuefi.
>=sys-apps/systemd-254 -boot -ukify
>=sys-apps/systemd-utils-254 -boot -ukify
+sys-kernel/installkernel -ukify
# WANG Xuerui <[email protected]> (2023-04-16)
# dev-python/pyopengl fails tests
diff --git a/profiles/arch/riscv/package.use.mask
b/profiles/arch/riscv/package.use.mask
index 91d340e233d9..c40de70a3264 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -34,6 +34,7 @@ media-video/mpv lua_single_target_luajit
-lua_single_target_lua5-1
# sd-boot should work here.
sys-apps/systemd -boot -boot -ukify
sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
# Sam James <[email protected]> (2023-05-10)
# sys-cluster/ceph not keyworded here
diff --git a/profiles/arch/s390/package.use.mask
b/profiles/arch/s390/package.use.mask
index eea643e25034..cc653abdeb60 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Andrew Ammerlaan <[email protected]> (2024-01-12)
+# dracut is not keyworded here
+sys-kernel/installkernel dracut
+
# Sam James <[email protected]> (2024-01-02)
# dev-libs/capstone not keyworded here
dev-lang/php capstone
diff --git a/profiles/arch/x86/package.use.mask
b/profiles/arch/x86/package.use.mask
index c830edbb21f8..2ecea2704d65 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -382,6 +382,7 @@ app-emulation/libvirt xen
# sys-boot/gnu-efi is not supported on all archs.
sys-apps/systemd -boot -gnuefi -ukify
sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
# Ben de Groot <[email protected]> (2015-03-15)
# media-libs/libbdplus is keyworded on x86, so unmask the useflag
diff --git a/sys-kernel/installkernel/installkernel-14-r1.ebuild
b/sys-kernel/installkernel/installkernel-14-r2.ebuild
similarity index 94%
rename from sys-kernel/installkernel/installkernel-14-r1.ebuild
rename to sys-kernel/installkernel/installkernel-14-r2.ebuild
index cb9f31daa48c..05307034f5e5 100644
--- a/sys-kernel/installkernel/installkernel-14-r1.ebuild
+++ b/sys-kernel/installkernel/installkernel-14-r2.ebuild
@@ -16,12 +16,19 @@ IUSE="+dracut grub systemd uki ukify"
RDEPEND="
>=sys-apps/debianutils-4.9-r1
+ dracut? ( >=sys-kernel/dracut-059-r4 )
systemd? (
|| (
sys-apps/systemd[kernel-install(-)]
sys-apps/systemd-utils[kernel-install(-)]
)
)
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
"
src_install() {
