diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-03 16:02:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-03 16:02:42 -0400 |
| commit | 38dead2d069fc459d29d61dd7070ea4c2db9ecd8 (patch) | |
| tree | 89dfbc895db673c3ae082ca467430897c13afa2f /standalone | |
| parent | 9a1ff06ae57d4ec0c184f827a4fa933a24da9fed (diff) | |
Android: patch git to avoid fchmod, which fails on /sdcard.
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/Makefile | 3 | ||||
| -rw-r--r-- | standalone/android/git.patch | 54 |
2 files changed, 56 insertions, 1 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile index a11c0bcc1..4f64b4e9a 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -114,7 +114,8 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox/build-stamp: busybox_config cd $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox && $(MAKE) touch $@ -$(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp: +$(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp: git.patch + cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git am) cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 prefix= DESTDIR=installed-tree touch $@ diff --git a/standalone/android/git.patch b/standalone/android/git.patch new file mode 100644 index 000000000..32dd1cecc --- /dev/null +++ b/standalone/android/git.patch @@ -0,0 +1,54 @@ +From ec690f617cab405ec2c6420bde53e9d9ed984e5c Mon Sep 17 00:00:00 2001 +From: Joey Hess <joey@kitenet.net> +Date: Thu, 3 Jul 2014 15:55:17 -0400 +Subject: [PATCH] Revert "config: preserve config file permissions on edits" + +This reverts commit daa22c6f8da466bd7a438f1bc27375fd737ffcf3. + +This breaks on Android's /sdcard, which has a variety of FUSE +implentations, all total shite. + +diff --git a/config.c b/config.c +index a1aef1c..7f3303d 100644 +--- a/config.c ++++ b/config.c +@@ -1637,13 +1637,6 @@ int git_config_set_multivar_in_file(const char *config_filename, + MAP_PRIVATE, in_fd, 0); + close(in_fd); + +- if (fchmod(fd, st.st_mode & 07777) < 0) { +- error("fchmod on %s failed: %s", +- lock->filename, strerror(errno)); +- ret = CONFIG_NO_WRITE; +- goto out_free; +- } +- + if (store.seen == 0) + store.seen = 1; + +@@ -1792,7 +1785,6 @@ int git_config_rename_section_in_file(const char *config_filename, + int out_fd; + char buf[1024]; + FILE *config_file; +- struct stat st; + + if (new_name && !section_name_is_ok(new_name)) { + ret = error("invalid section name: %s", new_name); +@@ -1814,14 +1806,6 @@ int git_config_rename_section_in_file(const char *config_filename, + goto unlock_and_out; + } + +- fstat(fileno(config_file), &st); +- +- if (fchmod(out_fd, st.st_mode & 07777) < 0) { +- ret = error("fchmod on %s failed: %s", +- lock->filename, strerror(errno)); +- goto out; +- } +- + while (fgets(buf, sizeof(buf), config_file)) { + int i; + int length; +-- +2.0.1 + |