summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-08 12:59:21 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-08 12:59:21 -0400
commitc2470fb3134b71ae3662ddc70d540d77ac3f8943 (patch)
tree71665f47439433be31a14f10cb4e1dc926e283ba
parent939d11e31af17cc8657c446263a46c81627c1ed1 (diff)
fix git rev for openssh on android
-rw-r--r--standalone/android/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index 261259bf4..af825d5aa 100644
--- a/standalone/android/Makefile
+++ b/standalone/android/Makefile
@@ -30,8 +30,7 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl/build-stamp:
$(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/build-stamp: openssh.patch openssh.config.h
# This is a known-good version that the patch works with.
- # TODO: Upgrade
- cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && git reset --hard 0a8617ed5af2f0248d0e9648e26b224e16ada742
+ cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && git reset --hard b82300f4fa6917298a137817afbbd674a066e5da
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && ./configure --host=arm-linux-androideabi --with-ssl-dir=../openssl --without-openssl-header-check
cat openssh.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && patch -p1)
cp openssh.config.h $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/config.h