commit:     9eecbd127bf2850575261212cb14cae74415bf71
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 13:06:14 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:08:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eecbd12

profiles/arch: mask uki on arches where no sd-boot

sd-stub is needed for building ukis

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 profiles/arch/amd64/package.use.mask | 2 +-
 profiles/arch/arm/package.use.mask   | 2 +-
 profiles/arch/arm64/package.use.mask | 2 +-
 profiles/arch/base/package.use.mask  | 2 +-
 profiles/arch/loong/package.use.mask | 2 +-
 profiles/arch/riscv/package.use.mask | 2 +-
 profiles/arch/x86/package.use.mask   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index 9832b94284fd..413b22a93fdc 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -414,7 +414,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 -systemd-boot -ukify
+sys-kernel/installkernel -systemd-boot -ukify -uki
 
 # 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 fc7419122e42..f1a7654fc0b9 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -159,7 +159,7 @@ net-im/prosody selinux
 # bug #729720
 sys-apps/systemd -boot -gnuefi -ukify
 sys-apps/systemd-utils -boot -ukify
-sys-kernel/installkernel -systemd-boot -ukify
+sys-kernel/installkernel -systemd-boot -ukify -uki
 
 # 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 cb9d953273ac..0940ab8031e2 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -195,7 +195,7 @@ media-sound/bluez-alsa man
 # bug #729720
 sys-apps/systemd -boot -gnuefi -ukify
 sys-apps/systemd-utils -boot -ukify
-sys-kernel/installkernel -systemd-boot -ukify
+sys-kernel/installkernel -systemd-boot -ukify -uki
 
 # 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 4c9bcf2eed48..2b9f55b92851 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -389,7 +389,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 systemd-boot ukify
+sys-kernel/installkernel systemd-boot ukify uki
 
 # 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 94a6761dcf83..21d286ccbe8f 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -122,7 +122,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 -systemd-boot -ukify
+sys-kernel/installkernel -systemd-boot -ukify -uki
 
 # 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 ac83a3b8d238..b2de7b1bc855 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -46,7 +46,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 -systemd-boot -ukify
+sys-kernel/installkernel -systemd-boot -ukify -uki
 
 # Sam James <[email protected]> (2023-05-10)
 # sys-cluster/ceph not keyworded here

diff --git a/profiles/arch/x86/package.use.mask 
b/profiles/arch/x86/package.use.mask
index a16fce3df729..3c63da0f2b36 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -396,7 +396,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 -systemd-boot -ukify
+sys-kernel/installkernel -systemd-boot -ukify -uki
 
 # Ben de Groot <[email protected]> (2015-03-15)
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag

Reply via email to