diff options
| author | G.J.R. Timmer <gjr.timmer@gmail.com> | 2017-01-31 12:33:54 +0100 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-08 13:06:46 +0200 |
| commit | c7a1f704454739abfe45ca40dbcd7aac3ec9b248 (patch) | |
| tree | ccc838c3cbd182d644e65a5c0178bb6a5820ce93 /main | |
| parent | f8ab81080978ddf434cd9cb78a4ec989a6176d3b (diff) | |
| download | aports-c7a1f704454739abfe45ca40dbcd7aac3ec9b248.tar.bz2 aports-c7a1f704454739abfe45ca40dbcd7aac3ec9b248.tar.xz | |
main/abuild: add patch to workaround filesystem bugs
Diffstat (limited to 'main')
| -rw-r--r-- | main/abuild/0001-abuild-properly-detect-package-size-on-filesystems.patch | 18 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 6 |
2 files changed, 23 insertions, 1 deletions
diff --git a/main/abuild/0001-abuild-properly-detect-package-size-on-filesystems.patch b/main/abuild/0001-abuild-properly-detect-package-size-on-filesystems.patch new file mode 100644 index 0000000000..2aab1b1c93 --- /dev/null +++ b/main/abuild/0001-abuild-properly-detect-package-size-on-filesystems.patch @@ -0,0 +1,18 @@ +diff --git a/abuild.in b/abuild.in +index 35b7995572..2d1d9e644d 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -812,6 +812,13 @@ prepare_metafiles() { + cd "$dir" + mkdir -p "$controldir" + local builddate=$(date -u "+%s") ++ ++ # Fix package size on several filesystems ++ case "$(df -PT . | awk 'END {print $2}')" in ++ btrfs|ecryptfs|zfs) ++ sync;; ++ esac ++ + local size=$(du -sk | awk '{print $1 * 1024}') + + if [ "$arch" != "$apkbuild_arch" ]; then diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 18e37cf0e6..5ba376b822 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.29.0 _ver=${pkgver%_git*} -pkgrel=3 +pkgrel=4 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -22,6 +22,7 @@ pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-properly-detect-failure-of-dependency-install.patch 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch + 0001-abuild-properly-detect-package-size-on-filesystems.patch 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch " @@ -68,12 +69,15 @@ gems() { md5sums="1a51f8786331ddf79bf46357fe938f6a abuild-2.29.0.tar.xz 5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch fd7ac6bc2c104869b6c21d75570f4e01 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch +5f8853c8afa27f49bc2cf1216c4b95c3 0001-abuild-properly-detect-package-size-on-filesystems.patch 47bced6bf9bc8bd3f9fc7e3f899b8cca 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch" sha256sums="06ba81d4b42e7d1ebb0761b0b0e1cbaf999acac54ab075906cecdf8f825950c1 abuild-2.29.0.tar.xz e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch 24f0ceb383a8651f3df192773d62c7258d2ce9b3220fcedfe9a2c173d522111a 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch +3d4a2534548b25b9f0497c1a3536ae7585a0595547f4844e69a362751baa754e 0001-abuild-properly-detect-package-size-on-filesystems.patch d897d365fdf9ab7bb911ff37af4d1287e7891ca7b49ad5a1196c076cd5bd5322 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch" sha512sums="349c0d5efaff05dc6f680a93e59a997857991520ae892426252d198aa4ef0b2854f1675ce3b1bc1bea810d5f97fae0985474ea13df3905d590b320373723990c abuild-2.29.0.tar.xz 1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch 655476f5d263701d59f85ff8c28c342d8d0710bb6c869ca7e0cb8df9f70ca2cd5af44c460b578f6ebcf320774575ce193be15830b942a956a04c0345bf27bd4e 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch +fb7d65b1c65368dfddf7e3b55774a699169eb1de63e1aa619d5a210773e912e66c6a573d7fb98d579e30f416968592592d7a912fb6efce8805ac0f149c500776 0001-abuild-properly-detect-package-size-on-filesystems.patch 6f4212c796829578f318b257adcfdf493a1520cd45c623c110a3181fd076bbcb94f84b04f9292bd081a923e5819448673e5adc1a3e8450e086784c00c3515459 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch" |