Ignore what seems right and go with what works for sbuild

Author: Frenzie

debian/scripts/bootstrap.sh

@@ -30,11 +30,3 @@ echo "GSSAPIAuthentication no" >> /etc/ssh/sshd_config
 sed -i 's/GRUB_TIMEOUT=[0-9]\{,2\}/GRUB_TIMEOUT=0/' /etc/default/grub
 
 update-grub
-
-# set up sbuild for i386 package
-mkdir /root/.gnupg  #Work around #792100 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792100
-rngd -r /dev/urandom #Fake entropy for the keygen; REMOVE if key security is important
-su - -c 'sbuild-update --keygen' #Requirement for sbuild
-sbuild-adduser vagrant
-mkdir /home/vagrant/chroot
-sbuild-createchroot --arch=i386 stable /home/vagrant/chroot/stable-i386 http://httpredir.debian.org/debian

debian/scripts/build-otter-deb.sh

@@ -166,6 +166,17 @@ debuild -us -uc
 # signed build
 #debuild -S
 
+# check if chroot exists and create it if it does not
+if [ ! -f "${HOME}/chroot/stable-i386.tar" ]; then
+	sudo mkdir /root/.gnupg # To work around #792100
+	sudo rngd -r /dev/urandom #Fake entropy for the keygen; REMOVE if key security is important
+	sudo sbuild-update --keygen #Requirement for sbuild
+	sudo sbuild-adduser $LOGNAME
+	newgrp sbuild
+	mkdir $HOME/chroot
+	sudo sbuild-createchroot --arch=i386 --make-sbuild-tarball=$HOME/chroot/stable-i386.tar stable `mktemp -d` http://httpredir.debian.org/debian
+fi
+
 # build i386 package
 sudo sbuild-update -udcar stable-i386
 sbuild -d stable --arch=i386