diff --git a/extra/util-linux/build b/extra/util-linux/build index e6fe58d0..e27f5ceb 100755 --- a/extra/util-linux/build +++ b/extra/util-linux/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < posix.patch + ./configure \ --prefix=/usr \ --localstatedir=/var \ diff --git a/extra/util-linux/checksums b/extra/util-linux/checksums index c1849a6e..eed8c907 100644 --- a/extra/util-linux/checksums +++ b/extra/util-linux/checksums @@ -1 +1,2 @@ -69d498a93b08e1bc6dbf44ef78661c8fc8e52b086150eb13ef52290308c6525c02 +6d1740c74ea7e47037320259b0e7a772aabc1cfcccf4ac2d3cc1726639ecb92d18 +5693b92b54eb479474dc706fdbca7afd1e09af992b9614b913130a7766606ed2e0 diff --git a/extra/util-linux/patches/posix.patch b/extra/util-linux/patches/posix.patch new file mode 100644 index 00000000..f2a45776 --- /dev/null +++ b/extra/util-linux/patches/posix.patch @@ -0,0 +1,23 @@ +diff --git a/tools/all_syscalls b/tools/all_syscalls +index 9c14778..062ac4e 100755 +--- a/tools/all_syscalls ++++ b/tools/all_syscalls +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + set -e + +@@ -7,9 +7,9 @@ SYSCALL_INCLUDES=" + #include + " + +-trap 'rm $OUTPUT $OUTPUT.deps' ERR ++trap '[ $? -eq 0 ] || rm $OUTPUT $OUTPUT.deps' EXIT + +-"$@" -MD -MF "$OUTPUT.deps" <<< "$SYSCALL_INCLUDES" -dM -E - \ +- | gawk 'match($0, /^#define __NR_([^ ]+)/, res) { print "UL_SYSCALL(\"" res[1] "\", __NR_" res[1] ")" }' \ ++echo "$SYSCALL_INCLUDES" | "$@" -MD -MF "$OUTPUT.deps" -dM -E - \ ++ | awk 'match($0, /^#define __NR_([^ ]+)/, res) { print "UL_SYSCALL(\"" res[1] "\", __NR_" res[1] ")" }' \ + | sort \ + > "$OUTPUT" diff --git a/extra/util-linux/sources b/extra/util-linux/sources index 58d2a98c..ff52c15b 100644 --- a/extra/util-linux/sources +++ b/extra/util-linux/sources @@ -1 +1,2 @@ -https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.3.tar.xz +https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.tar.xz +patches/posix.patch diff --git a/extra/util-linux/version b/extra/util-linux/version index ded98bd6..d9e6960d 100644 --- a/extra/util-linux/version +++ b/extra/util-linux/version @@ -1 +1 @@ -2.39.3 1 +2.40 1