diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-05-05 21:29:13 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-05-05 21:29:13 +0000 |
| commit | ccf26410d30adc8c1934dd553687157ed6e31d69 (patch) | |
| tree | 7947e9408c39ac6e1f852af52ad65abdc8032cde | |
| parent | be0580cea9487dae7b0dae78d9c403a03d2b4c76 (diff) | |
| download | aports-ccf26410d30adc8c1934dd553687157ed6e31d69.tar.bz2 aports-ccf26410d30adc8c1934dd553687157ed6e31d69.tar.xz | |
Added support for distfiles in local directory, to support build bot.
| -rw-r--r-- | main/abuild/0002-add-fetch-from-source-mirror.patch | 8 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 6 |
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 926dbcc9a..5cd964852 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 # we need GNU wget for this case "$uri" in https://*) opts="--no-check-certificate";; -@@ -178,12 +177,22 @@ is_remote() { +@@ -178,12 +177,26 @@ is_remote() { return 1 } @@ -24,7 +24,11 @@ diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in + local uri="$1" + local d="${uri##*/}" # $(basename $uri) + if [ -n "$DISTFILES_MIRROR" ]; then -+ uri_fetch "$DISTFILES_MIRROR"/$d && return 0 ++ if [ -f "$DISTFILES_MIRROR"/$d ] ; then ++ cp "$DISTFILES_MIRROR"/$d . ++ else ++ uri_fetch "$DISTFILES_MIRROR"/$d && return 0 ++ fi + fi + uri_fetch "$uri" +} diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 4f3bc4f61..876a6e01a 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,12 +2,12 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.1 -pkgrel=1 +pkgrel=2 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 0002-add-fetch-from-source-mirror.patch 0003-add-color-control-command-line-option.patch" -depends="fakeroot file sudo pax-utils openssl apk-tools" +depends="fakeroot file sudo pax-utils apk-tools" makedepends="openssl-dev pkgconfig" license=GPL-2 @@ -32,5 +32,5 @@ build() { } md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2 -29b83cfe5c4b8e8491c6f2f073da4314 0002-add-fetch-from-source-mirror.patch +5c0332196a6693d49cfe3d75c29fc63c 0002-add-fetch-from-source-mirror.patch d710ffb3c7f3eae52cac62bc2bf4f454 0003-add-color-control-command-line-option.patch" |