summaryrefslogtreecommitdiff
path: root/abuild.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-04-06 09:30:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-06 09:30:33 +0000
commitb027ecf2c7fe24149b79dfacad460c6360da9b63 (patch)
tree383ed867ebd1701c68cf0a75c902088827cffc2a /abuild.in
parentc9a1158c7914d24c81f3c9196757df49890307fe (diff)
downloadabuild-b027ecf2c7fe24149b79dfacad460c6360da9b63.tar.gz
abuild-b027ecf2c7fe24149b79dfacad460c6360da9b63.tar.bz2
abuild-b027ecf2c7fe24149b79dfacad460c6360da9b63.tar.xz
abuild-b027ecf2c7fe24149b79dfacad460c6360da9b63.zip
abuild: fix for REPODEST
we need set the $CARCH in the package destination needs also to be passed over for recursive action
Diffstat (limited to 'abuild.in')
-rwxr-xr-xabuild.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/abuild.in b/abuild.in
index c7d8814..20beae5 100755
--- a/abuild.in
+++ b/abuild.in
@@ -424,6 +424,7 @@ build() {
# generate a simple tar.gz package of pkgdir
targz() {
cd "$pkgdir" || return 1
+ mkdir -p "$PKGDEST"
tar -czf "$PKGDEST"/$pkgname-$pkgver-r$pkgrel.tar.gz *
}
@@ -738,6 +739,7 @@ trace_apk_deps() {
create_apks() {
local file
getpkgver || return 1
+ mkdir -p "$PKGDEST"
for file in "$pkgbasedir"/.control.*/.PKGINFO; do
local dir="${file%/.PKGINFO}"
local name=$(pkginfo_val pkgname $file)
@@ -1327,7 +1329,7 @@ usage() {
echo " -k Keep built packages, even if APKBUILD or sources are newer"
echo " -m Disable colors (monochrome)"
echo " -p Set package destination directory"
- echo " -P Set PKGDEST to REPODEST/<repo>, where repo is the parents dir name"
+ echo " -P Set PKGDEST to REPODEST/<repo>/\$CARCH, where repo is the parents dir name"
echo " -q Quiet"
echo " -r Install missing dependencies from system repository (using sudo)"
echo " -R Recursively build and install missing dependencies (using sudo)"
@@ -1412,7 +1414,9 @@ cd "$startdir" || die
# If REPODEST is set then it will override the PKGDEST
if [ -n "$REPODEST" ]; then
- PKGDEST="$REPODEST/$repo"
+ PKGDEST="$REPODEST/$repo/$CARCH"
+ # for recursive action
+ export REPODEST
fi
# If we are handling a sub package then reset subpackages and install