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 3d7ca78d264f73bd3e6ee9c1e5b679036f6ae21f..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
@@ -49,11 +55,18 @@ end
     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
@@ -96,14 +109,14 @@ 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"
-end
-
-execute "set-default-java" do
-  command "update-java-alternatives --set java-1.7.0-openjdk-i386"
+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
 
 # Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings