commit: e17ad6862b35ee2f8198b5a52b8f4a90643ae70f Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Sep 21 11:20:05 2025 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Wed Sep 24 13:05:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17ad686
profiles: mask generic-uki globally rather than per -kernel package This use flag is only used by users of the kernel-build and kernel-install eclasses. Masking it per package causes issues for out of tree users of the eclasses as overlays cannot masks use flags per profile. At most portage supports masking packages and use flags for globablly, but pkgcore doesn't support this causing unavoidable pkgcheck issues that you cannot get rid off. Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43883 Closes: https://github.com/gentoo/gentoo/pull/43883 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> profiles/arch/base/package.use.mask | 6 ------ profiles/arch/base/use.mask | 4 ++++ .../desktop/{systemd/package.use.mask => gnome/systemd/use.mask} | 6 ++---- .../systemd/package.use.mask => desktop/plasma/systemd/use.mask} | 6 ++---- .../desktop/{gnome/systemd/package.use.mask => systemd/use.mask} | 6 ++---- .../systemd/package.use.mask => no-multilib/systemd/use.mask} | 6 ++---- profiles/default/linux/amd64/23.0/systemd/package.use.mask | 8 -------- .../23.0/{desktop/systemd/package.use.mask => systemd/use.mask} | 6 ++---- .../linux/arm64/23.0/desktop/gnome/systemd/package.use.mask | 8 -------- .../23.0/desktop/gnome/systemd/use.mask} | 6 ++---- .../gnome/systemd/{package.use.stable.mask => use.stable.mask} | 6 ++---- .../linux/arm64/23.0/desktop/plasma/systemd/package.use.mask | 8 -------- .../23.0/desktop/plasma/systemd/use.mask} | 6 ++---- .../plasma/systemd/{package.use.stable.mask => use.stable.mask} | 6 ++---- .../default/linux/arm64/23.0/desktop/systemd/package.use.mask | 8 -------- .../package.use.mask => arm64/23.0/desktop/systemd/use.mask} | 6 ++---- .../desktop/systemd/{package.use.stable.mask => use.stable.mask} | 6 ++---- profiles/default/linux/arm64/23.0/systemd/package.use.mask | 8 -------- .../systemd/package.use.mask => arm64/23.0/systemd/use.mask} | 6 ++---- .../23.0/systemd/{package.use.stable.mask => use.stable.mask} | 6 ++---- profiles/features/musl/package.use.mask | 6 ------ profiles/features/musl/use.mask | 4 ++++ 22 files changed, 34 insertions(+), 104 deletions(-) diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index acd27fc6d8f5..015fde26dafe 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -156,12 +156,6 @@ sys-kernel/installkernel grub # Requires dev-libs/level-zero. dev-lang/ispc gpu -# Nowa Ammerlaan <[email protected]> (2023-12-18) -# Experimental and only available on a subset of architectures -sys-kernel/gentoo-kernel generic-uki -sys-kernel/gentoo-kernel-bin generic-uki -sys-kernel/vanilla-kernel generic-uki - # Ionen Wolkens <[email protected]> (2023-12-02) # dev-qt/qtwebengine:6 and dev-qt/qtremoteobjects:6 have few keywords. dev-python/pyqt6 pdfium remoteobjects diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index e5bfe2955aab..d3ad6fa37e54 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Alfred Wingate <[email protected]> (2025-09-20) +# Experimental and only available on a subset of architectures +generic-uki + # Sam James <[email protected]> (2025-09-19) # libquadmath from GCC is only available on some arches # https://gcc.gnu.org/PR96016 diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/use.mask similarity index 52% copy from profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask copy to profiles/default/linux/amd64/23.0/desktop/gnome/systemd/use.mask index a0ca2047e2cd..b09adf4bab4e 100644 --- a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask +++ b/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2024-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/use.mask similarity index 52% rename from profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.mask rename to profiles/default/linux/amd64/23.0/desktop/plasma/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.mask +++ b/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/desktop/systemd/use.mask similarity index 52% rename from profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.mask rename to profiles/default/linux/amd64/23.0/desktop/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.mask +++ b/profiles/default/linux/amd64/23.0/desktop/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/no-multilib/systemd/use.mask similarity index 52% rename from profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.mask rename to profiles/default/linux/amd64/23.0/no-multilib/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.mask +++ b/profiles/default/linux/amd64/23.0/no-multilib/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/amd64/23.0/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/systemd/package.use.mask deleted file mode 100644 index a0ca2047e2cd..000000000000 --- a/profiles/default/linux/amd64/23.0/systemd/package.use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Nowa Ammerlaan <[email protected]> (2024-12-30) -# Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/systemd/use.mask similarity index 52% copy from profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask copy to profiles/default/linux/amd64/23.0/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask +++ b/profiles/default/linux/amd64/23.0/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.mask deleted file mode 100644 index a0ca2047e2cd..000000000000 --- a/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Nowa Ammerlaan <[email protected]> (2024-12-30) -# Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/use.mask similarity index 52% copy from profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask copy to profiles/default/linux/arm64/23.0/desktop/gnome/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask +++ b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.stable.mask b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/use.stable.mask similarity index 52% rename from profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.stable.mask rename to profiles/default/linux/arm64/23.0/desktop/gnome/systemd/use.stable.mask index 3800841b7bb6..793858db9ebf 100644 --- a/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.stable.mask +++ b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/use.stable.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2023-12-18) +# Alfred Wingate <[email protected]> (2025-09-20) # This is still experimental, prebuilt images may not boot on all systems. -sys-kernel/gentoo-kernel generic-uki -sys-kernel/gentoo-kernel-bin generic-uki -sys-kernel/vanilla-kernel generic-uki +generic-uki diff --git a/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.mask deleted file mode 100644 index a0ca2047e2cd..000000000000 --- a/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Nowa Ammerlaan <[email protected]> (2024-12-30) -# Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/use.mask similarity index 52% copy from profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask copy to profiles/default/linux/arm64/23.0/desktop/plasma/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask +++ b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.stable.mask b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/use.stable.mask similarity index 52% rename from profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.stable.mask rename to profiles/default/linux/arm64/23.0/desktop/plasma/systemd/use.stable.mask index 3800841b7bb6..793858db9ebf 100644 --- a/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.stable.mask +++ b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/use.stable.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2023-12-18) +# Alfred Wingate <[email protected]> (2025-09-20) # This is still experimental, prebuilt images may not boot on all systems. -sys-kernel/gentoo-kernel generic-uki -sys-kernel/gentoo-kernel-bin generic-uki -sys-kernel/vanilla-kernel generic-uki +generic-uki diff --git a/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.mask deleted file mode 100644 index a0ca2047e2cd..000000000000 --- a/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Nowa Ammerlaan <[email protected]> (2024-12-30) -# Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/desktop/systemd/use.mask similarity index 52% copy from profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask copy to profiles/default/linux/arm64/23.0/desktop/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask +++ b/profiles/default/linux/arm64/23.0/desktop/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.stable.mask b/profiles/default/linux/arm64/23.0/desktop/systemd/use.stable.mask similarity index 52% rename from profiles/default/linux/arm64/23.0/desktop/systemd/package.use.stable.mask rename to profiles/default/linux/arm64/23.0/desktop/systemd/use.stable.mask index 3800841b7bb6..793858db9ebf 100644 --- a/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.stable.mask +++ b/profiles/default/linux/arm64/23.0/desktop/systemd/use.stable.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2023-12-18) +# Alfred Wingate <[email protected]> (2025-09-20) # This is still experimental, prebuilt images may not boot on all systems. -sys-kernel/gentoo-kernel generic-uki -sys-kernel/gentoo-kernel-bin generic-uki -sys-kernel/vanilla-kernel generic-uki +generic-uki diff --git a/profiles/default/linux/arm64/23.0/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/systemd/package.use.mask deleted file mode 100644 index a0ca2047e2cd..000000000000 --- a/profiles/default/linux/arm64/23.0/systemd/package.use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Nowa Ammerlaan <[email protected]> (2024-12-30) -# Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/systemd/use.mask similarity index 52% rename from profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask rename to profiles/default/linux/arm64/23.0/systemd/use.mask index a0ca2047e2cd..6f3714550696 100644 --- a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask +++ b/profiles/default/linux/arm64/23.0/systemd/use.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2024-12-30) +# Alfred Wingate <[email protected]> (2025-09-20) # Generic images are built with systemd and only available on arm64 and amd64 -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki -sys-kernel/vanilla-kernel -generic-uki +-generic-uki diff --git a/profiles/default/linux/arm64/23.0/systemd/package.use.stable.mask b/profiles/default/linux/arm64/23.0/systemd/use.stable.mask similarity index 52% rename from profiles/default/linux/arm64/23.0/systemd/package.use.stable.mask rename to profiles/default/linux/arm64/23.0/systemd/use.stable.mask index 3800841b7bb6..793858db9ebf 100644 --- a/profiles/default/linux/arm64/23.0/systemd/package.use.stable.mask +++ b/profiles/default/linux/arm64/23.0/systemd/use.stable.mask @@ -1,8 +1,6 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Nowa Ammerlaan <[email protected]> (2023-12-18) +# Alfred Wingate <[email protected]> (2025-09-20) # This is still experimental, prebuilt images may not boot on all systems. -sys-kernel/gentoo-kernel generic-uki -sys-kernel/gentoo-kernel-bin generic-uki -sys-kernel/vanilla-kernel generic-uki +generic-uki diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index b614000e3c62..5fedd43b8de0 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -125,12 +125,6 @@ sys-kernel/installkernel -systemd # Requires dev-libs/level-zero. dev-lang/ispc gpu -# Nowa Ammerlaan <[email protected]> (2023-12-18) -# Requires systemd -sys-kernel/gentoo-kernel generic-uki -sys-kernel/gentoo-kernel-bin generic-uki -sys-kernel/vanilla-kernel generic-uki - # Guillaume Seren <[email protected]> (2023-11-29) # execinfo.h required for server. games-board/cockatrice server diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask index 376c8c1f6771..60602202f143 100644 --- a/profiles/features/musl/use.mask +++ b/profiles/features/musl/use.mask @@ -5,6 +5,10 @@ -elibc_musl elibc_glibc +# Alfred Wingate <[email protected]> (2025-09-20) +# Requires systemd +generic-uki + # Sam James <[email protected]> (2025-07-12) # dev-debug/dtrace and dev-debug/systemtap don't work on musl dtrace
