commit: 4f0d53eb211fd9df01cd5ea95540349345300a6b Author: Laszlo Gombos <laszlo.gombos <AT> gmail <DOT> com> AuthorDate: Sat Apr 6 09:24:13 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Tue Apr 9 07:41:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0d53eb
sys-kernel/dracut: 101 revbump for systemd 255 incompatibility dracutdevs/dracut --> dracut-ng/dracut-ng Signed-off-by: Laszlo Gombos <laszlo.gombos <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36135 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sys-kernel/dracut/Manifest | 1 + .../dracut/{dracut-9999.ebuild => dracut-101.ebuild} | 19 ++++++++----------- sys-kernel/dracut/dracut-9999.ebuild | 17 ++++++----------- sys-kernel/dracut/metadata.xml | 2 +- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 5b7749b9e6de..aa131b27c357 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,3 +1,4 @@ DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7cedf79aeef13c34601adfff72bf2c0ba4c652e715b43c9a16f7be6a4a2b29dc75bef014640e1ec07c8d455b SHA512 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cbcb03d33d69b9c3e87a4e2e2d30fa837b3b36949462cec9b06125e824ad82db45bd7516c22a1c84ec6884790b37e9c65ab1 SHA512 0cd2fefcd624758063c77836989260a3d5b0d533004c2395124c8200c31602f5d7d0b8c9491de37ce4afb2c5009b2cf944ddd3bb9e0e11120d84176cb1e7423c DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e +DIST dracut-101.tar.gz 556673 BLAKE2B 8780451aeafd3d9fdfcabc8eb077bb44cc6d64d69cd3138e7447985fcf225495caea937269cf4f0a09a10a6ce2202cc10e817777090aac0bb207fec99e1c8bc8 SHA512 827f073b749a374b703f317ba249479312043ed54af82609ce45332c27349870a68a1d9883118e0a3ecd1cbb33d64aca8bcf6aac56eb75f721fd3380bd12005b diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-101.ebuild similarity index 86% copy from sys-kernel/dracut/dracut-9999.ebuild copy to sys-kernel/dracut/dracut-101.ebuild index 7c9bc8327b21..728e7e819bf4 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-101.ebuild @@ -7,26 +7,22 @@ inherit bash-completion-r1 edo optfeature systemd toolchain-funcs if [[ ${PV} == 9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/dracutdevs/dracut"; + EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng"; else - if [[ ${PV} == *_p* ]] ; then - EGIT_COMMIT="856e7acdb1462803c2517c8d64afb2e34c73c735" - SRC_URI="https://github.com/dracutdevs/dracut/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${EGIT_COMMIT} - else - SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + if [[ "${PV}" != *_rc* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi + SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-ng-${PV}" fi DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"; +HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"; LICENSE="GPL-2" SLOT="0" -if [[ ${PV} != 9999 && ${PV} != *_rc* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi IUSE="selinux test" + RESTRICT="!test? ( test )" RDEPEND=" @@ -68,6 +64,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch + "${FILESDIR}"/dracut-060-grub-layout.patch ) src_configure() { diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 7c9bc8327b21..b5b06a90e0fb 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -7,25 +7,20 @@ inherit bash-completion-r1 edo optfeature systemd toolchain-funcs if [[ ${PV} == 9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/dracutdevs/dracut"; + EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng"; else - if [[ ${PV} == *_p* ]] ; then - EGIT_COMMIT="856e7acdb1462803c2517c8d64afb2e34c73c735" - SRC_URI="https://github.com/dracutdevs/dracut/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${EGIT_COMMIT} - else - SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + if [[ "${PV}" != *_rc* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi + SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-ng-${PV}" fi DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"; +HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"; LICENSE="GPL-2" SLOT="0" -if [[ ${PV} != 9999 && ${PV} != *_rc* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi IUSE="selinux test" RESTRICT="!test? ( test )" diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml index 611cdd955433..09753297dd20 100644 --- a/sys-kernel/dracut/metadata.xml +++ b/sys-kernel/dracut/metadata.xml @@ -10,6 +10,6 @@ <name>Mike Gilbert</name> </maintainer> <upstream> - <remote-id type="github">dracutdevs/dracut</remote-id> + <remote-id type="github">dracut-ng/dracut-ng</remote-id> </upstream> </pkgmetadata>
