Commit 64890559 authored by Natanael Copa's avatar Natanael Copa

core/abuild: fix for buildrepo

parent 24ae3932
......@@ -2,17 +2,21 @@
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=1.15.1
pkgrel=0
pkgrel=1
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
buildrepo.patch
"
depends="fakeroot file sudo"
license=GPL-2
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 < ../buildrepo.patch || return 1
make install DESTDIR="$pkgdir"
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
md5sums="ad7db0b6112bed7418a8aef97f20aed5 abuild-1.15.1.tar.bz2"
md5sums="ad7db0b6112bed7418a8aef97f20aed5 abuild-1.15.1.tar.bz2
465280f43fd69fa0949bc8f1ce67ab39 buildrepo.patch"
commit 896c436e140a4888c59135c7a2238e2ec4861632
Author: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu Jun 4 12:22:48 2009 +0000
buildrepo: check if all files exist before try copy anything
seems like copy removes destination if source does not exist so
we ended up with a buildrepo that removed all packages
diff --git a/buildrepo.in b/buildrepo.in
index 5b4133d..2be50e1 100755
--- a/buildrepo.in
+++ b/buildrepo.in
@@ -28,6 +28,14 @@ listpackages() {
done
}
+all_exist() {
+ while [ $# -gt 0 ]; do
+ [ -e "$1" ] || return 1
+ shift 1
+ done
+ return 0
+}
+
build() {
local repo="$1" i indexupdate needbuild
@@ -47,15 +55,18 @@ build() {
continue
fi
+ indexupdate="$indexupdate $i"
+
# try link or copy the files if they are in the ports dir
pkgs=$(abuild listpkg)
- if cp -p -l $pkgs "$repodir/$repo"/ 2>/dev/null \
- || cp -p $pkgs "$repodir/$repo"/ 2>/dev/null; then
+ if all_exist $pkgs; then
echo ">>> Copying " $pkgs
+ cp -p -l $pkgs "$repodir/$repo"/ 2>/dev/null \
+ || cp -p $pkgs "$repodir/$repo"/ \
+ || needbuild="$needbuild $i"
else
needbuild="$needbuild $i"
fi
- indexupdate="$indexupdate $i"
done
# build the postponed packages if any
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment