1berry/fdroidserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: remove 32-bit buildserver code

Browse Source 
We dropped support for 32-bit, so remove all the now unused code and
references.
This commit is contained in:
Daniel Martí 2016-07-13 16:47:58 +01:00
parent 82d09560c6
commit d375318550
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
buildserver/provision-android-ndk
View File

@ -10,33 +10,18 @@ test -e $NDK_BASE || mkdir -p $NDK_BASE
cd $NDK_BASE cd $NDK_BASE
if [ ! -e $NDK_BASE/r9b ]; then if [ ! -e $NDK_BASE/r9b ]; then
if [ `uname -m` == 'x86_64' ] ; then tar xjf /vagrant/cache/android-ndk-r9b-linux-x86_64.tar.bz2
SUFFIX='_64' tar xjf /vagrant/cache/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2
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
mv android-ndk-r9b r9b mv android-ndk-r9b r9b
fi fi
if [ ! -e $NDK_BASE/r10e ]; then if [ ! -e $NDK_BASE/r10e ]; then
if [ `uname -m` == 'x86_64' ] ; then 7zr x /vagrant/cache/android-ndk-r10e-linux-x86_64.bin > /dev/null
SUFFIX='_64'
else
SUFFIX=''
fi
7zr x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin > /dev/null
mv android-ndk-r10e r10e mv android-ndk-r10e r10e
fi fi
if [ ! -e $NDK_BASE/r12b ]; then if [ ! -e $NDK_BASE/r12b ]; then
if [ `uname -m` == 'x86_64' ] ; then 7zr x /vagrant/cache/android-ndk-r12b-linux-x86_64.bin > /dev/null
SUFFIX='_64'
else
SUFFIX=''
fi
7zr x /vagrant/cache/android-ndk-r12b-linux-x86$SUFFIX.bin > /dev/null
mv android-ndk-r12b r12b mv android-ndk-r12b r12b
fi fi

4
docs/fdroid.texi
View File

@ -1561,9 +1561,7 @@ applications.
@section Setting up a build server @section Setting up a build server
In addition to the basic setup previously described, you will also need In addition to the basic setup previously described, you will also need
a Vagrant-compatible Debian Testing base box called 'jessie32' (or jessie64 a Vagrant-compatible Debian Testing base box called 'jessie64'.
for a 64-bit VM, if you want it to be much slower, and require more disk
space).
You can use a different version or distro for the base box, so long as you 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 don't expect any help making it work. One thing to be aware of is that

9
examples/makebuildserver.config.py
View File

@ -3,16 +3,16 @@
# You may want to alter these before running ./makebuildserver # You may want to alter these before running ./makebuildserver
# Name of the base box to use # Name of the base box to use
# basebox = "jessie32" # basebox = "jessie64"
# Location where testing32.box can be found, if you don't already have # 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 # it. For security reasons, it's recommended that you make your own
# in a secure environment using trusted media (see the manual) but # in a secure environment using trusted media (see the manual) but
# you can use this default if you like... # 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: # 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 # In the process of setting up the build server, many gigs of files
# are downloaded (Android SDK components, gradle, etc). These are # are downloaded (Android SDK components, gradle, etc). These are
@ -43,9 +43,6 @@
# Debian package proxy server - if you have one # Debian package proxy server - if you have one
# aptproxy = "http://192.168.0.19:8000" # 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, # 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 # it can run a lot slower. If the provisioning fails with a warning
# about the timeout, extend the timeout here. (default: 600 seconds) # about the timeout, extend the timeout here. (default: 600 seconds)