aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-08-17 15:59:40 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2015-08-17 16:05:38 +0200
commit2bfb0e9f6c594cb535b596424f48bd27ab119b9f (patch)
tree40c1f01056c7361fd27555d37720b694be40c53d
parent8b09bd9e9c477d5253214d8429943cb76d304327 (diff)
downloadaports-2bfb0e9f6c594cb535b596424f48bd27ab119b9f.tar.bz2
aports-2bfb0e9f6c594cb535b596424f48bd27ab119b9f.tar.xz
testing/android-tools: prefix source tarballs with $pkgname
to avoid source tarball name conflicts in future 'core' and 'extras' are too generic.
-rw-r--r--testing/android-tools/APKBUILD41
1 files changed, 21 insertions, 20 deletions
diff --git a/testing/android-tools/APKBUILD b/testing/android-tools/APKBUILD
index 756b5d3142..9b740a1b8d 100644
--- a/testing/android-tools/APKBUILD
+++ b/testing/android-tools/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=android-tools
-_realver=5.1.1_r13
-pkgver=${_realver/_/}
+pkgver=5.1.1_p13
+_realver=${pkgver/_p/_r}
pkgrel=0
pkgdesc="Android platform tools"
url="http://tools.android.com/"
@@ -13,10 +13,11 @@ depends_dev="openssl-dev pcre-dev"
makedepends="$depends_dev linux-headers bsd-compat-headers"
install=""
subpackages=""
-source="http://dev.alpinelinux.org/archive/$pkgname/core-$_realver.tar.gz
- http://dev.alpinelinux.org/archive/$pkgname/extras-$_realver.tar.gz
- http://dev.alpinelinux.org/archive/$pkgname/libselinux-$_realver.tar.gz
- http://dev.alpinelinux.org/archive/$pkgname/f2fs-tools-$_realver.tar.gz
+source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-core-$_realver.tar.gz
+ http://dev.alpinelinux.org/archive/$pkgname/$pkgname-extras-$_realver.tar.gz
+ http://dev.alpinelinux.org/archive/$pkgname/$pkgname-libselinux-$_realver.tar.gz
+ http://dev.alpinelinux.org/archive/$pkgname/$pkgname-f2fs-tools-$_realver.tar.gz
+
Makefile"
_giturl="https://android.googlesource.com/platform"
@@ -28,7 +29,7 @@ snapshot() {
local r=
for r in system/core system/extras external/libselinux external/f2fs-tools; do
local n="${r##*/}.git"
- local f="${r##*/}"
+ local f=$pkgname-"${r##*/}"
if [ -d "$n" ]; then
git --git-dir $n fetch || return 1
@@ -36,7 +37,7 @@ snapshot() {
git clone --bare $_giturl/$r || return 1
fi
- git --git-dir $n archive --prefix $f/ -o "$srcdir"/$f-$_realver.tar.gz $_gittag
+ git --git-dir $n archive --prefix ${f#$pkgname-}/ -o "$srcdir"/$f-$_realver.tar.gz $_gittag
scp "$srcdir"/$f-$_realver.tar.gz dev.alpinelinux.org:/archive/$pkgname/
done
}
@@ -56,18 +57,18 @@ package() {
-C "$srcdir" install
}
-md5sums="e9946249028d9c03cd9d1b5ddce64115 core-5.1.1_r13.tar.gz
-e8da77f958f96c42f4d72dddf06cec80 extras-5.1.1_r13.tar.gz
-3eb04ef3f8ef96a4a9edd9bbde04354c libselinux-5.1.1_r13.tar.gz
-e3436012ef8e572af0fbaddbed408928 f2fs-tools-5.1.1_r13.tar.gz
+md5sums="872508bf26b5e3cb04aa73d4ba558d9d android-tools-core-5.1.1_r13.tar.gz
+c1451c39af87f6e59330f222f69e143f android-tools-extras-5.1.1_r13.tar.gz
+e6eb1bb16898e4ef2000f0dab4e921bd android-tools-libselinux-5.1.1_r13.tar.gz
+9087604b3553d1e6f5070f72b9299ec5 android-tools-f2fs-tools-5.1.1_r13.tar.gz
fab5e5dda238b0658d241029894a2da7 Makefile"
-sha256sums="e76af99540fdbda228ed1e1653a66c37de62704e1927ded32257b480cec35063 core-5.1.1_r13.tar.gz
-ee7fd083a1cf1952bee3f0fd60a5345269b62634013ecb832113fb93283ed22d extras-5.1.1_r13.tar.gz
-05426dd4b7597c2baae7bd59fafc1077eba98634389d4c32b19ead32c0e90b6e libselinux-5.1.1_r13.tar.gz
-a520c6e52d82626081ff414d90121d73c02292e1a148ebf1ca3bd48b5d0af0bc f2fs-tools-5.1.1_r13.tar.gz
+sha256sums="d3ce45dafe5d5388ad6092186753c5482993a81995fb44ffb24bbe756f996c9e android-tools-core-5.1.1_r13.tar.gz
+08487b9009067dba2ccd436330873350b9a556fe0a19bd191468e145f99fd14c android-tools-extras-5.1.1_r13.tar.gz
+d010434fe8dffe7e7bd649c3b071fd21676b17b861457055637451d3fdb418bb android-tools-libselinux-5.1.1_r13.tar.gz
+f9a4c9747bbebbdde5b712e9aac644d8af2b1c8ab2ef340c22824c3e64fa3f49 android-tools-f2fs-tools-5.1.1_r13.tar.gz
7913d8ba35873e8224e2efe38f035d2eaebfd24fcdf06c4ea6d0795a4010192d Makefile"
-sha512sums="8791c63ee633de2bad72b6e6de256d05328f46d0fc5bb12cd57013b7fef47d80354a675457951e2bf2a6f07328f35c83d06f1023d4bc6274723cf6d0d97ca4db core-5.1.1_r13.tar.gz
-f64d16227495a8861265b64744cf7999c39745b2d4bdbe0bd342afc8603623d949a2b2ab11b0d619e91b263848b5c912bd547d27ff020c925fc0f1d2f0f9d60c extras-5.1.1_r13.tar.gz
-a61055c53afbeed356013e265cf5ef842a58f3e8d8f23450a74c53079f6efb4cfbcd4b53e8b0db1c95eb4339e7b04c65a82542692fb850d9bf5c6fd35b06f57f libselinux-5.1.1_r13.tar.gz
-7025658b154065fb1659272f488d8415f5a325bdfab985c07a53097db6b5eed440f8f88a95a51a02a78bee0c657a0da13bbf6010cdba2cbadd0cc072e3fb163b f2fs-tools-5.1.1_r13.tar.gz
+sha512sums="46081c68fb9907ac454ffbb6d9c783eec31a112b9a87d0fd77f6b5cba3b1b6ccc1f9c05b05699d0fe3f6fb82e71900ecf5b4813fdae393f02ff518c5a7500ad6 android-tools-core-5.1.1_r13.tar.gz
+318a8ea0dc9b956d329405eb807d61972579ea04ec1692ea0b1c7f273339a14353f52f15b4f5f5e61357fee1cf010ddee116ef8b6428a76de8c4adbba23900a1 android-tools-extras-5.1.1_r13.tar.gz
+2f301ebbe079eff510df3312b6d63bdd6e456c0e418f6a94a6718f5560f94c402851dcf5edfda71315570fd6a8fcd6306d8c640a74ee36efb39e73318e8d570f android-tools-libselinux-5.1.1_r13.tar.gz
+9bc54d777f4ead1878e389932f1b60027b146a6a1afa78f187e20dd473826b8a02dbadaced87ef3f764941712f99c81e8113cc6e5cb1f0e7975c7af747d7c3aa android-tools-f2fs-tools-5.1.1_r13.tar.gz
07aedfba9a401e329aa7790b696b43f4d6993cbaa9cd6f5022b4bcd79c55b7cf8394fd812c697d9837496d1d5bda0db8912f4d8f460b9f6a834ce590aab05476 Makefile"