From: Karel Zak <kzak@redhat.com>
Date: Tue, 15 Aug 2023 10:49:20 +0000 (+0200)
Subject: Revert "tools/all_syscalls: use pipefail"
X-Git-Tag: v2.40-rc1~281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e7f8b4da2c81d9abb903fd39a7cb4edd09b087a;p=thirdparty%2Futil-linux.git

Revert "tools/all_syscalls: use pipefail"

Our CI don't like it.

See also old http://github.com/util-linux/util-linux/commit/fffe5f7c72121c054645c60c0bb49f653bb7142e

This reverts commit d53a1529bd79077a8e7232651f99f20890283c0c.
---

diff --git a/tools/all_syscalls b/tools/all_syscalls
index e4327b2d99..aa068a3f20 100755
--- a/tools/all_syscalls
+++ b/tools/all_syscalls
@@ -1,17 +1,17 @@
 #!/bin/sh
 
+set -e
+
 OUTPUT=syscalls.h
 SYSCALL_INCLUDES="
 #include <sys/syscall.h>
 "
 
-# pipefail is part of modern POSIX
-# shellcheck disable=SC3040
-set -o pipefail
+trap 'rm $OUTPUT $OUTPUT.deps' ERR
 
 echo "$SYSCALL_INCLUDES" \
 	| "$@" -MD -MF "$OUTPUT.deps" -dM -E - \
 	| grep '^#define __NR_' \
 	| sed 's/#define __NR_\([^[:space:]]*\).*/UL_SYSCALL("\1", __NR_\1)/' \
 	| sort \
-	> "$OUTPUT" || { rm $OUTPUT $OUTPUT.deps; return 1; }
+	> "$OUTPUT"