From a08280974a2d10d8551d3081b5e577399f1aa92e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 17 Nov 2022 04:23:10 -0500 Subject: [PATCH] Revert "dracut: update to 056." This reverts commit 7def67b23ce92d42b92bea2d0eb9a3b9c3febc8e. dracut 056 causes a regression in live images because the network-manager hook depends on the systemd hook now (void-linux/void-mklive#296) --- srcpkgs/dracut/patches/force_poweroff.patch | 30 +++++------------ srcpkgs/dracut/patches/kmod-fix.patch | 15 +++++++++ srcpkgs/dracut/patches/musl-__wordsize.patch | 11 ++----- srcpkgs/dracut/patches/musl-support.patch | 34 -------------------- srcpkgs/dracut/template | 10 +++--- 5 files changed, 31 insertions(+), 69 deletions(-) create mode 100644 srcpkgs/dracut/patches/kmod-fix.patch delete mode 100644 srcpkgs/dracut/patches/musl-support.patch diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch index 73c9393bdee..655746cc374 100644 --- a/srcpkgs/dracut/patches/force_poweroff.patch +++ b/srcpkgs/dracut/patches/force_poweroff.patch @@ -1,31 +1,17 @@ -The shutdown binary is actually provided by runit and expects the runit -init to be running. This is not the case in the initramfs. Forcing the -shutdown, halt or reboot is necessary to ignore this requirement. - ---- - modules.d/99base/dracut-lib.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh -@@ -1004,13 +1004,13 @@ emergency_shell() { +@@ -1128,11 +1128,11 @@ case "$_emergency_action" in reboot) -- reboot || exit 1 -+ reboot -f || exit 1 - ;; +- reboot || exit 1;; ++ reboot -f || exit 1;; poweroff) -- poweroff || exit 1 -+ poweroff -f || exit 1 - ;; +- poweroff || exit 1;; ++ poweroff -f || exit 1;; halt) -- halt || exit 1 -+ halt -f || exit 1 - ;; +- halt || exit 1;; ++ halt -f || exit 1;; esac } --- -2.37.3 - + diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch new file mode 100644 index 00000000000..fcde1eb76dc --- /dev/null +++ b/srcpkgs/dracut/patches/kmod-fix.patch @@ -0,0 +1,15 @@ +The depmod program from kmod>=30 looks for modules.builtin.modinfo and throws a +warning when it isn't found. Newer versions of dracut pull in this file as well +as modules.builtin.alias, so let's pull this in here and avoid the warning. + +--- a/dracut-init.sh ++++ b/dracut-init.sh +@@ -982,7 +982,7 @@ + } + + dracut_kernel_post() { +- for _f in modules.builtin.bin modules.builtin modules.order; do ++ for _f in modules.builtin.{bin,alias,modinfo} modules.builtin modules.order; do + [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" + done + diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch index 83d8332754f..7a8b40a2903 100644 --- a/srcpkgs/dracut/patches/musl-__wordsize.patch +++ b/srcpkgs/dracut/patches/musl-__wordsize.patch @@ -1,12 +1,8 @@ For musl libc it is required to include to have __WORDSIZE defined to e.g. 32 for arm*-musl. ---- - src/install/util.h | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/src/install/util.h -+++ b/src/install/util.h +--- a/install/util.h 2015-06-15 12:27:21.000000000 +0200 ++++ b/install/util.h 2015-09-02 09:07:57.321104222 +0200 @@ -33,6 +33,9 @@ #include #include @@ -17,6 +13,3 @@ have __WORDSIZE defined to e.g. 32 for arm*-musl. #include #include #include --- -2.37.3 - diff --git a/srcpkgs/dracut/patches/musl-support.patch b/srcpkgs/dracut/patches/musl-support.patch deleted file mode 100644 index 1ce26f940ed..00000000000 --- a/srcpkgs/dracut/patches/musl-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001 -From: Laszlo Gombos -Date: Sun, 20 Feb 2022 22:23:49 -0500 -Subject: [PATCH] fix(install): restore musl support - -__GLIBC_PREREQ is only defined in glibc. ---- - src/install/util.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/install/util.c b/src/install/util.c -index 5721de89e..0af387c27 100644 ---- a/src/install/util.c -+++ b/src/install/util.c -@@ -24,17 +24,15 @@ - #include - #include - #include -+#include - - #include "util.h" - --#if __GLIBC_PREREQ(2, 30) == 0 --#include - #ifndef SYS_gettid - #error "SYS_gettid unavailable on this system" - #endif - - #define gettid() ((pid_t) syscall(SYS_gettid)) --#endif /*__GLIBC_PREREQ */ - - size_t page_size(void) - { - diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 425ee9b19f5..001a4c52c02 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,8 @@ # Template file for 'dracut' pkgname=dracut -version=056 -revision=1 +reverts="056_1" +version=053 +revision=5 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf" @@ -13,13 +14,14 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz" -checksum=e025bbdce9d1209640fb3f5f674f059c7e1f441537ba421703fe56055502421d +checksum=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726 alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm " subpackages="dracut-network" -make_check=no # tests require root +# Checks require distfiles come from a git repository +make_check=no make_dirs=" /etc/dracut.conf.d 0755 root root