Commit 4d625212 authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 18127: Add LXC support for building with Debian guest VMs

parent 03680a64

gitian/descriptors/linux/gitian-bundle.yml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,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"

gitian/descriptors/linux/gitian-pluggable-transports.yml

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,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 ..

gitian/make-vms.sh

+9 −2
Original line number Diff line number Diff line
@@ -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

      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