diff options
| -rw-r--r-- | meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch | 35 | ||||
| -rw-r--r-- | meta-initramfs/recipes-devtools/dracut/dracut_102.bb | 1 |
2 files changed, 0 insertions, 36 deletions
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 68ec2b8fdb..0000000000 --- a/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 9f7740c4c2fda64029c23674e9858ce8bd4367df Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 13 Jul 2017 17:14:05 -0700 | ||
| 4 | Subject: [PATCH] util.h: include <sys/reg.h> when libc != glibc | ||
| 5 | |||
| 6 | For musl libc it is required to include <sys/reg.h> to | ||
| 7 | have __WORDSIZE defined to e.g. 32 for arm*-musl. | ||
| 8 | |||
| 9 | Taken from void-linux | ||
| 10 | https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dracut/patches/musl-__wordsize.patch | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | src/install/util.h | 3 +++ | ||
| 17 | 1 file changed, 3 insertions(+) | ||
| 18 | |||
| 19 | diff --git a/src/install/util.h b/src/install/util.h | ||
| 20 | index a6f9a184..82732913 100644 | ||
| 21 | --- a/src/install/util.h | ||
| 22 | +++ b/src/install/util.h | ||
| 23 | @@ -36,6 +36,9 @@ | ||
| 24 | #include <sys/stat.h> | ||
| 25 | #include <dirent.h> | ||
| 26 | #include <sys/resource.h> | ||
| 27 | +#if !defined(__GLIBC__) | ||
| 28 | +#include <sys/reg.h> | ||
| 29 | +#endif | ||
| 30 | |||
| 31 | #include "macro.h" | ||
| 32 | |||
| 33 | -- | ||
| 34 | 2.17.1 | ||
| 35 | |||
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb b/meta-initramfs/recipes-devtools/dracut/dracut_102.bb index 496380a0fb..39ff265a31 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_102.bb | |||
| @@ -9,7 +9,6 @@ PE = "1" | |||
| 9 | 9 | ||
| 10 | SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e" | 10 | SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e" |
| 11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ | 11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ |
| 12 | file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ | ||
| 13 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ | 12 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ |
| 14 | " | 13 | " |
| 15 | 14 | ||
