buildserver: extract NDK rather than executing it

Then the NDK archive doesn't need execute permissions.

diff --git a/buildserver/cookbooks/android-ndk/recipes/default.rb b/buildserver/cookbooks/android-ndk/recipes/default.rb
index bc7044795773937b46fb357f26386c277df9c4ea..506443cbe0a77f5f67a4d6ca2b928ffec8c609e3 100644 (file)
--- a/buildserver/cookbooks/android-ndk/recipes/default.rb
+++ b/buildserver/cookbooks/android-ndk/recipes/default.rb
@@ -41,9 +41,9 @@ script "setup-android-ndk-r10e" do
     else
        SUFFIX=''
     fi
-    chmod u+x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin
-    /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin x
-    mv android-ndk-r10e #{ndk_loc}/r10e
+    cd #{ndk_loc}
+    7zr x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin
+    mv android-ndk-r10e r10e
   "
   not_if "test -d #{ndk_loc}/r10e"
 end

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 3d7ca78d264f73bd3e6ee9c1e5b679036f6ae21f..6cde2f92bc525cf63cf06b966e38c124865c0fbf 100644 (file)
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -54,6 +54,7 @@ end
     openjdk-7-jdk
     openjdk-8-jdk
     optipng
+    p7zip
     pandoc
     perlmagick
     pkg-config