Changeset 4933 for current/host/trunk/emdebian-tools/trunk/pbuilder

Timestamp:

09/10/08 23:12:05 (4 months ago)

Author:

codehelp

Message:

emdebuild should have/pass along more dpkg-buildpackage options
(Closes: #497816) - add -- support to emdebuild and pass-down support
to calling scripts.

Files:

• current/host/trunk/emdebian-tools/trunk/pbuilder/empdebuild (modified) (6 diffs)

current/host/trunk/emdebian-tools/trunk/pbuilder/empdebuild

@@ -59 +59 @@
 --save-after-login:   Allow changes made within the chroot login to persist.
 --login-after-fail:   In case of error, try to log in to the new chroot.
+-- OPTIONS            dpkg-buildpackage options
+                       (except: -uc -us [default] -a [ignored])
 
 Although based on pbuilder, empdebuild cannot support the full range of
@@ -72 +74 @@
 can use 'empdebuild --autobuild PACKAGE' to ensure that the patches are
 usable for the autobuilder.
+
+Options to dpkg-buildpackage can be specified after the -- option.
+Note that '-uc' and '-us' are set by default and '-a' will be ignored
+(because arch is controlled separately). Options are passed down to
+emdebuild unchanged.
 
 EOF
@@ -246 +253 @@
                 exit 1;
         fi
-        if echo "$COLOUR ARCH=$ARCH emsource -q -a $ARCH -b --build-dep $PACKAGE" | chroot $BUILDPLACE /bin/sh; then
+        if echo "$COLOUR ARCH=$ARCH emsource -q -a $ARCH -b --build-dep $PACKAGE $EM_DPKG_OPTS" | chroot $BUILDPLACE /bin/sh; then
         :
         else
@@ -414 +421 @@
         echo " -> copying ../$OLDSRC"
         cp -r "../$OLDSRC" "$BUILDPLACE/trunk/$TRUNK"
-        echo "Running emdebuild -a $ARCH: "
+        echo "Running emdebuild -a $ARCH $EM_DPKG_OPTS "
         COLOUR=
         if [ $ANSI_COLORS_DISABLED ]; then
                 COLOUR=ANSI_COLORS_DISABLED=1
         fi
-        if echo "cd /trunk/$SVN; $COLOUR ARCH=$ARCH emdebuild -a $ARCH" | chroot $BUILDPLACE /bin/sh; then
+        if echo "cd /trunk/$SVN; $COLOUR ARCH=$ARCH emdebuild -a $ARCH $EM_DPKG_OPTS" | chroot $BUILDPLACE /bin/sh; then
         :
         else
@@ -595 +602 @@
                 exit;
         ;;
+        --)
+                while [ -n "$1" ]
+                do
+                        EM_DPKG_OPTS+="$1 "
+                        shift
+                done
+                break
+        ;;
         *)
                 echo "Unrecognised option: $1"
@@ -603 +618 @@
 esac
 done
-