diff options
| author | Michael Forney <mforney@mforney.org> | 2020-05-08 13:05:22 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-05-08 13:05:22 -0700 |
| commit | f74127556dade2c7434517caf16967e452787d79 (patch) | |
| tree | 1227b2bce10bcd9878f3944800a34d7dfaded272 /pkg/openbsd/fetch.sh | |
| parent | 64dcee6008ce4d8704babb9a107fd0afdb6f4993 (diff) | |
Detect decompression tool automatically
This fixes cross-compilation from macOS, whose bsdtar does support
xz through liblzma, but does not have xz(1).
Diffstat (limited to 'pkg/openbsd/fetch.sh')
| -rw-r--r-- | pkg/openbsd/fetch.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/openbsd/fetch.sh b/pkg/openbsd/fetch.sh index c2a36ba8..021eb802 100644 --- a/pkg/openbsd/fetch.sh +++ b/pkg/openbsd/fetch.sh @@ -1,5 +1,4 @@ : "${SHA256SUM:=sha256sum}" -: "${PAXREAD:=pax -r}" set -e @@ -17,7 +16,7 @@ if ! $SHA256SUM -c sha256 2>/dev/null ; then $SHA256SUM -c sha256 fi -gzip -d -c src.tar.gz | $PAXREAD -s ',^,src/,' \ +sh "$OLDPWD/scripts/extract.sh" src.tar.gz -s ',^,src/,' \ 'bin/pax/*' \ 'include/*' \ 'lib/libc/*' \ @@ -32,6 +31,6 @@ gzip -d -c src.tar.gz | $PAXREAD -s ',^,src/,' \ 'usr.bin/rsync/*' \ 'usr.bin/yacc/*' \ 'usr.sbin/acme-client/*' -gzip -d -c sys.tar.gz | $PAXREAD -s ',^,src/,' 'sys/sys/*' +sh "$OLDPWD/scripts/extract.sh" sys.tar.gz -s ',^,src/,' 'sys/sys/*' git apply -v --whitespace=nowarn --directory "$dir/src" patch/* |