From c25a0ee68131995fcd60714d66f8902127d4d44a Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sat, 25 May 2013 14:01:49 +0100 Subject: [PATCH] Install ia32-libs on 64 bit vm only (I think) I think this will work, but I haven't tested it yet. It's required because all the android sdk tools (e.g. aapt) are 32 bit binaries. --- .../cookbooks/fdroidbuild-general/recipes/default.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb index 7244b794..b26a5603 100644 --- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb +++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb @@ -18,3 +18,11 @@ end end end +if node['kernel']['machine'] == "x86_64" + %w{ia32-libs}.each do |pkg| + package pkg do + action :install + end + end +end +