From b027ecf2c7fe24149b79dfacad460c6360da9b63 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 6 Apr 2011 09:30:33 +0000 Subject: abuild: fix for REPODEST we need set the $CARCH in the package destination needs also to be passed over for recursive action --- abuild.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'abuild.in') 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/, where repo is the parents dir name" + echo " -P Set PKGDEST to REPODEST//\$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 -- cgit v1.2.3-60-g2f50