Commit 5f453f1c authored by Natanael Copa's avatar Natanael Copa

abuild: use REPODEST as abuildrepo if specified

This has the nice effect that we get the index automatically built for
our REPODEST.

Discussion here:
http://lists.alpinelinux.org/alpine-devel/0249.html
parent e0217ee5
...@@ -1127,6 +1127,7 @@ clean_abuildrepo() { ...@@ -1127,6 +1127,7 @@ clean_abuildrepo() {
} }
mklinks_abuildrepo() { mklinks_abuildrepo() {
[ -n "$REPODEST" ] && return 0
local apk local apk
mkdir -p "$abuildrepo"/$CARCH mkdir -p "$abuildrepo"/$CARCH
cd "$abuildrepo" || return 1 cd "$abuildrepo" || return 1
...@@ -1804,7 +1805,6 @@ pkgbasedir=${pkgbasedir:-"$startdir/pkg"} ...@@ -1804,7 +1805,6 @@ pkgbasedir=${pkgbasedir:-"$startdir/pkg"}
pkgrel=0 pkgrel=0
repo=${startdir%/*} repo=${startdir%/*}
repo=${repo##*/} repo=${repo##*/}
abuildrepo="$abuildrepo_base"/$repo
SRCDEST=${SRCDEST:-$startdir} SRCDEST=${SRCDEST:-$startdir}
PKGDEST=${PKGDEST:-$startdir} PKGDEST=${PKGDEST:-$startdir}
...@@ -1817,6 +1817,9 @@ if [ -n "$REPODEST" ]; then ...@@ -1817,6 +1817,9 @@ if [ -n "$REPODEST" ]; then
PKGDEST="$REPODEST/$repo/$CARCH" PKGDEST="$REPODEST/$repo/$CARCH"
# for recursive action # for recursive action
export REPODEST export REPODEST
abuildrepo="$REPODEST"/$repo
else
abuildrepo="$abuildrepo_base"/$repo
fi fi
# if we want build debug package # if we want build debug package
......
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