summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-02-07 17:53:46 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2018-02-07 17:53:46 +0100
commite4c0b8d118646bf72d0821341ae25f36f3d06187 (patch)
treee03b236d389a5fad1c4e29c85f966fe0f603964a
parent4b17bcd56378f2ed5dfde17c33709187b2290539 (diff)
downloadbootstrap32-e4c0b8d118646bf72d0821341ae25f36f3d06187.tar.xz
asp/asp32 depending on platform of host
-rwxr-xr-xbuild_stage1_package.sh2
-rw-r--r--default.conf7
2 files changed, 8 insertions, 1 deletions
diff --git a/build_stage1_package.sh b/build_stage1_package.sh
index a73cb17..1baee72 100755
--- a/build_stage1_package.sh
+++ b/build_stage1_package.sh
@@ -41,7 +41,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -
fi
case $FETCH_METHOD in
"asp")
- asp export "$PACKAGE"
+ $ASP export "$PACKAGE"
;;
"yaourt")
yaourt -G "$PACKAGE"
diff --git a/default.conf b/default.conf
index 0301ee7..8ecfb3c 100644
--- a/default.conf
+++ b/default.conf
@@ -49,3 +49,10 @@ ARCHLINUX32_PACKAGES=$CROSS_HOME/packages32
# some default variables, not to be changed
SCRIPT=$(sudo realpath -s "$0")
SCRIPT_DIR=$(dirname "$SCRIPT")
+
+if test $(uname -m) = "x86_64"; then
+ ASP=asp
+fi
+if test $(uname -m) = "i686"; then
+ ASP=asp32
+fi