commit: e193c207eddd3e15b83d02165c34925a3288204e Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat May 27 23:45:19 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat May 27 23:47:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e193c207
profiles/arch: update systemd-boot masks Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> profiles/arch/amd64/package.use.mask | 4 ++-- profiles/arch/arm/package.use.mask | 2 +- profiles/arch/arm64/package.use.mask | 2 +- profiles/arch/base/package.use.mask | 4 ++-- profiles/arch/ia64/package.use.mask | 4 ++-- profiles/arch/loong/package.use.mask | 9 +++++++-- profiles/arch/riscv/package.use.mask | 5 +++++ profiles/arch/x86/package.use.mask | 2 +- 8 files changed, 21 insertions(+), 11 deletions(-) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 9a0ced87db7f..83a261731286 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -338,8 +338,8 @@ sys-boot/grub:2 -grub_platforms_xen-32 >=dev-db/mariadb-10.1.0 -mroonga -galera # Mike Gilbert <flop...@gentoo.org> (2015-09-05) -# sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd -gnuefi +# sd-boot is not supported on all archs. +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Ben de Groot <yng...@gentoo.org> (2015-03-15) diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 3781ce232db1..41fa484485e7 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -117,7 +117,7 @@ net-im/prosody selinux # Sam James <s...@gentoo.org> (2020-01-17) # gnuefi + systemd-boot works on arm # bug #729720 -sys-apps/systemd -gnuefi +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Joonas Niilola <juip...@gentoo.org> (2021-01-15) diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index dcbd55a09ed2..552515ec4e09 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -136,7 +136,7 @@ media-sound/bluez-alsa man # Sam James <s...@gentoo.org> (2020-01-17) # gnuefi + systemd-boot works on arm64 # bug #729720 -sys-apps/systemd -gnuefi +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Joonas Niilola <juip...@gentoo.org> (2021-01-15) diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 28b10b38c544..5054ceb096a0 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -326,8 +326,8 @@ media-video/mpv mmal >=dev-db/mariadb-10.1.0 mroonga galera # Mike Gilbert <flop...@gentoo.org> (2015-09-05) -# sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd gnuefi +# sd-boot is not supported on all archs. +sys-apps/systemd boot gnuefi sys-apps/systemd-utils boot # Ben de Groot <yng...@gentoo.org> (2015-03-15) diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index 1f1e961e609c..14c693a8d3bf 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -390,8 +390,8 @@ media-sound/pulseaudio-daemon ofono-headset # Mike Gilbert <flop...@gentoo.org> (2015-09-05) # sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd -gnuefi -sys-apps/systemd-utils -boot +<sys-apps/systemd-254 -gnuefi +<sys-apps/systemd-utils-254 -boot # Pacho Ramos <pa...@gentoo.org> (2015-06-13) # Missing keywords, bug #513108 diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask index a7996f8bafbf..f8cd99f2956f 100644 --- a/profiles/arch/loong/package.use.mask +++ b/profiles/arch/loong/package.use.mask @@ -1,6 +1,11 @@ # Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Mike Gilbert <flop...@gentoo.org> (2023-05-27) +# Newer sd-boot does not use gnuefi. +>=sys-apps/systemd-254 -boot +>=sys-apps/systemd-utils-254 -boot + # WANG Xuerui <xe...@gentoo.org> (2023-04-16) # dev-python/pyopengl fails tests dev-python/sympy opengl @@ -52,8 +57,8 @@ sys-apps/fwupd flashrom # WANG Xuerui <xe...@gentoo.org> (2022-12-05) # sys-boot/gnu-efi upstream hasn't merged the loong port yet sys-apps/fwupd uefi -sys-apps/systemd gnuefi -sys-apps/systemd-utils boot +<sys-apps/systemd-254 gnuefi +<sys-apps/systemd-utils-254 boot # WANG Xuerui <xe...@gentoo.org> (2022-12-05) # The loong port of sys-boot/grub:2 isn't upstreamed yet. diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask index e8befb84ff71..a695a1db6a74 100644 --- a/profiles/arch/riscv/package.use.mask +++ b/profiles/arch/riscv/package.use.mask @@ -1,6 +1,11 @@ # Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Mike Gilbert <flop...@gentoo.org> (2023-05-27) +# sd-boot should work here. +sys-apps/systemd -boot -gnuefi +sys-apps/systemd-utils -boot + # Sam James <s...@gentoo.org> (2023-05-10) # sys-cluster/ceph not keyworded here sys-block/tgt rbd diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index e8529092f394..97e091ab7dea 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -383,7 +383,7 @@ app-emulation/libvirt xen # Mike Gilbert <flop...@gentoo.org> (2015-09-05) # sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd -gnuefi +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Ben de Groot <yng...@gentoo.org> (2015-03-15)
