diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/git/fetch.sh | 3 | ||||
| -rw-r--r-- | pkg/linux-headers/fetch.sh | 4 | ||||
| -rw-r--r-- | pkg/openbsd/fetch.sh | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/pkg/git/fetch.sh b/pkg/git/fetch.sh index cac21b42..9b17a0d5 100644 --- a/pkg/git/fetch.sh +++ b/pkg/git/fetch.sh @@ -1,5 +1,4 @@ : "${SHA256SUM:=sha256sum}" -: "${PAXREAD:=pax -r}" set -e @@ -18,4 +17,4 @@ if ! $SHA256SUM -c sha256 2>/dev/null ; then fi read -r _ archive <sha256 -gzip -d -c "$archive" | $PAXREAD -s ',^\.,src/man,' +sh "$OLDPWD/scripts/extract.sh" "$archive" -s ',^\.,src/man,' diff --git a/pkg/linux-headers/fetch.sh b/pkg/linux-headers/fetch.sh index 94d70276..0d5f32d8 100644 --- a/pkg/linux-headers/fetch.sh +++ b/pkg/linux-headers/fetch.sh @@ -1,5 +1,4 @@ : "${SHA256SUM:=sha256sum}" -: "${PAXREAD:=pax -r}" set -e @@ -18,8 +17,7 @@ if ! $SHA256SUM -c sha256 2>/dev/null ; then fi read -r _ archive <sha256 - -xz -d -c "$archive" | $PAXREAD -s ',^[^/]*,src,' \ +sh "$OLDPWD/scripts/extract.sh" "$archive" -s ',^[^/]*,src,' \ 'linux-*/Makefile' \ 'linux-*/arch/*/include/uapi' \ 'linux-*/arch/*/syscalls' \ 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/* |