diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-19 14:56:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-19 14:57:45 -0400 |
| commit | 4e40b54a7516bbc9070faaef31254bd22154684e (patch) | |
| tree | 084161e52b8ceef67c193a0e43600bbf60c9aec4 /standalone | |
| parent | ae3b28eb5bfd70ef6f59069ec59abb13ca193d3d (diff) | |
Android: Support ssh connection caching.
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/Makefile | 4 | ||||
| -rwxr-xr-x | standalone/android/runshell | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 177f91a12..13cbf2322 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -11,9 +11,9 @@ build: source cd source/openssl && CC=$$(which cc) ./Configure android cd source/openssl && $(MAKE) - cd source/rsync && git reset --hard origin/master + cd source/openssh && git reset --hard cd source/openssh && ./configure --host=arm-linux-androideabi --with-ssl-dir=../openssl --without-openssl-header-check - cd source/openssh && patch < ../../openssh.patch + cd source/openssh && patch -p1 < ../../openssh.patch cp openssh.config.h source/openssh/config.h cd source/openssh && sed -i -e 's/getrrsetbyname.o //' openbsd-compat/Makefile cd source/openssh && sed -i -e 's/auth-passwd.o //' Makefile diff --git a/standalone/android/runshell b/standalone/android/runshell index b2cb8ee2f..1b0b3e4f6 100755 --- a/standalone/android/runshell +++ b/standalone/android/runshell @@ -21,7 +21,7 @@ if [ ! -e "$base/bin/git" ]; then fi # Install busybox links. -if [ ! -e "$base/bin/sh" ]; then +if [ ! -e "$base/bin/sha256sum" ]; then echo "(First run detected ... setting up busybox ...)" "$base/bin/busybox" --install "$base/bin" fi @@ -53,6 +53,11 @@ export GIT_TEMPLATE_DIR GIT_ANNEX_STANDLONE_ENV="PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR" export GIT_ANNEX_STANDLONE_ENV +# This is a temporary directory on a non-crippled filesystem. +GIT_ANNEX_TMP_DIR=$base/tmp +export GIT_ANNEX_TMP_DIR +mkdir -p "$GIT_ANNEX_TMP_DIR" + if [ "$1" ]; then cmd="$1" shift 1 |