[Pkg-xfce-commits] r299 - scripts/pbuilder

[Emanuele Rocca]

Author: ema
Date: 2005-11-13 23:00:42 +0000 (Sun, 13 Nov 2005)
New Revision: 299

Modified:
   scripts/pbuilder/README
   scripts/pbuilder/pdebuild-sources.sh
   scripts/pbuilder/pdebuild.conf
Log:
- OTHERMIRROR (to avoid hanging during base.tgz create/update)
+ MIRRORSITE (to avoid using .jp mirror)

+ more logs and verbosity



Modified: scripts/pbuilder/README
===================================================================
--- scripts/pbuilder/README	2005-11-13 14:59:44 UTC (rev 298)
+++ scripts/pbuilder/README	2005-11-13 23:00:42 UTC (rev 299)
@@ -1,6 +1,8 @@
+0) Install pbuilder, debootstrap, fakeroot, svn-buildpackage
+
 1) Set the correct paths in pdebuild.conf, pdebuild.wrapper and pdebuild-sources.sh
 
-2) Run sudo ./pdebuild-sources.sh
+2) Run ./pdebuild-sources.sh
 
 3) Cross your fingers
 

Modified: scripts/pbuilder/pdebuild-sources.sh
===================================================================
--- scripts/pbuilder/pdebuild-sources.sh	2005-11-13 14:59:44 UTC (rev 298)
+++ scripts/pbuilder/pdebuild-sources.sh	2005-11-13 23:00:42 UTC (rev 299)
@@ -17,14 +17,20 @@
 [ -d "$PBUILDERDIR/log" ] || mkdir -p "$PBUILDERDIR/log"
 
 if [ ! -f "$BASETGZ" ]; then
-	pbuilder create --configfile $CONFFILE
+	echo "Creating base.tgz"
+	sudo $PBUILDER create --debug \
+		--configfile $CONFFILE > $PBUILDERDIR/log/pbuilder-create.log \
+			2> $PBUILDERDIR/log/pbuilder-create-errors.log
 else
-	pbuilder update --configfile $CONFFILE
+	echo "Updating base.tgz"
+	sudo $PBUILDER update --debug \
+		--configfile $CONFFILE > $PBUILDERDIR/log/pbuilder-update.log \
+			2> $PBUILDERDIR/log/pbuilder-update-errors.log
 fi
 
 for pkg in $(cat $PKGFILE); do
 	echo "Building $pkg..."
 	cd $DESKTOPDIR/$pkg
-	svn-buildpackage --svn-builder $SCRIPTSDIR/pbuilder/pdebuild.wrapper
+	svn-buildpackage --svn-ignore-new --svn-builder $SCRIPTSDIR/pbuilder/pdebuild.wrapper
 	echo "done"
 done

Modified: scripts/pbuilder/pdebuild.conf
===================================================================
--- scripts/pbuilder/pdebuild.conf	2005-11-13 14:59:44 UTC (rev 298)
+++ scripts/pbuilder/pdebuild.conf	2005-11-13 23:00:42 UTC (rev 299)
@@ -10,7 +10,7 @@
 HOOKDIR=$BASEDIR/scripts/pbuilder/hooks
 APTCACHE=$BUILDPLACE
 
-OTHERMIRROR="deb file:/var/cache/apt/archives ./"
+MIRRORSITE=http://debian.fastweb.it/debian
 
 USEPROC=yes
 USEDEVPTS=yes
@@ -18,3 +18,7 @@
 BUILDSOURCEROOTCMD="fakeroot"
 PBUILDERROOTCMD="sudo"
 AUTO_DEBSIGN=no
+
+PBUILDER=/usr/sbin/pbuilder
+DEBOOTSTRAP="debootstrap"
+DEBOOTSTRAPOPTS="--variant=buildd"