From ffd5263b5834b9b8ab50811d2d7617585de4c243 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 25 Jan 2015 01:09:13 +0100 Subject: [PATCH 1/2] Add build-deps for Firefox --- 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 7e6c94b3..0d821605 100644 --- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb +++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb @@ -5,7 +5,7 @@ execute "apt-get-update" do command "apt-get update" end -%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python python-magic git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip yasm inkscape imagemagick gettext realpath transfig texinfo curl librsvg2-bin xsltproc vorbis-tools swig quilt faketime optipng python-gnupg python3-gnupg nasm}.each do |pkg| +%w{ant ant-contrib autoconf autoconf2.13 autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python python-magic python-setuptools git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip yasm inkscape imagemagick gettext realpath transfig texinfo curl librsvg2-bin xsltproc vorbis-tools swig quilt faketime optipng python-gnupg python3-gnupg nasm unzip}.each do |pkg| package pkg do action :install end From abdc97142b80d2ca06c105138c488c43623f2b02 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 25 Jan 2015 19:33:02 +0100 Subject: [PATCH 2/2] Add compare-locales via easy_install for Firefox --- buildserver/cookbooks/fdroidbuild-general/recipes/default.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb index 0d821605..7b714625 100644 --- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb +++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb @@ -19,6 +19,11 @@ if node['kernel']['machine'] == "x86_64" end end +easy_install_package "compare-locales" do + options "-U" + action :install +end + execute "add-bsenv" do user user command "echo \". ./.bsenv \" >> /home/#{user}/.bashrc"