Package: git-buildpackage Version: 0.5.11 When determining the .changes filename both the ARCH environment variable, and the --git-arch command line flag are ignored.
This causes git-buildpackage to set GBP_CHANGES_FILE to be
*_source.changes when compiling i386 packages on an amd64 machine.
Below is a patch to check the ARCH envionment variable then the value of
the --git-arch argument before falling back to get_arch().
--
Jacob Helwig
-----------------8<------------------------------
From 51b97942cde684923f93e4869de94c3c89892314 Mon Sep 17 00:00:00 2001
From: Jacob Helwig <ja...@technosorcery.net>
Date: Thu, 16 Dec 2010 15:58:49 -0800
Subject: [PATCH] Check values of ARCH, and --git-arch before get_arch when
building GBP_CHANGES_FILE
Signed-off-by: Jacob Helwig <ja...@technosorcery.net>
---
git-buildpackage | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-buildpackage b/git-buildpackage
index e37a1ff..20304bb 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -407,7 +407,7 @@ def main(argv):
RunAtCommand(options.builder, dpkg_args, shell=True,
extra_env={'GBP_BUILD_DIR': build_dir})(dir=build_dir)
if options.postbuild:
- arch = du.get_arch()
+ arch = os.environ['ARCH'] or options.pbuilder_arch or
du.get_arch()
changes = os.path.abspath("%s/../%s_%s_%s.changes" %
(build_dir, cp['Source'],
version_no_epoch, arch))
if not os.path.exists(changes):
--
1.7.3.3
From 51b97942cde684923f93e4869de94c3c89892314 Mon Sep 17 00:00:00 2001
From: Jacob Helwig <ja...@technosorcery.net>
Date: Thu, 16 Dec 2010 15:58:49 -0800
Subject: [PATCH] Check values of ARCH, and --git-arch before get_arch when building GBP_CHANGES_FILE
Signed-off-by: Jacob Helwig <ja...@technosorcery.net>
---
git-buildpackage | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-buildpackage b/git-buildpackage
index e37a1ff..20304bb 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -407,7 +407,7 @@ def main(argv):
RunAtCommand(options.builder, dpkg_args, shell=True,
extra_env={'GBP_BUILD_DIR': build_dir})(dir=build_dir)
if options.postbuild:
- arch = du.get_arch()
+ arch = os.environ['ARCH'] or options.pbuilder_arch or du.get_arch()
changes = os.path.abspath("%s/../%s_%s_%s.changes" %
(build_dir, cp['Source'], version_no_epoch, arch))
if not os.path.exists(changes):
--
1.7.3.3
signature.asc
Description: Digital signature
