From 8c1511fed14a3944b9e39e25470d6bf262cae2d6 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 4 Jun 2013 22:40:58 +0100 Subject: [PATCH] Explicit openjdk package install For whatever reason, 32 bit needs this even though 64 bit doesn't - otherwise it can't find the jdk. --- buildserver/cookbooks/fdroidbuild-general/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb index 2da58d2c..d7b42c78 100644 --- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb +++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb @@ -1,5 +1,5 @@ -%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libssl1.0.0 libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm}.each do |pkg| +%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm}.each do |pkg| package pkg do action :install end -- 2.30.2