commit: e504a624ddc373533927c214696010ef88fe9242 Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> AuthorDate: Mon Dec 23 17:31:16 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jan 2 17:08:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e504a624
profiles: unmask generic-uki only on systemd 23.0 profiles We know this only works if systemd is init because the systemd in the initramfs cannot hand over control to openrc. Since these uki's are built on a 23.0 profile machine, they probably will also not work on a 17.x profile. Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/arch/amd64/package.use.mask | 7 +------ profiles/arch/amd64/package.use.stable.mask | 7 +------ profiles/arch/arm64/package.use.mask | 7 +------ profiles/arch/arm64/package.use.stable.mask | 5 ----- profiles/arch/x86/package.use.stable.mask | 7 +------ .../linux/amd64/23.0/desktop/gnome/systemd/package.use.mask | 7 +++++++ .../linux/amd64/23.0/desktop/gnome/systemd/package.use.stable.mask | 7 +++++++ .../linux/amd64/23.0/desktop/plasma/systemd/package.use.mask | 7 +++++++ .../amd64/23.0/desktop/plasma/systemd/package.use.stable.mask | 7 +++++++ profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask | 7 +++++++ .../linux/amd64/23.0/desktop/systemd/package.use.stable.mask | 7 +++++++ .../default/linux/amd64/23.0/no-multilib/systemd/package.use.mask | 7 +++++++ .../linux/amd64/23.0/no-multilib/systemd/package.use.stable.mask | 7 +++++++ profiles/default/linux/amd64/23.0/systemd/package.use.mask | 7 +++++++ profiles/default/linux/amd64/23.0/systemd/package.use.stable.mask | 7 +++++++ .../linux/arm64/23.0/desktop/gnome/systemd/package.use.mask | 7 +++++++ .../linux/arm64/23.0/desktop/gnome/systemd/package.use.stable.mask | 7 +++++++ .../linux/arm64/23.0/desktop/plasma/systemd/package.use.mask | 7 +++++++ .../arm64/23.0/desktop/plasma/systemd/package.use.stable.mask | 7 +++++++ profiles/default/linux/arm64/23.0/desktop/systemd/package.use.mask | 7 +++++++ .../linux/arm64/23.0/desktop/systemd/package.use.stable.mask | 7 +++++++ profiles/default/linux/arm64/23.0/systemd/package.use.mask | 7 +++++++ profiles/default/linux/arm64/23.0/systemd/package.use.stable.mask | 7 +++++++ 23 files changed, 130 insertions(+), 29 deletions(-) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 1e1ebfb22b46..49053c2044cb 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -124,11 +124,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 - # Ionen Wolkens <[email protected]> (2023-12-02) # dev-qt/qtwebengine:6 and dev-qt/qtremoteobjects:6 are keyworded here. dev-python/pyqt6 -pdfium -remoteobjects diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 43f4ee7abc25..d5b2e4430917 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -38,11 +38,6 @@ media-libs/opencv cudnn # Pulls in pandoc with all of its glory (haskell). #921501 www-apps/hugo test -# Nowa Ammerlaan <[email protected]> (2023-12-18) -# 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 - # Jon Janzen <[email protected]> (2023-09-11) # librttopo has not been stabalized on this arch yet dev-db/spatialite rttopo diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 85275e124cb8..3dfe1bbafefd 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Michał Górny <[email protected]> (2024-12-24) @@ -88,11 +88,6 @@ app-emulation/libvirt nbd # Unmask only where grub is keyworded sys-kernel/installkernel -grub -# 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 - # Ionen Wolkens <[email protected]> (2023-12-02) # dev-qt/qtwebengine:6 is keyworded here. dev-python/pyqt6 -pdfium diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask index bace737d1c9d..3ccac09b9407 100644 --- a/profiles/arch/arm64/package.use.stable.mask +++ b/profiles/arch/arm64/package.use.stable.mask @@ -17,11 +17,6 @@ sys-kernel/installkernel efistub # dev-python/pyside6 is not stable here yet dev-python/qtpy pyside6 -# Nowa Ammerlaan <[email protected]> (2023-12-18) -# 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 - # Michał Górny <[email protected]> (2023-04-22) # Needs unkeyworded dev-python/sympy dev-python/nbval test diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index d77ca612b6f2..9a6fe640fd74 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -55,11 +55,6 @@ app-emulation/libvirt nbd # Experimental, virt-firmware is keyworded only unstable sys-kernel/installkernel efistub -# Nowa Ammerlaan <[email protected]> (2023-12-18) -# 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 - # Arthur Zamarin <[email protected]> (2023-06-03) # Destabilizing x86 keywords on sci-*/* packages app-metrics/collectd collectd_plugins_gps collectd_plugins_sigrok diff --git a/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.mask new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 diff --git a/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.stable.mask b/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 diff --git a/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.mask new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 diff --git a/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.stable.mask b/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 diff --git a/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.stable.mask b/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/amd64/23.0/desktop/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 diff --git a/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.mask new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 diff --git a/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.stable.mask b/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/amd64/23.0/no-multilib/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 diff --git a/profiles/default/linux/amd64/23.0/systemd/package.use.mask b/profiles/default/linux/amd64/23.0/systemd/package.use.mask new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/amd64/23.0/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 diff --git a/profiles/default/linux/amd64/23.0/systemd/package.use.stable.mask b/profiles/default/linux/amd64/23.0/systemd/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/amd64/23.0/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 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 new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 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/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 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 new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 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/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 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 new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 diff --git a/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.stable.mask b/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/arm64/23.0/desktop/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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 diff --git a/profiles/default/linux/arm64/23.0/systemd/package.use.mask b/profiles/default/linux/arm64/23.0/systemd/package.use.mask new file mode 100644 index 000000000000..ccb9479b103b --- /dev/null +++ b/profiles/default/linux/arm64/23.0/systemd/package.use.mask @@ -0,0 +1,7 @@ +# 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 diff --git a/profiles/default/linux/arm64/23.0/systemd/package.use.stable.mask b/profiles/default/linux/arm64/23.0/systemd/package.use.stable.mask new file mode 100644 index 000000000000..2dc3c3ed2a8d --- /dev/null +++ b/profiles/default/linux/arm64/23.0/systemd/package.use.stable.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Nowa Ammerlaan <[email protected]> (2023-12-18) +# 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
