[tbb-commits] [gitian-builder/tor-browser-builder-4] Bug 20352: add option to install backports packages

[gk at torproject.org]

commit afe8247f9fdf561b3e0d7701d2f49ef3bd5e6cb4
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Dec 5 13:42:04 2016 +0100

    Bug 20352: add option to install backports packages
    
    The packages listed in the descriptors in 'backports_packages' are
    installed from the backports.
---
 bin/gbuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/gbuild b/bin/gbuild
index 512733a..e61fcb6 100755
--- a/bin/gbuild
+++ b/bin/gbuild
@@ -102,6 +102,11 @@ def build_one_configuration(distro, suite, arch, build_desc)
   info "Installing additional packages (log in var/install.log)"
   system! "on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install #{build_desc["packages"].join(" ")} > var/install.log 2>&1"
 
+  if build_desc.has_key?("backports_packages")
+      info "Installing additional backport packages (log in var/backports-install.log)"
+      system! "on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y -t #{suite}-backports install #{build_desc["backports_packages"].join(" ")} > var/backports-install.log 2>&1"
+  end
+
   if @options[:upgrade] || system("on-target -u root '[ ! -e /var/cache/gitian/initial-upgrade ]'")
       info "Upgrading system, may take a while"
       system! "on-target -u root bash < target-bin/upgrade-system.sh > var/install.log 2>&1"