summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-23 10:25:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-23 10:25:21 -0400
commitc76c044246b13457e00a82c7fd9550e061b4b406 (patch)
treef252de53d2529166efd1a8d246b411d3795713f9 /standalone
parent1eb61d02e81f998f81488e3110137a2770a6ba96 (diff)
fix cd
Diffstat (limited to 'standalone')
-rwxr-xr-xstandalone/android/buildchroot-inchroot-asuser3
-rwxr-xr-xstandalone/android/install-haskell-packages7
2 files changed, 6 insertions, 4 deletions
diff --git a/standalone/android/buildchroot-inchroot-asuser b/standalone/android/buildchroot-inchroot-asuser
index 0e75a293a..fbd6cc1bf 100755
--- a/standalone/android/buildchroot-inchroot-asuser
+++ b/standalone/android/buildchroot-inchroot-asuser
@@ -13,6 +13,9 @@ cd ghc-android
git checkout stable-ghc-snapshot
./build
+# This saves 2 gb, and the same sources are in build-*/ghc
+rm -rf stage0
+
# Set up android SDK where the git-annex android Makefile
# expects to find it.
cd ..
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index 0bf7e960f..f875ca9eb 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -46,7 +46,7 @@ patched () {
}
installgitannexdeps () {
- pushd ../../..
+ pushd ../..
echo cabal install --only-dependencies
cabal install --only-dependencies "$@"
popd
@@ -96,10 +96,9 @@ install_pkgs () {
patched gnuidn
patched DAV
- installgitannexdeps -fAndroid -f-Pairing
-
cd ..
- rm -rf tmp
+
+ installgitannexdeps -fAndroid -f-Pairing
}
echo