Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-02-24 09:45:56 +0100
committerErich Eckner <git@eckner.net>2021-02-24 09:45:56 +0100
commit677f3c35f602804ad2df0cb3c420c3a08e49f0c9 (patch)
treec071871d4dd4f262f7066871bc0beca323cbd4ba
parent82e0903761aec5de5edafe9f4c46545daed78477 (diff)
bin/build-packages: compress with -19 if --ultra -20 fails
-rwxr-xr-xbin/build-packages6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 639e6e5..75cdbba 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -679,8 +679,12 @@ while [ "${count}" -ne 0 ] && \
# machine, if need arises in the future). Note, that it is no
# error, if the above build command already produced a
# compressed package.
+ # Since --ultra -20 seems too much for our i486 build vms, we
+ # silently fall back to -19 (without --ultra) if the higher
+ # level fails.
find . -maxdepth 1 -type f -name '*.pkg.tar' \
- -execdir zstd --rm -T0 --ultra -20 '{}' -o '{}.zst' \;
+ -not -execdir zstd --rm -T0 --ultra -20 '{}' -o '{}.zst' \; \
+ -execdir zstd --rm -T0 -19 '{}' -o '{}.zst' \;
# package files, that still exist, threw an error upon compression
errors=$(
find . -maxdepth 1 -type f -name '*.pkg.tar'