[Trisquel-devel] [PATCH] Update makepackage system so make-exaile will build #12811

[andrew at andrewlindley.co.uk]

From: Andrew 'Leny' Lindley <andrew at andrewlindley.co.uk>

---
 helpers/config | 2 +-
 makepackage    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helpers/config b/helpers/config
index b812561..28ace01 100755
--- a/helpers/config
+++ b/helpers/config
@@ -142,7 +142,7 @@ fi
 if [ $FAKEROOT ]
 then
 chown nobody ../ -R
-su nobody -c 'dpkg-buildpackage -us -uc -j$PROCESSORS -rfakeroot'
+su nobody -c 'dpkg-buildpackage -us -uc -j$PROCESSORS -rfakeroot' -s /bin/bash
 else
 dpkg-buildpackage -us -uc -j$PROCESSORS
 fi
diff --git a/makepackage b/makepackage
index b210d55..c49c0dd 100644
--- a/makepackage
+++ b/makepackage
@@ -94,7 +94,7 @@ createjail () {
     mkdir $CHROOT-tmp
     mount -t tmpfs -o size=500M none $CHROOT-tmp
     debootstrap --arch=$JAILARCH $UPSTREAM $CHROOT-tmp $MIRROR
-    fuser -k $CHROOT-tmp
+    fuser -s $CHROOT-tmp && fuser -k $CHROOT-tmp
     cp -a $CHROOT-tmp $CHROOT
     umount $CHROOT-tmp
     rm $CHROOT-tmp -rf
@@ -136,7 +136,7 @@ EOF
     [ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
     disablescripts
     $C apt-get --force-yes -y dist-upgrade
-    $C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache
+    $C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache libdistro-info-perl
     $C apt-get clean
 
     wget -o /dev/null -O $CHROOT/tmp/key.gpg http://archive.trisquel.info/trisquel/trisquel-archive-signkey.gpg 
-- 
1.9.1