From: Paul Lorenz <plorenz@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Lorenz <plorenz@gmail.com>
Subject: [alpine-aports] [PATCH] Fix src builds
Date: Mon, 18 Jul 2016 14:37:28 -0400
Message-Id: <1468867048-6791-1-git-send-email-plorenz@gmail.com>
Precedence: list

Fix filename_from_uri call
Ensure remote sources are fetched
Include remote sources in source package
Include pre/post scripts
Include trigger scripts
---
 abuild.in | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/abuild.in b/abuild.in
index d4614d1..4d2d6cb 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1596,13 +1596,31 @@ rootpkg() {
 }
 
 srcpkg() {
+	echo "Ensuring source is fetched"
+	fetch()
 	getpkgver || return 1
 	local p="$pkgname-$pkgver-$pkgrel"
 	local prefix="${startdir##*/}"
 	local i files="$prefix/APKBUILD"
 	for i in $source; do
-		files="$files $prefix/$(filename_from uri $i)"
+		echo "Packaging source file: $i"
+		if [ ! -e $(filename_from_uri $i) ]; then
+			cp $srcdir/$(filename_from_uri $i) $(filename_from_uri $i)
+		fi
+		files="$files $prefix/$(filename_from_uri $i)"
 	done
+
+	for i in $install; do
+		echo "Packaging install file: $i"
+		files="$files $prefix/$i"
+	done
+
+	for i in $triggers; do
+		local f=${i%=*}
+		echo "Packaging trigger file: $f"
+		files="$files $prefix/$f"
+	done
+
 	mkdir -p "$PKGDEST"
 	msg "Creating source package $p.src.tar.gz..."
 	(cd .. && tar -zcf "$PKGDEST/$p.src.tar.gz" $files)
-- 
2.7.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---