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

[fdroidserver.git] / buildserver / cookbooks / fdroidbuild-general / recipes / default.rb

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 8b61c3fc046cc6ab88020ed69035d6d38f1ea1d2..9ea5f5085a747184537057b4a570eaf23b8ba5ed 100644 (file)
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -11,6 +11,12 @@ execute "jessie_backports" do
   only_if "grep jessie /etc/apt/sources.list"
 end
 
+if node['kernel']['machine'] == "x86_64"
+  execute "archi386" do
+    command "dpkg --add-architecture i386"
+  end
+end
+
 execute "apt-get-update" do
   command "apt-get update"
 end
@@ -46,22 +52,30 @@ end
     libssl-dev
     libssl1.0.0
     libtool
+    libtool-bin
     make
     maven
+  }.each do |pkg|
+  package pkg do
+    action :install
+  end
+end
+
+%w{
     mercurial
     nasm
-    openjdk-7-jdk
-    openjdk-8-jdk
+    openjdk-8-jdk-headless
     optipng
+    p7zip
     pandoc
     perlmagick
     pkg-config
-    python
     python-gnupg
     python-magic
     python-setuptools
-    python-yaml
     python3-gnupg
+    python3-requests
+    python3-yaml
     qt5-default
     qtbase5-dev
     quilt
@@ -95,13 +109,21 @@ easy_install_package "compare-locales" do
   action :install
 end
 
-execute "add-bsenv" do
-  user user
-  command "echo \". ./.bsenv \" >> /home/#{user}/.bashrc"
-  not_if "grep bsenv /home/#{user}/.bashrc"
+if node['kernel']['machine'] == "x86_64"
+  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
 
-execute "set-default-java" do
-  command "update-java-alternatives --set java-1.7.0-openjdk-i386"
+# Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings
+# https://stackoverflow.com/questions/7286929/paramiko-incompatible-ssh-peer-no-acceptable-kex-algorithm/32691055#32691055
+execute "support-ubuntu-trusty-paramiko" do
+  only_if { node[:settings][:ubuntu_trusty] == 'true' }
+  command "echo Ciphers aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes128-ctr >> /etc/ssh/sshd_config"
+  command "echo MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,hmac-ripemd160,hmac-sha1 >> /etc/ssh/sshd_config"
+  command "echo KexAlgorithms diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha1,diffie-hellman-group-exchange-sha1 >> /etc/ssh/sshd_config"
 end
-