diff options
author | Guido Günther <agx@sigxcpu.org> | 2010-09-02 22:12:10 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2010-09-02 22:17:31 +0200 |
commit | ed97b843f16bc3253dca54a56e0ce7df587760b6 (patch) | |
tree | 4d46e785463962de2419a1162f866552de0752d0 | |
parent | 6a200ad6ac280c169b6e2f0d919b8ceead62bf80 (diff) |
Add --git-arch option
-rw-r--r-- | docs/manpages/git-buildpackage.sgml | 13 | ||||
-rw-r--r-- | gbp/config.py | 3 | ||||
-rwxr-xr-x | git-buildpackage | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index aebc9eab..213e655e 100644 --- a/docs/manpages/git-buildpackage.sgml +++ b/docs/manpages/git-buildpackage.sgml @@ -29,6 +29,7 @@ <arg><option>--git-cleaner=</option><replaceable>CLEAN_CMD</replaceable></arg> <arg><option>--git-pbuilder=</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> <arg><option>--git-keyid=</option><replaceable>gpg-keyid</replaceable></arg> <arg><option>--git-posttag=</option><replaceable>command</replaceable></arg> @@ -133,7 +134,17 @@ <varlistentry> <term><option>--git-dist=<replaceable>DIST</replaceable></option></term> <listitem> - <para>Build for distribution <replaceable>DIST</replaceable> when using <command>--git-pbuilder</command></para> + <para>Build for distribution <replaceable>DIST</replaceable> when + using <command>--git-pbuilder</command>. If unset build for the + unstable distribution.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--git-arch=<replaceable>ARCH</replaceable></option></term> + <listitem> + <para>Build for architecture <replaceable>ARCH</replaceable> when + using <command>--git-pbuilder</command>. If unset no architecture is + passed to <command>git-pbuilder</command>. </listitem> </varlistentry> <varlistentry> diff --git a/gbp/config.py b/gbp/config.py index 5513614a..9a6a3c53 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -66,6 +66,7 @@ class GbpOptionParser(OptionParser): 'multimaint-merge' : 'False', 'pbuilder' : 'False', 'dist' : 'sid', + 'arch' : '', } help = { 'debian-branch': @@ -108,6 +109,8 @@ class GbpOptionParser(OptionParser): "Invoke git-pbuilder for building, default is '%(pbuilder)s'", 'dist': "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'", } config_files = [ '/etc/git-buildpackage/gbp.conf', os.path.expanduser('~/.gbp.conf'), diff --git a/git-buildpackage b/git-buildpackage index 649b9dd6..63483a8d 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -202,6 +202,8 @@ def setup_pbuilder(options): options.builder = 'git-pbuilder' options.cleaner = '/bin/true' os.environ['DIST'] = options.pbuilder_dist + if options.pbuilder_arch: + os.environ['ARCH'] = options.pbuilder_arch def main(argv): @@ -273,6 +275,7 @@ def main(argv): 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="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", help="before building the package export the source into EXPORT_DIR, default is '%(export-dir)s'") export_group.add_config_file_option("export", dest="export", |