commit: 1548f149879fca4915d49d3a1991d9d2ebd03e57 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Fri Jan 12 11:22:40 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri Jan 12 11:24:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1548f149
*/*: move sys-kernel/installkernel-gentoo to sys-kernel/installkernel Bug: https://bugs.gentoo.org/917145 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> eclass/kernel-install.eclass | 8 ++++---- profiles/updates/1Q-2024 | 1 + sys-apps/debianutils/debianutils-5.14.ebuild | 4 ++-- sys-kernel/installkernel-gentoo/Manifest | 2 -- .../installkernel-systemd/installkernel-systemd-2-r4.ebuild | 4 ++-- .../installkernel-systemd/installkernel-systemd-2-r5.ebuild | 4 ++-- sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild | 4 ++-- sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild | 6 +++--- sys-kernel/installkernel/Manifest | 2 ++ .../installkernel-12.ebuild} | 0 .../installkernel-14.ebuild} | 0 sys-kernel/{installkernel-gentoo => installkernel}/metadata.xml | 0 12 files changed, 18 insertions(+), 17 deletions(-) diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index 5a5b833cdd7b..707530b2244d 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kernel-install.eclass @@ -63,14 +63,14 @@ RESTRICT+=" _IDEPEND_BASE=" !initramfs? ( || ( - >=sys-kernel/installkernel-gentoo-8 + >=sys-kernel/installkernel-8 >=sys-kernel/installkernel-systemd-2-r5 ) ) initramfs? ( >=sys-kernel/dracut-059-r4 || ( - >=sys-kernel/installkernel-gentoo-8[dracut(-)] + >=sys-kernel/installkernel-8[dracut(-)] >=sys-kernel/installkernel-systemd-2-r5 ) ) @@ -201,7 +201,7 @@ if [[ ${KERNEL_IUSE_GENERIC_UKI} ]]; then generic-uki? ( || ( >=sys-kernel/installkernel-systemd-3 - >=sys-kernel/installkernel-gentoo-8[-dracut(-),-ukify(-)] + >=sys-kernel/installkernel-8[-dracut(-),-ukify(-)] ) ) !generic-uki? ( diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index e247daa55370..8890ca93d6a4 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -1 +1,2 @@ move dev-python/pysol_cards dev-python/pysol-cards +move sys-kernel/installkernel-gentoo sys-kernel/installkernel diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild b/sys-apps/debianutils/debianutils-5.14.ebuild index 614f9cdff54e..a8d4fd2bc633 100644 --- a/sys-apps/debianutils/debianutils-5.14.ebuild +++ b/sys-apps/debianutils/debianutils-5.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ IUSE="+installkernel static" PDEPEND=" installkernel? ( || ( - sys-kernel/installkernel-gentoo + sys-kernel/installkernel sys-kernel/installkernel-systemd ) ) diff --git a/sys-kernel/installkernel-gentoo/Manifest b/sys-kernel/installkernel-gentoo/Manifest deleted file mode 100644 index e74c54c2b028..000000000000 --- a/sys-kernel/installkernel-gentoo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST installkernel-gentoo-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2 -DIST installkernel-gentoo-14.tar.gz 5501 BLAKE2B cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504 SHA512 f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66 diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild index 219ca981dfe2..b89b45be80e9 100644 --- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild +++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="amd64 arm64 ~loong ppc64 x86" RDEPEND=" - !sys-kernel/installkernel-gentoo + !sys-kernel/installkernel || ( sys-apps/systemd[gnuefi(-)] sys-apps/systemd[boot(-)] diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild index 64c179be1f34..8a88e9602d27 100644 --- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild +++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" RDEPEND=" - !sys-kernel/installkernel-gentoo + !sys-kernel/installkernel || ( sys-apps/systemd[kernel-install(-)] sys-apps/systemd-utils[kernel-install(-)] diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild index f5c22ec7a318..2c0e8d48576c 100644 --- a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild +++ b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" RDEPEND=" - !sys-kernel/installkernel-gentoo + !sys-kernel/installkernel || ( sys-apps/systemd[kernel-install(-)] sys-apps/systemd-utils[kernel-install(-)] diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild index 2ff751ead627..73a4f2318f28 100644 --- a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild +++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild @@ -11,13 +11,13 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -RDEPEND=">=sys-kernel/installkernel-gentoo-14" +RDEPEND=">=sys-kernel/installkernel-14" pkg_setup() { elog "The wrapper functionality of ${PN} has been integrated into" - elog "sys-kernel/installkernel-gentoo[systemd]." + elog "sys-kernel/installkernel[systemd]." elog "${PN} can be safely removed and replaced:" elog - elog "emerge --noreplace sys-kernel/installkernel-gentoo" + elog "emerge --noreplace sys-kernel/installkernel" elog "emerge --depclean sys-kernel/installkernel-systemd" } diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest new file mode 100644 index 000000000000..fd2621827d37 --- /dev/null +++ b/sys-kernel/installkernel/Manifest @@ -0,0 +1,2 @@ +DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2 +DIST installkernel-14.tar.gz 5501 BLAKE2B cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504 SHA512 f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66 diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-12.ebuild b/sys-kernel/installkernel/installkernel-12.ebuild similarity index 100% rename from sys-kernel/installkernel-gentoo/installkernel-gentoo-12.ebuild rename to sys-kernel/installkernel/installkernel-12.ebuild diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild b/sys-kernel/installkernel/installkernel-14.ebuild similarity index 100% rename from sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild rename to sys-kernel/installkernel/installkernel-14.ebuild diff --git a/sys-kernel/installkernel-gentoo/metadata.xml b/sys-kernel/installkernel/metadata.xml similarity index 100% rename from sys-kernel/installkernel-gentoo/metadata.xml rename to sys-kernel/installkernel/metadata.xml
