diff options
author | Ron Yorston <rmy@pobox.com> | 2022-10-30 08:35:01 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2022-10-30 08:35:01 +0000 |
commit | 663319cec41bbff8b6e0e47fee7fedc84acfeafc (patch) | |
tree | 4f99dc0c566e5f2d30b55abc60d8565c35852f7c | |
parent | 7390f29cfc9a3cc0636e20f84f24fbd05f821720 (diff) | |
download | busybox-w32-663319cec41bbff8b6e0e47fee7fedc84acfeafc.tar.gz busybox-w32-663319cec41bbff8b6e0e47fee7fedc84acfeafc.tar.bz2 busybox-w32-663319cec41bbff8b6e0e47fee7fedc84acfeafc.zip |
build system: fix breakage affecting MSYS2 build
Upstream changes to the embedded_scripts and mkconfigs scripts
resulted in busybox-w32 failing to build with MSYS2.
bzip2 in MSYS2 detects stdout redirected to /dev/null as a terminal
and returns a non-zero exit status. Since the test is only for
the existence of bzip2, not its functionality, even an exit status
of 1 is OK. Only fail if the exit status is 127.
-rwxr-xr-x | scripts/embedded_scripts | 4 | ||||
-rwxr-xr-x | scripts/mkconfigs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/embedded_scripts b/scripts/embedded_scripts index 8407c1f78..88c3a13cb 100755 --- a/scripts/embedded_scripts +++ b/scripts/embedded_scripts | |||
@@ -23,8 +23,8 @@ if test $? != 0; then | |||
23 | exit 1 | 23 | exit 1 |
24 | fi | 24 | fi |
25 | 25 | ||
26 | bzip2 </dev/null >/dev/null | 26 | bzip2 </dev/null >/dev/null 2>&1 |
27 | if test $? != 0; then | 27 | if test $? = 127; then |
28 | echo 'bzip2 is not installed' | 28 | echo 'bzip2 is not installed' |
29 | exit 1 | 29 | exit 1 |
30 | fi | 30 | fi |
diff --git a/scripts/mkconfigs b/scripts/mkconfigs index 1bbf10c3a..9e4be6199 100755 --- a/scripts/mkconfigs +++ b/scripts/mkconfigs | |||
@@ -33,8 +33,8 @@ if test $? != 0; then | |||
33 | echo 'od tool is not installed or cannot accept "-v -b" options' | 33 | echo 'od tool is not installed or cannot accept "-v -b" options' |
34 | exit 1 | 34 | exit 1 |
35 | fi | 35 | fi |
36 | bzip2 </dev/null >/dev/null | 36 | bzip2 </dev/null >/dev/null 2>&1 |
37 | if test $? != 0; then | 37 | if test $? = 127; then |
38 | echo 'bzip2 is not installed' | 38 | echo 'bzip2 is not installed' |
39 | exit 1 | 39 | exit 1 |
40 | fi | 40 | fi |