diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-18 07:05:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-18 07:06:10 +0000 |
| commit | 3b709006ee1bba367eb8febd0d9c544cfbf26515 (patch) | |
| tree | cf29671af5c6b4b1c47e5137588b197edd2c3a46 /main/abuild | |
| parent | 93813075dccd7dae69f4e54f09ac2f66e0f46505 (diff) | |
| download | aports-3b709006ee1bba367eb8febd0d9c544cfbf26515.tar.bz2 aports-3b709006ee1bba367eb8febd0d9c544cfbf26515.tar.xz | |
main/abuild: fix bug in up2date check
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-fix-apk_up2date-check.patch | 26 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 12 |
2 files changed, 34 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-fix-apk_up2date-check.patch b/main/abuild/0001-abuild-fix-apk_up2date-check.patch new file mode 100644 index 0000000000..02cef4bfa3 --- /dev/null +++ b/main/abuild/0001-abuild-fix-apk_up2date-check.patch @@ -0,0 +1,26 @@ +From 15fedf5f425b562b5793e430ef422b0bbf1050ed Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 18 May 2016 06:59:47 +0000 +Subject: [PATCH] abuild: fix apk_up2date check + +fix check that all subpackages exists, not only main package +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index d6cdf6c..db82cfd 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1622,7 +1622,7 @@ apk_up2date() { + local i s + cd "$startdir" + for i in $pkgname $subpackages; do +- [ -f "$PKGDEST/$pkgname-$pkgver-r$pkgrel.apk" ] || return 1 ++ [ -f "$PKGDEST/${i%:*}-$pkgver-r$pkgrel.apk" ] || return 1 + done + [ -n "$keep" ] && return 0 + +-- +2.8.2 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 3b8196b402..1197fa6aad 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.27.1 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -20,6 +20,7 @@ subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems" options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz + 0001-abuild-fix-apk_up2date-check.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -64,6 +65,9 @@ gems() { mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ } -md5sums="7fd3556f17d2ca1d663bdb8259ad1b13 abuild-2.27.1.tar.xz" -sha256sums="fe4edac6ab43de765d9efc009278247ecab0dab1177a61e174a7e427edb6c723 abuild-2.27.1.tar.xz" -sha512sums="9bad79a2a24f3df0ef7323f2c6fa8f597ebfd93b2cc1a156d559ccd69f0d94958ba3b76febcf553cdd0173bcdd5d8ddf6ab2eca03f5737a523aefc8e6809a9f9 abuild-2.27.1.tar.xz" +md5sums="7fd3556f17d2ca1d663bdb8259ad1b13 abuild-2.27.1.tar.xz +bca264e091cc2fbda111adeb65a75809 0001-abuild-fix-apk_up2date-check.patch" +sha256sums="fe4edac6ab43de765d9efc009278247ecab0dab1177a61e174a7e427edb6c723 abuild-2.27.1.tar.xz +538241b8c5a86b2bf3b48e20f60995ced90b1bf893385a2e76942b5d4e6ebafe 0001-abuild-fix-apk_up2date-check.patch" +sha512sums="9bad79a2a24f3df0ef7323f2c6fa8f597ebfd93b2cc1a156d559ccd69f0d94958ba3b76febcf553cdd0173bcdd5d8ddf6ab2eca03f5737a523aefc8e6809a9f9 abuild-2.27.1.tar.xz +a5af9fe55bd36db8bcb407826520250e41d2c5b99054ef0a6cfb87d428064286c6cbe8144e269175d361822d0a4a220211302dc16e4342916238bc802bedf309 0001-abuild-fix-apk_up2date-check.patch" |