pdebuild: Add architecture flag; #516625

pdebuild: add support for setting the architecture on the command-line
and in pbuilderrc; closes: #516625.

4 files changed, 12 insertions, 1 deletions

diff --git a/pbuilder-modules b/pbuilder-modules
index bb57d7e..c54a25b 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -84,6 +84,7 @@ pdebuild-specific pbuilder-options:
  --pbuildersatisfydepends [command to satisfy build-dependencies]
  --buildsourceroot [command to obtain root privilege for dpkg-buildpackage]
  --use-pdebuild-internal
+ --architecture
  --auto-debsign
  --debsign-k [keyid]
 EOF
diff --git a/pdebuild b/pdebuild
index f9e79b5..28dff21 100644
--- a/pdebuild
+++ b/pdebuild
@@ -31,7 +31,7 @@ fi;
 
 PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p')
 PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p')
-ARCHITECTURE=$(dpkg-architecture -qDEB_HOST_ARCH)
+ARCHITECTURE="${ARCHITECTURE:-`dpkg-architecture -qDEB_HOST_ARCH`}"
 CHANGES="${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes"
 
 if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
diff --git a/pdebuild-checkparams b/pdebuild-checkparams
index 1522fc8..b6ba0ed 100644
--- a/pdebuild-checkparams
+++ b/pdebuild-checkparams
@@ -55,6 +55,10 @@ while [ -n "$1" ]; do
 	    shift; shift; 
 	    ;;
 	    # pdebuild specific options.
+	--architecture)
+	    ARCHITECTURE="$2"
+	    shift; shift;
+	    ;;
 	--auto-debsign)
 	    AUTO_DEBSIGN="yes"
 	    shift;
diff --git a/pdebuild.1 b/pdebuild.1
index 7016bd4..d65863a 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -39,6 +39,12 @@ invoking pbuilder.
 The command used to satisfy (i.e. install) build-dependencies.
 
 .TP
+.BI "\-\-architecture"
+
+Set architecture.  This is currently required when it doesn't match the host
+architecture.
+
+.TP
 .BI "\-\-auto\-debsign"
 
 Invoke debsign at the end of pdebuild process.