Unverified Commit 382de78e authored by Georg Koppen's avatar Georg Koppen Committed by boklm
Browse files

Bug 13215: Use 15GiB VM space if needed. 

With Firefox ESR 31 10GiB is not enough anymore to build Tor Browser for
64 Bit Linux systems. We bump the upper limit to 15GiB in order to
account for the additional capacity needed when starting with the
hardened build series.
parent d9e4d0c3

bin/make-base-vm

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ if [ $LXC = "1" ]; then 
  sudo rm -rf $OUT-bootstrap

  # Need universe for lxc in lucid

  env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo debootstrap --arch=$ARCH --include=$addpkg --exclude=$removepkg --components=main,universe $SUITE $OUT-bootstrap $MIRROR

  dd if=/dev/zero of=$OUT-lxc bs=1M count=1 seek=10240

  dd if=/dev/zero of=$OUT-lxc bs=1M count=1 seek=15360

  /sbin/mkfs.ext4 -F $OUT-lxc

  t=`mktemp -d gitian.XXXXXXXX`

  sudo mount $OUT-lxc $t
@@ -178,7 +178,7 @@ else 
  libexec/config-bootstrap-fixup



  rm -rf $OUT

  env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup

  env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 15360 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup

  mv $OUT/*.qcow2 $OUT.qcow2

  rm -rf $OUT

  # bootstrap-fixup is done on first boot