commit: 784bf231299964f1ef28fb33534ee916bc377bca
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 13:22:06 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:27:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=784bf231
*/*: move sys-kernel/installkernel-systemd-boot to
sys-kernel/installkernel-systemd
This reflects better that we don't necessarily need the systemd bootloader
to use the systemd kernel-install system.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
eclass/kernel-install.eclass | 2 +-
profiles/arch/powerpc/ppc64/package.mask | 2 +-
profiles/features/prefix/package.mask | 2 +-
profiles/updates/4Q-2023 | 1 +
sys-apps/debianutils/debianutils-5.14.ebuild | 2 +-
sys-apps/debianutils/debianutils-5.7.ebuild | 2 +-
sys-apps/debianutils/debianutils-5.8.ebuild | 2 +-
sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild | 2 +-
.../files/00-00machineid-directory.install | 2 +-
.../files/installkernel-systemd-2-r2-00-00machineid-directory.install} | 2 +-
.../installkernel-systemd-2-r1.ebuild} | 0
.../installkernel-systemd-2-r3.ebuild} | 0
.../installkernel-systemd-2-r4.ebuild} | 0
.../{installkernel-systemd-boot => installkernel-systemd}/metadata.xml | 0
14 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index c1b9798a9ff9..03638cd2c57b 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -50,7 +50,7 @@ RESTRICT+="
IDEPEND="
|| (
sys-kernel/installkernel-gentoo
- sys-kernel/installkernel-systemd-boot
+ sys-kernel/installkernel-systemd
)
initramfs? ( >=sys-kernel/dracut-049-r3 )"
# needed by objtool that is installed along with the kernel and used
diff --git a/profiles/arch/powerpc/ppc64/package.mask
b/profiles/arch/powerpc/ppc64/package.mask
index ddeda73b9834..8b4559de7a95 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -7,7 +7,7 @@
# Sam James <s...@gentoo.org> (2022-10-08)
# sys-boot/gnu-efi isn't keyworded here right now
-sys-kernel/installkernel-systemd-boot
+sys-kernel/installkernel-systemd
# Michał Górny <mgo...@gentoo.org> (2022-08-25)
# Only ppc64le binpkg is provided.
diff --git a/profiles/features/prefix/package.mask
b/profiles/features/prefix/package.mask
index 32df49a3a6c4..3a54bbdc93cb 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -13,6 +13,6 @@ gnome-extra/gnome-user-share
gnome-extra/office-runner
sys-apps/gentoo-systemd-integration
sys-apps/systemd-readahead
-sys-kernel/installkernel-systemd-boot
+sys-kernel/installkernel-systemd
sys-process/systemd-cron
www-misc/profile-sync-daemon
diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index a543f3f9d4c7..a72fa0f84d1b 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -17,3 +17,4 @@ move dev-python/python-discid dev-python/discid
move dev-python/py-amqp dev-python/amqp
move dev-python/pyre2 dev-python/fb-re2
move dev-python/python-sshpubkeys dev-python/sshpubkeys
+move sys-kernel/installkernel-systemd-boot sys-kernel/installkernel-systemd
diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild
b/sys-apps/debianutils/debianutils-5.14.ebuild
index f56e99e6a6b0..c71e9cb0196b 100644
--- a/sys-apps/debianutils/debianutils-5.14.ebuild
+++ b/sys-apps/debianutils/debianutils-5.14.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
|| (
sys-kernel/installkernel-gentoo
- sys-kernel/installkernel-systemd-boot
+ sys-kernel/installkernel-systemd
)
)
"
diff --git a/sys-apps/debianutils/debianutils-5.7.ebuild
b/sys-apps/debianutils/debianutils-5.7.ebuild
index 358f820b7322..0cc841149e59 100644
--- a/sys-apps/debianutils/debianutils-5.7.ebuild
+++ b/sys-apps/debianutils/debianutils-5.7.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
|| (
sys-kernel/installkernel-gentoo
- sys-kernel/installkernel-systemd-boot
+ sys-kernel/installkernel-systemd
)
)"
diff --git a/sys-apps/debianutils/debianutils-5.8.ebuild
b/sys-apps/debianutils/debianutils-5.8.ebuild
index 3bd7fca2ed79..1909cc22de71 100644
--- a/sys-apps/debianutils/debianutils-5.8.ebuild
+++ b/sys-apps/debianutils/debianutils-5.8.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
|| (
sys-kernel/installkernel-gentoo
- sys-kernel/installkernel-systemd-boot
+ sys-kernel/installkernel-systemd
)
)"
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
index 3a1e960924ef..a62868a3c86b 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
@@ -16,7 +16,7 @@ IUSE="grub"
RDEPEND="
>=sys-apps/debianutils-4.9-r1
!<sys-apps/debianutils-4.9-r1[installkernel(+)]
- !sys-kernel/installkernel-systemd-boot"
+ !sys-kernel/installkernel-systemd"
src_install() {
into /
diff --git
a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
b/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
similarity index 90%
rename from
sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
rename to
sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
index 70b966fbf4b3..06a519577f76 100644
---
a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
+++ b/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# this file is installed by sys-kernel/installkernel-systemd-boot
+# this file is installed by sys-kernel/installkernel-systemd
COMMAND="${1}"
ENTRY_DIR_ABS="${3}"
diff --git
a/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
b/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
similarity index 91%
rename from
sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
rename to
sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
index 5fa3bbeffc04..54871f9e70eb 100644
---
a/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
+++
b/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
@@ -1,6 +1,6 @@
#!/usr/bin/env sh
-# this file is installed by sys-kernel/installkernel-systemd-boot
+# this file is installed by sys-kernel/installkernel-systemd
COMMAND="${1}"
ENTRY_DIR_ABS="${3}"
diff --git
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
similarity index 100%
rename from
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
rename to sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
diff --git
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r3.ebuild
similarity index 100%
rename from
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
rename to sys-kernel/installkernel-systemd/installkernel-systemd-2-r3.ebuild
diff --git
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
similarity index 100%
rename from
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
rename to sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
diff --git a/sys-kernel/installkernel-systemd-boot/metadata.xml
b/sys-kernel/installkernel-systemd/metadata.xml
similarity index 100%
rename from sys-kernel/installkernel-systemd-boot/metadata.xml
rename to sys-kernel/installkernel-systemd/metadata.xml
