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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-12-12 11:46:58 +0000 (Sun, 12 Dec 2010)
New Revision: 4707

Modified:
   scripts/pbuilder/pdebuild-sources.sh
   scripts/pbuilder/pdebuild.conf
Log:
upload

Modified: scripts/pbuilder/pdebuild-sources.sh
===================================================================
--- scripts/pbuilder/pdebuild-sources.sh	2010-12-12 11:35:00 UTC (rev 4706)
+++ scripts/pbuilder/pdebuild-sources.sh	2010-12-12 11:46:58 UTC (rev 4707)
@@ -38,7 +38,6 @@
 CONFFILE=./pdebuild.conf
 . $CONFFILE
 
-export APTGETOPT=('--force-yes')
 if [ ! -d "$BASEDIR/desktop" ] || [ ! -d "$BASEDIR/goodies" ];then
     ( 
         echo "ERROR: \$BASEDIR is not set correctly" 
@@ -116,10 +115,10 @@
 		version=$(dpkg-parsechangelog --count 1 | grep '^Version:' | awk '{ print $2 }')
 		if [ -f $BUILDRESULT/${pkg}_${version}_${ARCH}.changes ]; 
 		then
-			echo "$pkg already built, skipping"
+      echo "$pkg already built, skipping ($BUILDRESULT/${pkg}_${version}_${ARCH}.changes present)"
 		else
       # pass variables to the build
-      export pkg version ARCH DISTRIBUTION BRANCH DEBBUILDOPTS BUILDRESULT
+      export pkg version ARCH DISTRIBUTION BRANCH DEBBUILDOPTS BUILDRESULT APTGETOPT
 			[ "$DEBUG" ] || svn-buildpackage --svn-ignore-new \
 				--svn-builder $SCRIPTSDIR/pbuilder/pdebuild.wrapper &&
 			echo "done"

Modified: scripts/pbuilder/pdebuild.conf
===================================================================
--- scripts/pbuilder/pdebuild.conf	2010-12-12 11:35:00 UTC (rev 4706)
+++ scripts/pbuilder/pdebuild.conf	2010-12-12 11:46:58 UTC (rev 4707)
@@ -11,19 +11,20 @@
 
 DESKTOPDIR=$BASEDIR/desktop/${BRANCH}
 GOODIESDIR=$BASEDIR/goodies/${BRANCH}
-BRANCH=${BRANCH#branches/}
+RBRANCH=${RBRANCH:-${BRANCH#branches/}}
 
 BASETGZ=$PBUILDERDIR/base-${DISTRIBUTION}-${ARCH}.tgz
 BASEPATH=$PBUILDERDIR/base-${DISTRIBUTION}-${ARCH}.cow
 
 BUILDPLACE=$PBUILDERDIR/tmpfs
-BUILDRESULT=$PBUILDERDIR/build-${DISTRIBUTION}-${ARCH}-${BRANCH}
+BUILDRESULT=$PBUILDERDIR/build-${DISTRIBUTION}-${ARCH}-${RBRANCH}
 BINDMOUNTS=$BUILDRESULT
 OTHERMIRROR="deb file://$BUILDRESULT ./"
 
 HOOKDIR=$BASEDIR/scripts/pbuilder/hooks
 APTCACHE=$PBUILDERDIR/cache-${DISTRIBUTION}
 
+#PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-gdebi"
 
 MIRRORSITE=http://ftp.fr.debian.org/debian
 USEPROC=yes
@@ -39,5 +40,14 @@
 #DEBOOTSTRAPOPTS[0]="--variant=buildd"
 #DEBOOTSTRAPOPTS[1]="--arch=i386"
 
+EXTRAPACKAGES="eatmydata"
+if [ -z "$LD_PRELOAD" ]; then 
+  LD_PRELOAD=/usr/lib/libeatmydata/libeatmydata.so
+else
+  LD_PRELOAD="$LD_PRELOAD":/usr/lib/libeatmydata/libeatmydata.so
+fi
+export LD_PRELOAD
+
 export CCACHEDIR="$PBUILDERDIR/ccache"
 export CCACHE_DIR=$CCACHEDIR
+export APTGETOPT='--force-yes'