summaryrefslogtreecommitdiffstats
path: root/main/abuild
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-10-27 15:38:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-10-27 15:38:46 +0000
commit70fe84eac16cadd093d18f3c93ace167261e85e9 (patch)
treec28b8c552108561f97de126e52df6295c9d23985 /main/abuild
parent20b0d4bd9952f14fec20632503870d57d84a61e2 (diff)
downloadaports-70fe84eac16cadd093d18f3c93ace167261e85e9.tar.bz2
aports-70fe84eac16cadd093d18f3c93ace167261e85e9.tar.xz
main/abuild: fix for buildrepo
Diffstat (limited to 'main/abuild')
-rw-r--r--main/abuild/0001-Revert-abuild-minor-cleanup.patch31
-rw-r--r--main/abuild/APKBUILD8
2 files changed, 37 insertions, 2 deletions
diff --git a/main/abuild/0001-Revert-abuild-minor-cleanup.patch b/main/abuild/0001-Revert-abuild-minor-cleanup.patch
new file mode 100644
index 000000000..25569b5b6
--- /dev/null
+++ b/main/abuild/0001-Revert-abuild-minor-cleanup.patch
@@ -0,0 +1,31 @@
+From 19b2598f8a52ba8af07eb4904788d0843130b094 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 27 Oct 2009 15:24:18 +0000
+Subject: [PATCH] Revert "abuild: minor cleanup"
+
+This commit seems to kill the entire repository
+
+This reverts commit 46aed95754ebeb17a3a367b3b41d0b6424fd18d9.
+---
+ buildrepo.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/buildrepo.in b/buildrepo.in
+index d719c34..c211789 100755
+--- a/buildrepo.in
++++ b/buildrepo.in
+@@ -22,9 +22,9 @@ usage() {
+
+
+ listpackages() {
++ cd "$aportsdir/$1"
+ for i in */APKBUILD; do
+- cd "$aportsdir"/$1/${i%/*}
+- abuild listpkg
++ APKBUILD=$i abuild listpkg
+ done
+ }
+
+--
+1.6.5
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index f3b6f23bb..fdbe5d42b 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,9 +2,10 @@
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=2.0
-pkgrel=0
+pkgrel=1
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
+ 0001-Revert-abuild-minor-cleanup.patch
"
depends="fakeroot file sudo pax-utils openssl apk-tools"
makedepends="openssl-dev pkgconfig"
@@ -12,9 +13,12 @@ license=GPL-2
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i ../0001-Revert-abuild-minor-cleanup.patch || return 1
+ make
make install DESTDIR="$pkgdir"
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
-md5sums="8c915c2d87e12731a8dbee8241653a32 abuild-2.0.tar.bz2"
+md5sums="8c915c2d87e12731a8dbee8241653a32 abuild-2.0.tar.bz2
+478fa174e76501b2b37c47f2bc491559 0001-Revert-abuild-minor-cleanup.patch"