summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-22 22:40:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-22 22:40:36 -0400
commit9a9bedb2196b28e9af2860334e721cc2ebfb86e9 (patch)
tree3005d2fa60bd0e1421a82f168b8265be1198d18b
parent79f68e3848edfdb321bd29b0ae2c1fb8048d5925 (diff)
pin rsync
-rw-r--r--standalone/android/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index 4cfdbd081..bf1802ca6 100644
--- a/standalone/android/Makefile
+++ b/standalone/android/Makefile
@@ -106,7 +106,8 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp:
touch $@
$(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/build-stamp: rsync.patch
- cat rsync.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync && git reset --hard origin/master && git am)
+ # This is a known-good version that the patch works with.
+ cat rsync.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync && git reset --hard eec26089b1c7bdbb260674480ffe6ece257bca63 && git am)
cp $(GIT_ANNEX_ANDROID_SOURCETREE)/automake/lib/config.sub $(GIT_ANNEX_ANDROID_SOURCETREE)/automake/lib/config.guess $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync && ./configure --host=arm-linux-androideabi --disable-locale --disable-iconv-open --disable-iconv --disable-acl-support --disable-xattr-support
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync && $(MAKE)