[gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/, profiles/arch/riscv/, profiles/arch/arm/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/, profiles/arch/riscv/, profiles/arch/arm/, ...

[Andrew Ammerlaan]

commit:     7c43556c2e9dcf08ab8bd28dbcdd1e07065f1fe4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  8 18:36:15 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 07:27:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c43556c

profiles/arch: mask systemd(-utils)[ukify] where there is no sd-boot

ukify is a new flag that is split out from the boot flag

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

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

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4c3863dc471b..d2c6e747e0da 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -361,8 +361,8 @@ sys-boot/grub:2 -grub_platforms_xen-32
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
 # sd-boot is not supported on all archs.
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Ben de Groot <yngwin@gentoo.org> (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 3f0feffc13ce..218f56fa1c4a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -125,8 +125,8 @@ net-im/prosody selinux
 # Sam James <sam@gentoo.org> (2020-01-17)
 # gnuefi + systemd-boot works on arm
 # bug #729720
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Joonas Niilola <juippis@gentoo.org> (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 c61069180b21..fe51043769b1 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -152,8 +152,8 @@ media-sound/bluez-alsa man
 # Sam James <sam@gentoo.org> (2020-01-17)
 # gnuefi + systemd-boot works on arm64
 # bug #729720
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Joonas Niilola <juippis@gentoo.org> (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 004d9af566bb..4b0362d1f311 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -347,9 +347,9 @@ net-misc/moonlight mmal
 >=dev-db/mariadb-10.1.0 mroonga galera
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
-# sd-boot is not supported on all archs.
-sys-apps/systemd boot gnuefi
-sys-apps/systemd-utils boot
+# sd-boot and ukify are not supported on all archs.
+sys-apps/systemd boot gnuefi ukify
+sys-apps/systemd-utils boot ukify
 
 # Ben de Groot <yngwin@gentoo.org> (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 564bceac2e36..b62bfcca47c6 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -97,8 +97,8 @@ app-accessibility/at-spi2-core dbus-broker
 
 # Mike Gilbert <floppym@gentoo.org> (2023-05-27)
 # Newer sd-boot does not use gnuefi.
->=sys-apps/systemd-254 -boot
->=sys-apps/systemd-utils-254 -boot
+>=sys-apps/systemd-254 -boot -ukify
+>=sys-apps/systemd-utils-254 -boot -ukify
 
 # WANG Xuerui <xen0n@gentoo.org> (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 152a754167f0..0326b4a821c9 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -39,8 +39,8 @@ media-video/mpv lua_single_target_luajit -lua_single_target_lua5-1
 
 # Mike Gilbert <floppym@gentoo.org> (2023-05-27)
 # sd-boot should work here.
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Sam James <sam@gentoo.org> (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 a9ab94eff7db..39c9627bdcd9 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -385,8 +385,8 @@ app-emulation/libvirt xen
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
 # sys-boot/gnu-efi is not supported on all archs.
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag