diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 3bd6205..0ca18c2 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1 +1 @@ -DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e +DIST dracut-100.tar.gz 556103 BLAKE2B 639855491ac7800a1ad35f97b87dde637c4e1a0e4de2b644277df38c9bf7a9b179ad595de2e8a7cd580c51b8b953f995c16de9a5b9728120c9bf5f79b7a305ed SHA512 260c0c5761f9a9b12488a0a01d16cac3f832d33a0c896fa7c7e5e5f82f1a753dde78ba779e2d6575184a6efdfb31c5672a0f3c786e98a146308e440ad775565b diff --git a/sys-kernel/dracut/dracut-060_pre20240104-r4.ebuild b/sys-kernel/dracut/dracut-100-r2.ebuild similarity index 84% rename from sys-kernel/dracut/dracut-060_pre20240104-r4.ebuild rename to sys-kernel/dracut/dracut-100-r2.ebuild index 8a695f5..aab86ae 100644 --- a/sys-kernel/dracut/dracut-060_pre20240104-r4.ebuild +++ b/sys-kernel/dracut/dracut-100-r2.ebuild @@ -9,26 +9,21 @@ inherit bash-completion-r1 cargo 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="4980bad34775da715a2639b736cba5e65a8a2604" - 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" 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}" != *_rc* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi IUSE="dracut-cpio selinux test" + RESTRICT="!test? ( test )" RDEPEND=" @@ -71,10 +66,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch - "${FILESDIR}"/dracut-060-fix-resume-hostonly.patch "${FILESDIR}"/dracut-060-grub-layout.patch - "${FILESDIR}"/dracut-060-systemd-255.patch - "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch ) src_configure() { diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 848709e..fdf4e40 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -9,26 +9,21 @@ inherit bash-completion-r1 cargo 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" 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="dracut-cpio selinux test" + RESTRICT="!test? ( test )" RDEPEND=" diff --git a/sys-kernel/dracut/files/dracut-059-install-new-systemd-hibernate-resume.service.patch b/sys-kernel/dracut/files/dracut-059-install-new-systemd-hibernate-resume.service.patch deleted file mode 100644 index 124bd6a..0000000 --- a/sys-kernel/dracut/files/dracut-059-install-new-systemd-hibernate-resume.service.patch +++ /dev/null @@ -1,21 +0,0 @@ -From https://github.com/dracutdevs/dracut/pull/2527 -From a2fe89116db4b286fbf515f26bd1773b5e6ee8ad Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Tue, 26 Sep 2023 09:43:37 +0200 -Subject: [PATCH] fix(resume): add new systemd-hibernate-resume.service - -Since https://github.com/systemd/systemd/commit/a628d933, the generator only -does the initial validation of the system info and then enables the new -`systemd-hibernate-resume.service`. - -Fixes #2513 ---- a/modules.d/95resume/module-setup.sh -+++ b/modules.d/95resume/module-setup.sh -@@ -44,6 +44,7 @@ install() { - if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then - inst_multiple -o \ - "$systemdutildir"/system-generators/systemd-hibernate-resume-generator \ -+ "$systemdsystemunitdir"/systemd-hibernate-resume.service \ - "$systemdsystemunitdir"/systemd-hibernate-resume@.service \ - "$systemdutildir"/systemd-hibernate-resume - return 0 diff --git a/sys-kernel/dracut/files/dracut-060-fix-resume-hostonly.patch b/sys-kernel/dracut/files/dracut-060-fix-resume-hostonly.patch deleted file mode 100644 index 3563f85..0000000 --- a/sys-kernel/dracut/files/dracut-060-fix-resume-hostonly.patch +++ /dev/null @@ -1,65 +0,0 @@ -https://bugs.gentoo.org/917000 -https://github.com/dracutdevs/dracut/pull/2494 - -From b88d0bab791bdc4ca75d13802f0391caf537650d Mon Sep 17 00:00:00 2001 -From: Andrew Ammerlaan -Date: Sun, 20 Aug 2023 11:47:22 +0200 -Subject: [PATCH] fix(resume): include in hostonly mode if resume= on cmdline - -The grep introduced in commit e3a7112bef794e2f2dd741ec2c74fa9cb9117651 -does not work as intended. The resume module is always excluded in hostonly -mode. - -Made this a bit more explicit with if/else so it is more clear what is going -on. The in-line ||/&& makes the line really long and makes it more difficult -to understand what is going on. - -Bug: https://github.com/dracutdevs/dracut/issues/924 -Signed-off-by: Andrew Ammerlaan ---- - modules.d/95resume/module-setup.sh | 32 +++++++++++++++++++++++------- - 1 file changed, 25 insertions(+), 7 deletions(-) - -diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh -index d255103366..2d48043827 100755 ---- a/modules.d/95resume/module-setup.sh -+++ b/modules.d/95resume/module-setup.sh -@@ -10,13 +10,31 @@ check() { - return 1 - } - -- # Only support resume if hibernation is currently on -- # and no swap is mounted on a net device -- [[ $hostonly ]] || [[ $mount_needs ]] && { -- swap_on_netdevice || [[ -f /sys/power/resume && "$(< /sys/power/resume)" == "0:0" ]] || grep -rq '^\|[[:space:]]resume=' /proc/cmdline /etc/cmdline /etc/cmdline.d /etc/kernel/cmdline /usr/lib/kernel/cmdline 2> /dev/null && return 255 -- } -- -- return 0 -+ # If hostonly check if we want to include the resume module -+ if [[ $hostonly ]] || [[ $mount_needs ]]; then -+ # Resuming won't work if swap is on a netdevice -+ swap_on_netdevice && return 255 -+ if grep -rq 'resume=' /proc/cmdline /etc/cmdline /etc/cmdline.d /etc/kernel/cmdline /usr/lib/kernel/cmdline 2> /dev/null; then -+ # hibernation support requested on kernel command line -+ return 0 -+ else -+ # resume= not set on kernel command line -+ if [[ -f /sys/power/resume ]]; then -+ if [[ "$(< /sys/power/resume)" == "0:0" ]]; then -+ # hibernation supported by the kernel, but not enabled -+ return 255 -+ else -+ # hibernation supported by the kernel and enabled -+ return 0 -+ fi -+ else -+ # resume file doesn't exist, hibernation not supported by kernel -+ return 255 -+ fi -+ fi -+ else -+ return 0 -+ fi - } - - # called by dracut diff --git a/sys-kernel/dracut/files/dracut-060-systemd-255.patch b/sys-kernel/dracut/files/dracut-060-systemd-255.patch deleted file mode 100644 index 9d577e9..0000000 --- a/sys-kernel/dracut/files/dracut-060-systemd-255.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/dracutdevs/dracut/pull/2586/files -diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh -index fa960a42c1..87efd0c1a6 100755 ---- a/modules.d/01systemd-pcrphase/module-setup.sh -+++ b/modules.d/01systemd-pcrphase/module-setup.sh -@@ -6,7 +6,11 @@ - check() { - - # If the binary(s) requirements are not fulfilled the module can't be installed. -- require_binaries "$systemdutildir"/systemd-pcrphase || return 1 -+ # systemd-255 renamed the binary, check for old and new location. -+ if ! require_binaries "$systemdutildir"/systemd-pcrphase && \ -+ ! require_binaries "$systemdutildir"/systemd-pcrextend; then -+ return 1 -+ fi - - # Return 255 to only include the module, if another module requires it. - return 255 -@@ -28,6 +32,7 @@ install() { - - inst_multiple -o \ - "$systemdutildir"/systemd-pcrphase \ -+ "$systemdutildir"/systemd-pcrextend \ - "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \ - "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \ - "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service