Add support for qemubuilder

Closes: #601298

diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 79aa72b..78c7aca 100644 (file)
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -29,7 +29,8 @@
       <arg><option>--git-ignore-branch</option></arg>
       <arg><option>--git-builder=</option><replaceable>BUILD_CMD</replaceable></arg>
       <arg><option>--git-cleaner=</option><replaceable>CLEAN_CMD</replaceable></arg>
-      <arg><option>--git-pbuilder=</option></arg>
+      <arg><option>--git-[no-]pbuilder</option></arg>
+      <arg><option>--git-[no-]qemubuilder</option></arg>
       <arg><option>--git-dist=</option><replaceable>DIST</replaceable></arg>
       <arg><option>--git-arch=</option><replaceable>ARCH</replaceable></arg>
       <arg><option>--git-[no-]sign-tags</option></arg>
@@ -134,6 +135,15 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>--git-qemubuilder</option></term>
+        <listitem>
+         <para>Build package using <command>git-pbuilder</command> with
+         <command>qemubuilder</command>. Note that this overwrites any
+         <option>--git-builder</option> and <option>--git-cleaner</option>
+         options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--git-dist=<replaceable>DIST</replaceable></option></term>
         <listitem>
          <para>Build for distribution <replaceable>DIST</replaceable> when

diff --git a/gbp/config.py b/gbp/config.py
index c7e6f26..14e72b3 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -93,6 +93,7 @@ class GbpOptionParser(OptionParser):
                  'multimaint'      : 'True',
                  'multimaint-merge': 'False',
                  'pbuilder'        : 'False',
+                 'qemubuilder'     : 'False',
                  'dist'            : 'sid',
                  'arch'            : '',
                  'interactive'     : 'True',
@@ -153,6 +154,8 @@ class GbpOptionParser(OptionParser):
                   "Build for this distribution when using git-pbuilder, default is '%(dist)s'",
              'arch':
                   "Build for this architecture when using git-pbuilder, default is '%(arch)s'",
+             'qemubuilder':
+                  "Invoke git-pbuilder with qemubuilder for building, default is '%(qemubuilder)s'",
              'interactive':
                   "Run command interactive, default is '%(interactive)s'",
              'color':

diff --git a/git-buildpackage b/git-buildpackage
index 6bbe52e..4fec994 100755 (executable)
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -310,12 +310,14 @@ def guess_comp_type(repo, comp_type, cp, tarball_dir):
 
 def setup_pbuilder(options):
     """setup everything to use git-pbuilder"""
-    if options.use_pbuilder:
+    if options.use_pbuilder or options.use_qemubuilder:
         options.builder = 'git-pbuilder'
         options.cleaner = '/bin/true'
         os.environ['DIST'] = options.pbuilder_dist
         if options.pbuilder_arch:
             os.environ['ARCH'] = options.pbuilder_arch
+        if options.use_qemubuilder:
+            os.environ['BUILDER'] = "qemubuilder"
 
 
 def parse_args(argv, prefix):
@@ -385,6 +387,7 @@ def parse_args(argv, prefix):
     cmd_group.add_config_file_option(option_name="posttag", dest="posttag",
                       help="hook run after a successful tag operation, default is '%(posttag)s'")
     cmd_group.add_boolean_config_file_option(option_name="pbuilder", dest="use_pbuilder")
+    cmd_group.add_config_file_option(option_name="qemubuilder", dest="use_qemubuilder")
     cmd_group.add_config_file_option(option_name="dist", dest="pbuilder_dist")
     cmd_group.add_config_file_option(option_name="arch", dest="pbuilder_arch")
     export_group.add_config_file_option(option_name="export-dir", dest="export_dir", type="path",