From d375318550b47b4fc697a69f9cb108ab8bd44916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 13 Jul 2016 16:47:58 +0100 Subject: [PATCH] all: remove 32-bit buildserver code We dropped support for 32-bit, so remove all the now unused code and references. --- buildserver/provision-android-ndk | 23 ++++------------------- docs/fdroid.texi | 4 +--- examples/makebuildserver.config.py | 9 +++------ 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk index 030b0159..4c4f0d54 100644 --- a/buildserver/provision-android-ndk +++ b/buildserver/provision-android-ndk @@ -10,33 +10,18 @@ test -e $NDK_BASE || mkdir -p $NDK_BASE cd $NDK_BASE if [ ! -e $NDK_BASE/r9b ]; then - if [ `uname -m` == 'x86_64' ] ; then - SUFFIX='_64' - else - SUFFIX='' - fi - tar xjf /vagrant/cache/android-ndk-r9b-linux-x86$SUFFIX.tar.bz2 - tar xjf /vagrant/cache/android-ndk-r9b-linux-x86$SUFFIX-legacy-toolchains.tar.bz2 + tar xjf /vagrant/cache/android-ndk-r9b-linux-x86_64.tar.bz2 + tar xjf /vagrant/cache/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 mv android-ndk-r9b r9b fi if [ ! -e $NDK_BASE/r10e ]; then - if [ `uname -m` == 'x86_64' ] ; then - SUFFIX='_64' - else - SUFFIX='' - fi - 7zr x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin > /dev/null + 7zr x /vagrant/cache/android-ndk-r10e-linux-x86_64.bin > /dev/null mv android-ndk-r10e r10e fi if [ ! -e $NDK_BASE/r12b ]; then - if [ `uname -m` == 'x86_64' ] ; then - SUFFIX='_64' - else - SUFFIX='' - fi - 7zr x /vagrant/cache/android-ndk-r12b-linux-x86$SUFFIX.bin > /dev/null + 7zr x /vagrant/cache/android-ndk-r12b-linux-x86_64.bin > /dev/null mv android-ndk-r12b r12b fi diff --git a/docs/fdroid.texi b/docs/fdroid.texi index cf744c48..38b95abf 100644 --- a/docs/fdroid.texi +++ b/docs/fdroid.texi @@ -1561,9 +1561,7 @@ applications. @section Setting up a build server In addition to the basic setup previously described, you will also need -a Vagrant-compatible Debian Testing base box called 'jessie32' (or jessie64 -for a 64-bit VM, if you want it to be much slower, and require more disk -space). +a Vagrant-compatible Debian Testing base box called 'jessie64'. You can use a different version or distro for the base box, so long as you don't expect any help making it work. One thing to be aware of is that diff --git a/examples/makebuildserver.config.py b/examples/makebuildserver.config.py index b43777ed..4ee73fbc 100644 --- a/examples/makebuildserver.config.py +++ b/examples/makebuildserver.config.py @@ -3,16 +3,16 @@ # You may want to alter these before running ./makebuildserver # Name of the base box to use -# basebox = "jessie32" +# basebox = "jessie64" # Location where testing32.box can be found, if you don't already have # it. For security reasons, it's recommended that you make your own # in a secure environment using trusted media (see the manual) but # you can use this default if you like... -# baseboxurl = "https://f-droid.org/jessie32.box" +# baseboxurl = "https://f-droid.org/jessie64.box" # # or if you have a cached local copy, you can use that first: -# baseboxurl = ["file:///home/fdroid/fdroidserver/cache/jessie32.box", "https://f-droid.org/jessie32.box"] +# baseboxurl = ["file:///home/fdroid/fdroidserver/cache/jessie64.box", "https://f-droid.org/jessie64.box"] # In the process of setting up the build server, many gigs of files # are downloaded (Android SDK components, gradle, etc). These are @@ -43,9 +43,6 @@ # Debian package proxy server - if you have one # aptproxy = "http://192.168.0.19:8000" -# Set to True if your base box is 64 bit (e.g. testing32.box isn't) -# arch64 = True - # If this is running on an older machine or on a virtualized system, # it can run a lot slower. If the provisioning fails with a warning # about the timeout, extend the timeout here. (default: 600 seconds)