diff options
Diffstat (limited to 'meta-initramfs/recipes-devtools/dracut/dracut')
5 files changed, 76 insertions, 115 deletions
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch new file mode 100644 index 0000000000..bd768d00d2 --- /dev/null +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch @@ -0,0 +1,35 @@ +From ff5e1a662ba93ba79e2aeaaaec48a2a8ec4b4701 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +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 <yi.zhao@windriver.com> +--- + 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 + diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch deleted file mode 100644 index 06e0a094f9..0000000000 --- a/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 974f728410052bc8fa18d93dc0c1a991bcdb96e6 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 3 Apr 2019 15:24:47 +0800 -Subject: [PATCH] dracut.sh: improve udevdir - -In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir -fallback logic], it checked a common binary `collect' to localte -udevdir. - -But upstream systemd drop binary `collect'. -[https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb] - -So check binary `ata_id' to instead. - -Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/558] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - dracut.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 3dc2adc..cc8b01a 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1311,8 +1311,8 @@ done - [[ -d $udevdir ]] \ - || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" - if ! [[ -d "$udevdir" ]]; then -- [[ -e /lib/udev/collect ]] && udevdir=/lib/udev -- [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev -+ [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev -+ [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev - fi - - [[ -d $systemdutildir ]] \ --- -2.7.4 - diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch new file mode 100644 index 0000000000..170df7119f --- /dev/null +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch @@ -0,0 +1,32 @@ +From 7f8ef553b7c433af153d48c6a16b2943780abf67 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 + diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch deleted file mode 100644 index 13d2cfa877..0000000000 --- a/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 6e0da103effe64832eea52fad5c44a328f7141b7 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 20 Jun 2019 17:31:11 +0800 -Subject: [PATCH] set viriable _drv not local - -If shebang is set to /bin/sh and /bin/sh is a symlink to /bin/bash, -bash turn on posix mode. - -Since bash is upgraded to 5.0, it follows 'IEEE 1003.2 POSIX Shell -Standard', to implement 'functions do not have local traps or options, -and it is not possible to define local variables' - -For more detail, see variables.c:push_posix_temp_var in the following commit -http://git.savannah.gnu.org/cgit/bash.git/commit/?id=d233b485e83c3a784b803fb894280773f16f2deb - -The IEEE 1003.2 POSIX Shell Standard: -https://www.cs.ait.ac.th/~on/O/oreilly/unix/ksh/appa_02.htm - -While /bin/sh points to bash 5.0, it caused the following issue: - -$ cat <<ENDOF>case.sh -fsck_drv_com(){ - echo "issuing \$_drv" -} - -fsck_able() { - _drv="_drv=e2fsck fsck_drv_com" -} - -fsck_single() { - local _drv - fsck_able - eval "\$_drv" -} -fsck_single -ENDOF -$ chmod a+x case.sh - -Unexpected: -$ ./cash.sh -issuing _drv=e2fsck fsck_drv_com - -Set viriable _drv not local, get expected result: -$ ./case.sh -issuing e2fsck - -Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/587] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - modules.d/99fs-lib/fs-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh -index d39ca1b..60877ee 100755 ---- a/modules.d/99fs-lib/fs-lib.sh -+++ b/modules.d/99fs-lib/fs-lib.sh -@@ -142,7 +142,7 @@ fsck_single() { - local _fs="${2:-auto}" - local _fsopts="$3" - local _fop="$4" -- local _drv -+ _drv="" - - [ $# -lt 2 ] && return 255 - # if UUID= marks more than one device, take only the first one --- -2.7.4 - 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 index 32714038b9..68ec2b8fdb 100644 --- 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 @@ -1,4 +1,4 @@ -From 06011ce55b1e892e863568a73d64eebc6389544f Mon Sep 17 00:00:00 2001 +From 9f7740c4c2fda64029c23674e9858ce8bd4367df Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 13 Jul 2017 17:14:05 -0700 Subject: [PATCH] util.h: include <sys/reg.h> when libc != glibc @@ -11,13 +11,15 @@ https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dracut/patches/mu Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - install/util.h | 3 +++ +Upstream-Status: Pending + + src/install/util.h | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/install/util.h b/install/util.h -index 2ad3254d..062626ec 100644 ---- a/install/util.h -+++ b/install/util.h +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> @@ -29,5 +31,5 @@ index 2ad3254d..062626ec 100644 #include "macro.h" -- -2.13.2 +2.17.1 |