summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-08-31 17:44:35 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-08-31 17:44:35 +0000
commitc8e3e4ae4e5bcd6ec65eaf7055b38da52a9a56db (patch)
treea6b485b6b22cad6b82bd80b415c63c251132eb34 /system
parent99cab525cb92311fde8d096b776b04799c169832 (diff)
downloadpackages-c8e3e4ae4e5bcd6ec65eaf7055b38da52a9a56db.tar.gz
packages-c8e3e4ae4e5bcd6ec65eaf7055b38da52a9a56db.tar.bz2
packages-c8e3e4ae4e5bcd6ec65eaf7055b38da52a9a56db.tar.xz
packages-c8e3e4ae4e5bcd6ec65eaf7055b38da52a9a56db.zip
system/abuild: use pigz where available for faster compression
Diffstat (limited to 'system')
-rw-r--r--system/abuild/APKBUILD6
-rw-r--r--system/abuild/use-pigz.patch19
2 files changed, 23 insertions, 2 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index 72ded2739..baf4aac5c 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=abuild
pkgver=3.2.0_rc1
-pkgrel=3
+pkgrel=4
pkgdesc="Script to build APK packages"
url="https://code.foxkit.us/adelie/aports"
arch="all"
@@ -23,6 +23,7 @@ source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz
0001-abuild-continue-faking-POSIX-support-for-now.patch
0001-newapkbuild-fix-typo.patch
0002-newapkbuild-move-checksum-call-to-after-fetch.patch
+ use-pigz.patch
"
builddir="$srcdir/$pkgname-$pkgver+adelie"
@@ -67,4 +68,5 @@ _rootbld() {
sha512sums="8d9e66ec6a4e814f9be0a10b53c4b183afa97c9969d9bb86fdec0b9096756d6343cec4840fb61a5812eb4879e61c106adbdd286e63d9cfc4f8b66b6cad79557b abuild-3.2.0_rc1+adelie.tar.xz
b7aa7ff9858eee2ff20eeed3b8da60d40e608b4da2676acb9c8b16ca6639283e5d70884888efd505fcd239bb462f726203e4773a4f706b16d07742b2a8631b6c 0001-abuild-continue-faking-POSIX-support-for-now.patch
4ef673998b8f28469eeb4d1448a664f7052686466a67b1a3f3cab1e249ad44308df92737da4eae3c3ffea06806f460e23fc1c0ddccd7f9e82c4e308cb63be029 0001-newapkbuild-fix-typo.patch
-c6ebe8219c2e8ec9fc75da1c597b2d8d960e632286a6c7f1d1ffb6623b4d4acca54ae90a6c07637c589cbbe3ed2fb0da0c26a41df20cac0318b4894991e2dbf4 0002-newapkbuild-move-checksum-call-to-after-fetch.patch"
+c6ebe8219c2e8ec9fc75da1c597b2d8d960e632286a6c7f1d1ffb6623b4d4acca54ae90a6c07637c589cbbe3ed2fb0da0c26a41df20cac0318b4894991e2dbf4 0002-newapkbuild-move-checksum-call-to-after-fetch.patch
+b428baddee9b719898a6e7f87d3a990aa1000cac0b6bcf3890e7cafd0ee164164551e7c4699d12f29ea9b6364cc18722a5560b0b65b9d8f586caf739a5432313 use-pigz.patch"
diff --git a/system/abuild/use-pigz.patch b/system/abuild/use-pigz.patch
new file mode 100644
index 000000000..a917c8f81
--- /dev/null
+++ b/system/abuild/use-pigz.patch
@@ -0,0 +1,19 @@
+--- abuild-3.2.0_rc1+adelie/abuild.in.old 2018-05-20 03:17:19.884154704 +0000
++++ abuild-3.2.0_rc1+adelie/abuild.in 2018-08-31 17:42:34.900000000 +0000
+@@ -1466,6 +1466,7 @@
+ local datadir="$pkgbasedir"/$name
+ local subpkgname=$name
+ local subpkgarch=$(pkginfo_val arch $file)
++ local _mygzip=$(command -v pigz gzip | head -1)
+
+ trace_apk_deps "$name" "$dir" "$subpkgarch" || return 1
+ msg "Package size: ${size}"
+@@ -1478,7 +1479,7 @@
+ touch .dummy
+ set -- .dummy
+ fi
+- tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz
++ tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | $_mygzip -9 >"$dir"/data.tar.gz
+
+ msg "Create checksum..."
+ # append the hash for data.tar.gz