summaryrefslogtreecommitdiff
path: root/system/apk-tools/dash.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-08-05 01:16:41 +0000
committerSamuel Holland <samuel@sholland.org>2019-08-05 01:16:41 +0000
commit8466b5559e008686681ddd100cf8cdd9d01c3e2c (patch)
treecbce46a474b56517b5604ee02f696a4302257012 /system/apk-tools/dash.patch
parent3bf6c2f14c0cd6b736b5c74b3f48de16a81f74cc (diff)
downloadpackages-8466b5559e008686681ddd100cf8cdd9d01c3e2c.tar.gz
packages-8466b5559e008686681ddd100cf8cdd9d01c3e2c.tar.bz2
packages-8466b5559e008686681ddd100cf8cdd9d01c3e2c.tar.xz
packages-8466b5559e008686681ddd100cf8cdd9d01c3e2c.zip
system/apk-tools: Fix build with dash as /bin/sh
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'system/apk-tools/dash.patch')
-rw-r--r--system/apk-tools/dash.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/system/apk-tools/dash.patch b/system/apk-tools/dash.patch
new file mode 100644
index 000000000..811427d3c
--- /dev/null
+++ b/system/apk-tools/dash.patch
@@ -0,0 +1,14 @@
+--- apk-tools-2.10.4/test/solver.sh
++++ apk-tools-2.10.4/test/solver.sh
+@@ -11,9 +11,9 @@ TEST_TO_RUN="$@"
+ fail=0
+ pass=0
+ for test in ${TEST_TO_RUN:-*.test}; do
+- get_block ARGS < $test | xargs $APK_TEST &> .$test.got
++ get_block ARGS < $test | xargs $APK_TEST > .$test.got 2>&1
+
+- if ! get_block EXPECT < $test | cmp .$test.got &> /dev/null; then
++ if ! get_block EXPECT < $test | cmp .$test.got > /dev/null 2>&1; then
+ fail=$((fail+1))
+ echo "FAIL: $test"
+ get_block EXPECT < $test | diff -ru - .$test.got