Commit b027ecf2 authored by Natanael Copa's avatar Natanael Copa

abuild: fix for REPODEST

we need set the $CARCH in the package destination
needs also to be passed over for recursive action
parent c9a1158c
...@@ -424,6 +424,7 @@ build() { ...@@ -424,6 +424,7 @@ build() {
# generate a simple tar.gz package of pkgdir # generate a simple tar.gz package of pkgdir
targz() { targz() {
cd "$pkgdir" || return 1 cd "$pkgdir" || return 1
mkdir -p "$PKGDEST"
tar -czf "$PKGDEST"/$pkgname-$pkgver-r$pkgrel.tar.gz * tar -czf "$PKGDEST"/$pkgname-$pkgver-r$pkgrel.tar.gz *
} }
...@@ -738,6 +739,7 @@ trace_apk_deps() { ...@@ -738,6 +739,7 @@ trace_apk_deps() {
create_apks() { create_apks() {
local file local file
getpkgver || return 1 getpkgver || return 1
mkdir -p "$PKGDEST"
for file in "$pkgbasedir"/.control.*/.PKGINFO; do for file in "$pkgbasedir"/.control.*/.PKGINFO; do
local dir="${file%/.PKGINFO}" local dir="${file%/.PKGINFO}"
local name=$(pkginfo_val pkgname $file) local name=$(pkginfo_val pkgname $file)
...@@ -1327,7 +1329,7 @@ usage() { ...@@ -1327,7 +1329,7 @@ usage() {
echo " -k Keep built packages, even if APKBUILD or sources are newer" echo " -k Keep built packages, even if APKBUILD or sources are newer"
echo " -m Disable colors (monochrome)" echo " -m Disable colors (monochrome)"
echo " -p Set package destination directory" 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 " -q Quiet"
echo " -r Install missing dependencies from system repository (using sudo)" echo " -r Install missing dependencies from system repository (using sudo)"
echo " -R Recursively build and install missing dependencies (using sudo)" echo " -R Recursively build and install missing dependencies (using sudo)"
...@@ -1412,7 +1414,9 @@ cd "$startdir" || die ...@@ -1412,7 +1414,9 @@ cd "$startdir" || die
# If REPODEST is set then it will override the PKGDEST # If REPODEST is set then it will override the PKGDEST
if [ -n "$REPODEST" ]; then if [ -n "$REPODEST" ]; then
PKGDEST="$REPODEST/$repo" PKGDEST="$REPODEST/$repo/$CARCH"
# for recursive action
export REPODEST
fi fi
# If we are handling a sub package then reset subpackages and install # If we are handling a sub package then reset subpackages and install
......
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