diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-02 15:32:49 -0300 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-02 15:32:49 -0300 |
| commit | cff2db0f2424dd47a60ce21c0ca42017bb1b709d (patch) | |
| tree | b8de4e471e4f77f235a2d4b4fc52b6620c59be4d /standalone | |
| parent | f11dd1f77292d6a5eee3da9415a99e75c5da4e78 (diff) | |
| parent | 10a3d627dcb23035bc68c9912e927288be493d8e (diff) | |
Merge branch 'master' into bootstrap3
Conflicts:
debian/changelog
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/Makefile | 1 | ||||
| -rwxr-xr-x | standalone/android/runshell | 1 | ||||
| -rw-r--r-- | standalone/trustedkeys.gpg | bin | 0 -> 4979 bytes |
3 files changed, 2 insertions, 0 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 404841bc0..a11c0bcc1 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -76,6 +76,7 @@ build: start cp $(GIT_ANNEX_ANDROID_SOURCETREE)/git/git.tar.gz $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git.tar.gz.so git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so + cp ../trustedkeys.gpg $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.trustedkeys.so mkdir -p ../../tmp/4.0 ../../tmp/4.3 diff --git a/standalone/android/runshell b/standalone/android/runshell index ef6744494..f6a0138e9 100755 --- a/standalone/android/runshell +++ b/standalone/android/runshell @@ -53,6 +53,7 @@ buildtree () { $cmd echo "exec $base/lib/lib.start.so" >> "$base/runshell" $cmd chmod 755 runshell + $cmd cat "$base/lib/lib.trustedkeys.so" > "$base/bin/trustedkeys.gpg" $cmd cat "$base/lib/lib.version.so" > "$base/installed-version" $cmd echo "Installation complete" } diff --git a/standalone/trustedkeys.gpg b/standalone/trustedkeys.gpg Binary files differnew file mode 100644 index 000000000..0742182ae --- /dev/null +++ b/standalone/trustedkeys.gpg |