aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Manison <amanison@anselsystems.com>2010-05-05 21:29:13 +0000
committerAndrew Manison <amanison@anselsystems.com>2010-05-05 21:29:13 +0000
commitccf26410d30adc8c1934dd553687157ed6e31d69 (patch)
tree7947e9408c39ac6e1f852af52ad65abdc8032cde
parentbe0580cea9487dae7b0dae78d9c403a03d2b4c76 (diff)
downloadalpine_aports-ccf26410d30adc8c1934dd553687157ed6e31d69.tar.bz2
alpine_aports-ccf26410d30adc8c1934dd553687157ed6e31d69.tar.xz
alpine_aports-ccf26410d30adc8c1934dd553687157ed6e31d69.zip
Added support for distfiles in local directory, to support build bot.
-rw-r--r--main/abuild/0002-add-fetch-from-source-mirror.patch8
-rw-r--r--main/abuild/APKBUILD6
2 files changed, 9 insertions, 5 deletions
diff --git a/main/abuild/0002-add-fetch-from-source-mirror.patch b/main/abuild/0002-add-fetch-from-source-mirror.patch
index 926dbcc9a1..5cd9648526 100644
--- a/main/abuild/0002-add-fetch-from-source-mirror.patch
+++ b/main/abuild/0002-add-fetch-from-source-mirror.patch
@@ -15,7 +15,7 @@ diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in
15 # we need GNU wget for this 15 # we need GNU wget for this
16 case "$uri" in 16 case "$uri" in
17 https://*) opts="--no-check-certificate";; 17 https://*) opts="--no-check-certificate";;
18@@ -178,12 +177,22 @@ is_remote() { 18@@ -178,12 +177,26 @@ is_remote() {
19 return 1 19 return 1
20 } 20 }
21 21
@@ -24,7 +24,11 @@ diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in
24+ local uri="$1" 24+ local uri="$1"
25+ local d="${uri##*/}" # $(basename $uri) 25+ local d="${uri##*/}" # $(basename $uri)
26+ if [ -n "$DISTFILES_MIRROR" ]; then 26+ if [ -n "$DISTFILES_MIRROR" ]; then
27+ uri_fetch "$DISTFILES_MIRROR"/$d && return 0 27+ if [ -f "$DISTFILES_MIRROR"/$d ] ; then
28+ cp "$DISTFILES_MIRROR"/$d .
29+ else
30+ uri_fetch "$DISTFILES_MIRROR"/$d && return 0
31+ fi
28+ fi 32+ fi
29+ uri_fetch "$uri" 33+ uri_fetch "$uri"
30+} 34+}
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 4f3bc4f613..876a6e01a8 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,12 +2,12 @@
2pkgdesc="Script to build Alpine Packages" 2pkgdesc="Script to build Alpine Packages"
3pkgname=abuild 3pkgname=abuild
4pkgver=2.1 4pkgver=2.1
5pkgrel=1 5pkgrel=2
6url=http://git.alpinelinux.org/cgit/abuild/ 6url=http://git.alpinelinux.org/cgit/abuild/
7source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 7source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
8 0002-add-fetch-from-source-mirror.patch 8 0002-add-fetch-from-source-mirror.patch
9 0003-add-color-control-command-line-option.patch" 9 0003-add-color-control-command-line-option.patch"
10depends="fakeroot file sudo pax-utils openssl apk-tools" 10depends="fakeroot file sudo pax-utils apk-tools"
11makedepends="openssl-dev pkgconfig" 11makedepends="openssl-dev pkgconfig"
12license=GPL-2 12license=GPL-2
13 13
@@ -32,5 +32,5 @@ build() {
32} 32}
33 33
34md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2 34md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2
3529b83cfe5c4b8e8491c6f2f073da4314 0002-add-fetch-from-source-mirror.patch 355c0332196a6693d49cfe3d75c29fc63c 0002-add-fetch-from-source-mirror.patch
36d710ffb3c7f3eae52cac62bc2bf4f454 0003-add-color-control-command-line-option.patch" 36d710ffb3c7f3eae52cac62bc2bf4f454 0003-add-color-control-command-line-option.patch"