2024. 06. 10. 16:34 keltezéssel, Khem Raj írta:
On Mon, Jun 10, 2024 at 3:24 AM Zoltán Böszörményi <[email protected]> wrote: Dropped 0001-util.h-include-sys-reg.h-when-libc-glibc.patch that's unnecessary for a long time now, because dracut (since version 049) does not rely on __WORDSIZE. Does this still build on musl without this patch
It should. The patch description had this: "For musl libc it is required to include <sys/reg.h> to have __WORDSIZE defined to e.g. 32 for arm*-musl." Since this commit in version 049, dracut doesn't actually use __WORDSIZE: commit 838f22259a50e5f92429ecdd24b897c1128edc98 Author: Alexander Tsoy <[email protected]> Date: Sun Sep 9 02:47:09 2018 +0300 install: avoid non-portable __WORDSIZE Lets not unnecessarily rely on __WORDSIZE, which is not clearly specified by any spec. Use explicit size comparisons if we're not interested in the WORDSIZE, anyway. Patch ported from systemd. (commit 8507eb20b64010b26f23822cbf442bb0bf96511c) Original-patch-by: Emil Renner Berthing <[email protected]> Bug: https://bugs.gentoo.org/602122
Signed-off-by: Zoltán Böszörményi <[email protected]> --- ....h-include-sys-reg.h-when-libc-glibc.patch | 35 ------------------- .../recipes-devtools/dracut/dracut_102.bb <http://dracut_102.bb> | 1 - 2 files changed, 36 deletions(-) delete mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch deleted file mode 100644 index 68ec2b8fd..000000000 --- a/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch +++ /dev/null @@ -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 - diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb <http://dracut_102.bb> b/meta-initramfs/recipes-devtools/dracut/dracut_102.bb <http://dracut_102.bb> index 496380a0f..39ff265a3 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb <http://dracut_102.bb> +++ b/meta-initramfs/recipes-devtools/dracut/dracut_102.bb <http://dracut_102.bb> @@ -9,7 +9,6 @@ PE = "1" SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e" SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main <http://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main> \ - file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ "-- 2.45.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110799): https://lists.openembedded.org/g/openembedded-devel/message/110799 Mute This Topic: https://lists.openembedded.org/mt/106589710/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
