util-linux: 2.40.1

This commit is contained in:
Owen Rafferty 2024-06-01 19:12:21 -05:00
parent 67bf7080ca
commit 82ae680b4a
No known key found for this signature in database
4 changed files with 13 additions and 16 deletions

View File

@ -1,2 +1,2 @@
6d1740c74ea7e47037320259b0e7a772aabc1cfcccf4ac2d3cc1726639ecb92d18
6b51fa77e279b775004865b7514650f06156406048fd652bfbf10a84f031599444
cffdf814bf69f805bf391688add8f2163190af6eb33c32afbcbda8aea362545f82
89f707a429557c0b88c53327187c11d6dc740eba2d8a537962cfe362e0c8763fa5

View File

@ -1,28 +1,25 @@
diff --git a/tools/all_syscalls b/tools/all_syscalls
index 9c14778..8f0d582 100755
index eccb0d0..3d7a34f 100755
--- a/tools/all_syscalls
+++ b/tools/all_syscalls
@@ -1,4 +1,4 @@
@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/bin/sh
set -e
-set -o pipefail
@@ -7,9 +7,14 @@ SYSCALL_INCLUDES="
SED="$1"
shift
@@ -10,9 +9,9 @@ SYSCALL_INCLUDES="
#include <sys/syscall.h>
"
-trap 'rm $OUTPUT $OUTPUT.deps' ERR
+trap '[ $? -eq 0 ] || rm $OUTPUT $OUTPUT.deps' EXIT
-trap 'rm -f $OUTPUT $OUTPUT.deps' ERR
+trap '[ $? -eq 0 ] || rm -f $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_([^ ]+)/) {
+ split(substr($0, RSTART + 1, RLENGTH - 1), syscall_split)
+ syscall_nr_def = syscall_split[2]
+ syscall_name = substr(syscall_nr_def, 6)
+ print "UL_SYSCALL(\"" syscall_name "\", " syscall_nr_def ")"
+ }' \
| "$SED" -n -e 's/^#define __NR_\([^ ]*\).*$/UL_SYSCALL("\1", __NR_\1)/p' \
| sort \
> "$OUTPUT"

View File

@ -1,2 +1,2 @@
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.tar.xz
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.1.tar.xz
patches/posix.patch

View File

@ -1 +1 @@
2.40 1
2.40.1 1