diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-22 22:36:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-22 22:36:00 -0400 |
| commit | 0fc7afe8e6844e4d9fede4a69ae2463d18abd6ed (patch) | |
| tree | fb224bc6516a71272fd5cb133ecf22ee029e2a66 | |
| parent | 8795c5e71314ebbf228f7248754aa38bb890390d (diff) | |
pin openssh
| -rw-r--r-- | standalone/android/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 2f39e5539..4cfdbd081 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -84,7 +84,9 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl/build-stamp: touch $@ $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/build-stamp: openssh.patch openssh.config.h - cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh && git reset --hard + # 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 && ./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 |