From: motorto <motorto@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] dracut: update to 056.
Date: Fri, 30 Sep 2022 22:49:27 +0200 [thread overview]
Message-ID: <20220930204927.0UEkLQ_LDMTfFc7-5d8NbPmm-BLGNniu3wygBr3WYPc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39532@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
There is an updated pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages dracut-0.56
https://github.com/void-linux/void-packages/pull/39532
dracut: update to 056.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l
Tested the generation of the initramfs on my personal laptop (x86_64-glibc).
Probably different testers (archs, and setups) are welcomed
A patch file from https://github.com/void-linux/void-packages/pull/39532.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-0.56-39532.patch --]
[-- Type: text/x-diff, Size: 6291 bytes --]
From 5c5e56e0023db52796ea50e541517a8f22d40650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 29 Sep 2022 19:00:48 +0100
Subject: [PATCH] dracut: update to 056; adopt.
---
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 | 11 +++----
5 files changed, 70 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
create 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 655746cc3745..73c9393bdee8 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,31 @@
+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
-@@ -1128,11 +1128,11 @@
+@@ -1004,13 +1004,13 @@ emergency_shell() {
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
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 7a8b40a29034..83d8332754f4 100644
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ b/srcpkgs/dracut/patches/musl-__wordsize.patch
@@ -1,8 +1,12 @@
For musl libc it is required to include <sys/reg.h> to
have __WORDSIZE defined to e.g. 32 for arm*-musl.
---- a/install/util.h 2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h 2015-09-02 09:07:57.321104222 +0200
+---
+ src/install/util.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/src/install/util.h
++++ b/src/install/util.h
@@ -33,6 +33,9 @@
#include <signal.h>
#include <sched.h>
@@ -13,3 +17,6 @@ have __WORDSIZE defined to e.g. 32 for arm*-musl.
#include <sys/stat.h>
#include <dirent.h>
#include <sys/resource.h>
+--
+2.37.3
+
diff --git a/srcpkgs/dracut/patches/musl-support.patch b/srcpkgs/dracut/patches/musl-support.patch
new file mode 100644
index 000000000000..1ce26f940ed9
--- /dev/null
+++ b/srcpkgs/dracut/patches/musl-support.patch
@@ -0,0 +1,34 @@
+From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+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 <errno.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#include <sys/syscall.h>
+
+ #include "util.h"
+
+-#if __GLIBC_PREREQ(2, 30) == 0
+-#include <sys/syscall.h>
+ #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 93eb56441625..223a4d6e389e 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=053
-revision=4
+version=056
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -9,18 +9,17 @@ hostmakedepends="pkg-config"
makedepends="libkmod-devel"
depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+checksum=e025bbdce9d1209640fb3f5f674f059c7e1f441537ba421703fe56055502421d
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"
-# Checks require distfiles come from a git repository
-make_check=no
+make_check=no # tests require root
make_dirs="
/etc/dracut.conf.d 0755 root root
next prev parent reply other threads:[~2022-09-30 20:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 18:21 [PR PATCH] " motorto
2022-09-29 18:24 ` [PR PATCH] [Updated] " motorto
2022-09-30 20:49 ` motorto [this message]
2022-10-16 13:42 ` motorto
2022-10-30 10:54 ` dataCobra
2022-11-16 13:22 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220930204927.0UEkLQ_LDMTfFc7-5d8NbPmm-BLGNniu3wygBr3WYPc@z \
--to=motorto@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).