Skip to contentSkip to conversation

dracut: Switch to dracut-ng and upgrade to version 102

PATCH New Zoltán Böszörményi 1 participant 1 message Jun 10, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dracut: Switch to dracut-ng and upgrade to version 102

The previous dracut 056 was hopelessly outdated. When creating an initramfs from a systemd based system with a recent systemd version, booting failed with this error:

[    1.906055] systemd[1]: Failed to open executor binary '/usr/lib/systemd/systemd-executor'
[    1.912230] systemd[1]: Failed to allocate manager object: No such file or directory
[!!!!!!] Failed	to allocate manager object
[    1.912480] systemd[1]: Freezing execution

dracut-ng took over after development in the original dracut repository stopped. Switched to the new source repository.

Dropped two patches upstreamed in dracut-ng.

Dropped one patch that's unnecessary for a long time now, because dracut (since version 049...) does not rely on __WORDSIZE.

Added a new patch that partially reverts a change that broke creating an initramfs on the host using the cross-compiled sysroot.

---
 ...against-__GLIBC_PREREQ-for-musl-libc.patch | 35 -------
 ...all-split-ldd-command-arguments-for-.patch | 91 +++++++++++++++++++
 ...stall-Do-not-undef-_FILE_OFFSET_BITS.patch | 32 -------
 ....h-include-sys-reg.h-when-libc-glibc.patch | 35 -------
 .../dracut/{dracut_056.bb => dracut_102.bb}   |  8 +-
 5 files changed, 94 insertions(+), 107 deletions(-)
 delete mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch
 create mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-feat-dracut-install-split-ldd-command-arguments-for-.patch
 delete mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch
 delete mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch
 rename meta-initramfs/recipes-devtools/dracut/{dracut_056.bb => dracut_102.bb} (85%)
meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch deleted +0 -35
deleted file mode 100644
index bd768d00d..000000000
@@ -1,35 +0,0 @@
-From ff5e1a662ba93ba79e2aeaaaec48a2a8ec4b4701 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <[email protected]>
-Date: Thu, 31 Mar 2022 22:22:44 +0800
-Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc
-
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <[email protected]>
----
- src/install/util.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/install/util.c b/src/install/util.c
-index 5721de89..784aec48 100644
---- a/src/install/util.c
-+++ b/src/install/util.c
-@@ -27,6 +27,7 @@
- 
- #include "util.h"
- 
-+#if defined(__GLIBC__)
- #if __GLIBC_PREREQ(2, 30) == 0
- #include <sys/syscall.h>
- #ifndef SYS_gettid
-@@ -35,6 +36,7 @@
- 
- #define gettid()    ((pid_t) syscall(SYS_gettid))
- #endif /*__GLIBC_PREREQ */
-+#endif /*__GLIBC__*/
- 
- size_t page_size(void)
- {
--- 
-2.25.1
-
meta-initramfs/recipes-devtools/dracut/dracut/0001-feat-dracut-install-split-ldd-command-arguments-for-.patch new file +91 -0

91 lines not on this page · raw message

meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch deleted +0 -32
deleted file mode 100644
index 170df7119..000000000
@@ -1,32 +0,0 @@
-From 7f8ef553b7c433af153d48c6a16b2943780abf67 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 31 Dec 2022 14:41:52 -0800
-Subject: [PATCH] install: Do not undef _FILE_OFFSET_BITS
-
-_FILE_OFFSET_BITS is a feature test macro to determine largefile
-support. Usually its set to 64 on systems supporting LFS. Its also
-needed to be set to 64 for supporting 64bit time_t on glibc on 32bit
-systems. If its undefined explicitly, then 64bit time_t can not be
-enabled.
-
-Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/2157]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/install/dracut-install.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
-index dda0caca..05a67a03 100644
---- a/src/install/dracut-install.c
-+++ b/src/install/dracut-install.c
-@@ -22,7 +22,6 @@
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
--#undef _FILE_OFFSET_BITS
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
--- 
-2.39.0
-
meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch deleted +0 -35
deleted file mode 100644
index 68ec2b8fd..000000000
@@ -1,35 +0,0 @@
-From 9f7740c4c2fda64029c23674e9858ce8bd4367df Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 13 Jul 2017 17:14:05 -0700
-Subject: [PATCH] util.h: include <sys/reg.h> when libc != glibc
-
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
-Taken from void-linux
-https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dracut/patches/musl-__wordsize.patch
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Pending
-
- src/install/util.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/install/util.h b/src/install/util.h
-index a6f9a184..82732913 100644
---- a/src/install/util.h
-+++ b/src/install/util.h
-@@ -36,6 +36,9 @@
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- 
- #include "macro.h"
- 
--- 
-2.17.1
-
meta-initramfs/recipes-devtools/dracut/dracut_102.bb renamed from meta-initramfs/recipes-devtools/dracut/dracut_056.bb +3 -5
similarity index 85%
rename from meta-initramfs/recipes-devtools/dracut/dracut_056.bb
rename to meta-initramfs/recipes-devtools/dracut/dracut_102.bb
index db08fffe9..39ff265a3 100644
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 PE = "1"
 
-SRCREV = "631d5f72a223288aa1f48bb8e8d0313e75947400"
-SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http;branch=master \
-           file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \
-           file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \
-           file://0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch \
+SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e"
+SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \
+           file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \
            "
 
 DEPENDS += "kmod"
Signature · 1 line
2.45.2