summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-25 01:37:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-25 01:37:22 -0400
commit325c198a4e7323b0a1b039dfa0a39716528edfb9 (patch)
treeb3b02e2a09e9a17f5cda7cf565ae8cd220cafe89
parente7f5ba88f0129059d37788b9ebfa2e9571183f2a (diff)
fix abiversion lookup to work when propellor is running this script
-rwxr-xr-xstandalone/android/buildchroot-inchroot-asuser10
1 files changed, 9 insertions, 1 deletions
diff --git a/standalone/android/buildchroot-inchroot-asuser b/standalone/android/buildchroot-inchroot-asuser
index 2358636ef..fd27f3fc5 100755
--- a/standalone/android/buildchroot-inchroot-asuser
+++ b/standalone/android/buildchroot-inchroot-asuser
@@ -3,6 +3,14 @@
set -e
set -x
+# Put in /tmp by buildchroot, but when bootstrapping with propellor,
+# this is run inside a checked out git-annex tree.
+if [ -e /tmp/abiversion ]; then
+ ABIVERSION=$(cat /tmp/abiversion)
+else
+ ABIVERSION=$(cat standalone/android/abiversion)
+fi
+
cd
rm -rf .ghc .cabal .android
cabal update
@@ -30,7 +38,7 @@ mv adt-bundle-linux-x86-* adt-bundle-linux-x86
rm -rf adt-bundle-linux-x86/eclipse
# The git-annex android Makefile needs this cc symlink.
-ln -s arm-linux-androideabi-gcc $HOME/.ghc/$(cat /tmp/abiversion)/bin/cc
+ln -s arm-linux-androideabi-gcc $HOME/.ghc/$ABIVERSION/bin/cc
git config --global user.email androidbuilder@example.com
git config --global user.name androidbuilder