kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-05 18:50:09 +02:00
Code Activity

Various changes to get makebuildserver to work with a 64 bit base box

Browse Source 
Note that the apt packages are split into two halves, because it takes
too long (on 64 bit!) to install them all. The sensible fix would be
to simply up the timeout on the package installation section, but this
is completely broken in chef.
This commit is contained in:
Ciaran Gultnieks 2016-07-01 12:00:38 +00:00
parent 8691bd9cf9
commit 1da89dc1f1
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
View File

@ -11,6 +11,12 @@ execute "jessie_backports" do
only_if "grep jessie /etc/apt/sources.list" only_if "grep jessie /etc/apt/sources.list"
end end
if node['kernel']['machine'] == "x86_64"
execute "archi386" do
command "dpkg --add-architecture i386"
end
end
execute "apt-get-update" do execute "apt-get-update" do
command "apt-get update" command "apt-get update"
end end
@ -49,6 +55,13 @@ end
libtool-bin libtool-bin
make make
maven maven
}.each do |pkg|
package pkg do
action :install
end
end
%w{
mercurial mercurial
nasm nasm
openjdk-8-jdk-headless openjdk-8-jdk-headless
@ -96,8 +109,14 @@ easy_install_package "compare-locales" do
action :install action :install
end end
execute "set-default-java" do if node['kernel']['machine'] == "x86_64"
command "update-java-alternatives --set java-1.8.0-openjdk-i386" execute "set-default-java" do
command "update-java-alternatives --set java-1.8.0-openjdk-amd64"
end
else
execute "set-default-java" do
command "update-java-alternatives --set java-1.8.0-openjdk-i386"
end
end end
# Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings # Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings

2
fdroidserver/build.py
View File

@ -271,7 +271,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force):
# Get an SFTP connection... # Get an SFTP connection...
ftp = sshs.open_sftp() ftp = sshs.open_sftp()
ftp.get_channel().settimeout(15) ftp.get_channel().settimeout(60)
# Put all the necessary files in place... # Put all the necessary files in place...
ftp.chdir(homedir) ftp.chdir(homedir)