Package: rebuildd
Version: 0.3.5
Severity: wishlist
Tags: patch

Hi,

it would be nice to be able to pass more pbuilder options to the build
init script, for example by adding:

PBUILDER_OTHER_OPTIONS[0]="--components=main contrib"
PBUILDER_OTHER_OPTIONS[1]="--othermirror=deb http://my.apt.repo sid main"

to /etc/default/rebuildd.

Attached you find a patch that implements this feature. Unfortunately
it makes use of Bash arrays, which are not supported by dash, so that
I had to change the shell from "/bin/sh" to "/bin/bash".

I didn't find a simple way to get the same result with dash, pbuilder
itself uses bash (head -1 /usr/sbin/pbuilder), probably for the same
reason, as /etc/pbuilderrc make use of Bash arrays as well for the
DEBOOTSTRAPOPTS variable.

Ciao,

Free

diff --git a/debian/rebuildd.default b/debian/rebuildd.default
index e690123..f9317b7 100644
--- a/debian/rebuildd.default
+++ b/debian/rebuildd.default
@@ -20,6 +20,10 @@ PBUILDER_BIN=/usr/sbin/pbuilder
 # Default Debian mirror
 # PBUILDER_MIRROR=http://ftp.debian.org/debian
 
+# Pass other options to pbuilder
+# PBUILDER_OTHER_OPTIONS[0]="--components=main contrib"
+# PBUILDER_OTHER_OPTIONS[1]="--othermirror=deb http://my.apt.repo sid main"
+
 # Distributions to generate and manage
 ARCHS="$(dpkg --print-architecture)"
 DISTS="etch lenny sid"
diff --git a/rebuildd-init-build-system b/rebuildd-init-build-system
index cd87b45..c326ccc 100755
--- a/rebuildd-init-build-system
+++ b/rebuildd-init-build-system
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # Exit on errors
 set -e
@@ -7,6 +7,7 @@ set -e
 PBUILDER_BIN="/usr/sbin/pbuilder"
 PBUILDER_CACHE_PATH="/var/cache/pbuilder"
 PBUILDER_MIRROR="http://ftp.debian.org/debian";
+PBUILDER_OTHER_OPTIONS=()
 
 if [ -f /etc/default/rebuildd ]
 then
@@ -27,7 +28,7 @@ pbuilder_create ()
             for a in $ARCHS
             do
                 echo "I: Initializing pbuilder for ${d}-${a}"
-                $PBUILDER_BIN create --debootstrapopts --arch=$a --basetgz 
$PBUILDER_CACHE_PATH/${d}-${a}.tgz --distribution $d --mirror $PBUILDER_MIRROR
+                $PBUILDER_BIN create --debootstrapopts --arch=$a --basetgz 
$PBUILDER_CACHE_PATH/${d}-${a}.tgz --distribution $d --mirror $PBUILDER_MIRROR 
"[EMAIL PROTECTED]"
             done
         done
         echo "I: Init done, please remember to set rebuildd configuration to 
the correct value:"
@@ -48,7 +49,7 @@ cowbuilder_create ()
             for a in $ARCHS
             do
                 echo "I: Initializing cowbuilder for ${d}-${a}"
-                $COWBUILDER_BIN --create --debootstrapopts --arch=$a 
--basepath $PBUILDER_CACHE_PATH/${d}-${a}.cow --distribution $d --mirror 
$PBUILDER_MIRROR
+                $COWBUILDER_BIN --create --debootstrapopts --arch=$a 
--basepath $PBUILDER_CACHE_PATH/${d}-${a}.cow --distribution $d --mirror 
$PBUILDER_MIRROR "[EMAIL PROTECTED]"
             done
         done
 



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to