[tbb-commits] [tor-browser-bundle/hardened-builds] Bug 18127: Add LXC support for building with Debian guest VMs

[gk at torproject.org]

commit f02e6d9110b390f97af0dd8c0ee3b525f6e5d8b8
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Sun Feb 7 12:59:46 2016 +0100

    Bug 18127: Add LXC support for building with Debian guest VMs
---
 gitian/descriptors/linux/gitian-bundle.yml               |  1 +
 gitian/descriptors/linux/gitian-pluggable-transports.yml |  2 +-
 gitian/make-vms.sh                                       | 11 +++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index fdc1bf6..b9bf0f9 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -14,6 +14,7 @@ packages:
 - "libxml2-utils"
 - "sqlite3"
 - "python-lxml"
+- "rsync"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor-launcher.git"
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index a886572..3aaec92 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -146,7 +146,7 @@ script: |
   # it downloaded during building. Just pretending and thus avoiding another
   # dependency should be fine here as txsocksx catches the exception due to
   # missing __version__ and __sha__ .
-  mkdir vcversioner-1.14.1.1-py2.6.egg
+  mkdir vcversioner-1.14.1.1-py2.7.egg
   $PYTHON setup.py build --build-lib build
   cp -a build/txsocksx $PTDIR/
   cd ..
diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh
index 469a9ca..554cc27 100755
--- a/gitian/make-vms.sh
+++ b/gitian/make-vms.sh
@@ -25,13 +25,20 @@ build_and_test_vm() {
   local arch="$1"; shift
   local bits="$1"; shift
 
-  if [ ! -f ./base-$dist-$arch.qcow2 ];
+  if [ ! -f ./base-$dist-$arch ];
   then
     if [ "z$USE_LXC" = "z1" ];
     then
       export LXC_SUITE=$dist
       export LXC_ARCH=$arch
-      ./bin/make-base-vm --suite $dist --lxc --arch $arch
+      if [ "$dist" = "wheezy" ];
+      then
+        export DISTRO=debian
+        ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch
+      else
+        export DISTRO=ubuntu
+        ./bin/make-base-vm --suite $dist --lxc --arch $arch
+      fi
     else
       if [ "$dist" = "wheezy" ];
       then