mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix abiversion lookup to work when propellor is running this script

Browse source
This commit is contained in:
Joey Hess 2014-05-25 01:37:22 -04:00
parent f5982447eb
commit 1ce222efe9
Failed to extract signature
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
standalone/android/buildchroot-inchroot-asuser
View file

@ -3,6 +3,14 @@
set -e set -e
set -x 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 cd
rm -rf .ghc .cabal .android rm -rf .ghc .cabal .android
cabal update cabal update
@ -30,7 +38,7 @@ mv adt-bundle-linux-x86-* adt-bundle-linux-x86
rm -rf adt-bundle-linux-x86/eclipse rm -rf adt-bundle-linux-x86/eclipse
# The git-annex android Makefile needs this cc symlink. # 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.email androidbuilder@example.com
git config --global user.name androidbuilder git config --global user.name androidbuilder