[pbuilder] 01/01: Add support for building architecture-independent binaries only with --binary-indep

Mattia Rizzolo mattia at debian.org
Wed Apr 20 17:25:50 UTC 2016


This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository pbuilder.

commit b12b9f4f3e5e6d40fa9273b70e5c0f2af9c6a373
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Apr 20 17:25:40 2016 +0000

    Add support for building architecture-independent binaries only with --binary-indep
    
    This option instructs pbuilder to install only Build-Depends and Build-Depends-Indep and call dpkg-buildpackage with -A
---
 pbuilder-buildpackage-funcs         | 1 +
 pbuilder-checkparams                | 6 ++++++
 pbuilder-satisfydepends-checkparams | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index 704cabd..a1f3575 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -50,6 +50,7 @@ function checkbuilddep () {
     local BUILDOPT="--binary-all"
     case "${BINARY_ARCH}" in
         binary) BUILDOPT="--binary-arch";;
+        all) BUILDOPT="--binary-indep";;
         *) ;;
     esac
     if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --chroot "${BUILDPLACE}" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" "${PBUILDERSATISFYDEPENDSOPT[@]}"; then
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 53816d9..549d2a5 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -207,6 +207,12 @@ while [ -n "$1" ]; do
         DEBBUILDOPTS="${DEBBUILDOPTS} -B"
         shift;
         ;;
+    --binary-indep)
+        BINARY_ARCH="all"
+        # XXX this might be overwritten by --debbuildopts ""
+        DEBBUILDOPTS="${DEBBUILDOPTS} -A"
+        shift
+        ;;
     --bin-nmu)
         BIN_NMU="yes"
         BINARY_ARCH="binary"
diff --git a/pbuilder-satisfydepends-checkparams b/pbuilder-satisfydepends-checkparams
index b31a4e8..c6e8de9 100755
--- a/pbuilder-satisfydepends-checkparams
+++ b/pbuilder-satisfydepends-checkparams
@@ -66,6 +66,10 @@ while [ -n "$1" ]; do
 	    BINARY_ARCH="binary"
 	    shift
 	    ;;
+    --binary-indep)
+        BINARY_ARCH="all"
+        shift
+        ;;
 	--continue-fail)
 	    CONTINUE_FAIL="yes"
 	    shift

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git



More information about the Pbuilder-maint mailing list