diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-25 08:25:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-25 11:01:33 +0000 |
| commit | c35071b7fe1097c231ef6f3e9d2f83b0eb6744f8 (patch) | |
| tree | 32183710091b172bbc113af1197e9853f7d35b9e | |
| parent | 29154b490c639b68f385e26a59f03912fa34f53b (diff) | |
| download | aports-c35071b7fe1097c231ef6f3e9d2f83b0eb6744f8.tar.bz2 aports-c35071b7fe1097c231ef6f3e9d2f83b0eb6744f8.tar.xz | |
main/abuild: backport arch check fix
| -rw-r--r-- | main/abuild/0001-abuild-exit-with-success-if-arch-is-disabled.patch | 27 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 6 |
2 files changed, 31 insertions, 2 deletions
diff --git a/main/abuild/0001-abuild-exit-with-success-if-arch-is-disabled.patch b/main/abuild/0001-abuild-exit-with-success-if-arch-is-disabled.patch new file mode 100644 index 0000000000..362ae60e48 --- /dev/null +++ b/main/abuild/0001-abuild-exit-with-success-if-arch-is-disabled.patch @@ -0,0 +1,27 @@ +From 1d291c47cd4ace2f97671a464c148ad4a138fce8 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 25 Jul 2017 07:06:06 +0000 +Subject: [PATCH] abuild: exit with success if arch is disabled + +the set -e made script exit early +--- + abuild.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/abuild.in b/abuild.in +index f935454..95e7a46 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -2247,8 +2247,7 @@ index() { update_abuildrepo_index; } + + all() { + if ! [ -n "$force" ]; then +- check_arch +- if [ $? -ne 0 ]; then ++ if ! check_arch; then + echo "Package not available for the target architecture ($CARCH). Aborting." + return 0 + fi +-- +2.13.2 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 3161bf9805..95d7d96fa2 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=3.0.0_rc4 _ver=${pkgver%_git*} -pkgrel=2 +pkgrel=3 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -23,6 +23,7 @@ pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-add-sanitycheck-for-secfixes-comment.patch 0001-abuild-sudo-prevent-forging-of-user-name.patch + 0001-abuild-exit-with-success-if-arch-is-disabled.patch " builddir="$srcdir/$pkgname-$_ver" @@ -71,4 +72,5 @@ _rootbld() { sha512sums="e3b3827b7c3ebdc5d8ab39b1fc514a3cc0ed75a6d5ebc86c9d986441a7a16c1a3aa11f9840c35aa7f000a593421fdc9804b3608d7247f0b4686ba48cc898846a abuild-3.0.0_rc4.tar.xz 94cdfba2c185e96d3a631b36f5b438fd95f90a73b06cbb4afa7864454e05b7c91f6e7a905d7ec73e39fdcf2ab050a7ca59129621dabb39bdc0e2bf2ba38871a0 0001-abuild-add-sanitycheck-for-secfixes-comment.patch -3b69a3ee4b07d2e7567408d24f41af4076a2a2948ccf2cacf7b6f1f964edf425c8cf49536e2e42c0eac16681d92daea96c10c41a797459a9aba9845d20a841fb 0001-abuild-sudo-prevent-forging-of-user-name.patch" +3b69a3ee4b07d2e7567408d24f41af4076a2a2948ccf2cacf7b6f1f964edf425c8cf49536e2e42c0eac16681d92daea96c10c41a797459a9aba9845d20a841fb 0001-abuild-sudo-prevent-forging-of-user-name.patch +d805b9883e2b52344981d016c3333add401b167076f8b932d3b4c2b46d3e003d260b203270879808f4429d763c65e2b03ea6a0439037de7f3746255dde988154 0001-abuild-exit-with-success-if-arch-is-disabled.patch" |