aboutsummaryrefslogtreecommitdiffstats
path: root/main/aports-build
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-03-31 11:57:00 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-03-31 11:57:00 +0000
commita91d7b5f69eea2b5f8ecd89ea4eb4009809fa9a0 (patch)
tree1eb180542aa9cc8c3f89bfe12dbc5e5268f440f7 /main/aports-build
parent6e5db1d4d327c6b98878c345f811ee7ccfb43ea0 (diff)
downloadaports-a91d7b5f69eea2b5f8ecd89ea4eb4009809fa9a0.tar.bz2
aports-a91d7b5f69eea2b5f8ecd89ea4eb4009809fa9a0.tar.xz
main/aports-build: fix arch detection
Diffstat (limited to 'main/aports-build')
-rw-r--r--main/aports-build/APKBUILD10
-rw-r--r--main/aports-build/aports-build5
2 files changed, 6 insertions, 9 deletions
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 1bcece7736..725bd19cfc 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aports-build
-pkgver=0.4
+pkgver=0.5
pkgrel=0
pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
url="http://alpinelinux.org"
arch="noarch"
license="GPL2"
-depends="mosquitto-clients alpine-sdk mqtt-exec rsync lua-aports"
+depends="abuild>2.20.0 mosquitto-clients alpine-sdk mqtt-exec rsync lua-aports"
depends_dev=""
makedepends="$depends_dev mosquitto-dev"
install="$pkgname.pre-install"
@@ -39,12 +39,12 @@ package() {
"$pkgdir"/etc/conf.d/aports-build || return 1
}
-md5sums="6ee5c185fdb151780dcc80942e28eec9 aports-build
+md5sums="dc5386f37016c64e1cc68429948f0cdb aports-build
784238e965ca025c0c6ed13c8af01613 aports-build.initd
cdc49e0ef145de72131972a575f20e7b aports-build.confd"
-sha256sums="bcd3f72d11802022c910329f04514d54c53979238c53532b0e4097155804a12b aports-build
+sha256sums="16f93f98be45bf35421b31138d4e00f08ac46537ef9bd7e5172c29e1d7e05ff0 aports-build
88215b5969e5ffeda549c6e31de4563569ddee2ac3220c381d40f382d43f8323 aports-build.initd
519744cdb4be83e5da1c22d4aa93c7ef97d66e03565e84b710bc21c94b82047e aports-build.confd"
-sha512sums="54661751ef5756df0416092f86777f9014855a7e8969ea41ccebcdcd808a858686d17790e0932c73752cf3aad7a02d7b09f800fa7db2f8d34a067b6ff1965049 aports-build
+sha512sums="fa53869dd34bbb636c7f3ff78ca38506571dd5497694c3b8a6395cda682843e7a7b65d4a83ffb9f83ac46b77a6b8f66729c51af928516840d85e54ccd111a312 aports-build
2ef2fa6de4118209ab93a56216f106ac32078df762f4d67e900976c28bea96d44806f4679ef966472a3eb05fdaf1648aab17c0eaa897e8a06b1272766f29d22b aports-build.initd
fbe8ed4b1fbfc979de62302873e99c67bab751a7fcd921c3b23815f535cedb34c717e82b3c223f88e06498a573cbd147a73db7bf5adbb5e1947ac75fcb8edcb4 aports-build.confd"
diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build
index 7690753d63..4aae10239b 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -29,10 +29,7 @@ if [ -z "$rel" ]; then
esac
fi
-arch=x86
-case "$(uname -m)" in
- x86_64) arch=x86_64;;
-esac
+arch=$(abuild -A)
aports=${APORTS:-$HOME/aports}
isodir=$HOME/alpine-iso