debian/bin/gencontrol.py: Fix cross-build-dependencies if invoked under dpkg-buildpackage

By default dpkg-architecture lets the current environment override the
architecture specified by the -a option.  We mustn't let that happen
here as we are considering all architectures.  Use the -f option to
force use of our specified architecture.
This commit is contained in:
Ben Hutchings 2016-09-26 22:29:13 +01:00
parent f7d84f7a69
commit be7e4761f8
2 changed files with 8 additions and 1 deletions

View File

@ -135,7 +135,7 @@ class Gencontrol(Base):
self._setup_makeflags(self.arch_makeflags, makeflags, config_base)
try:
gnu_type_bytes = subprocess.check_output(['dpkg-architecture',
gnu_type_bytes = subprocess.check_output(['dpkg-architecture', '-f',
'-a', arch,
'-q', 'DEB_HOST_GNU_TYPE'],
stderr=subprocess.DEVNULL)

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
linux (4.7.5-2) UNRELEASED; urgency=medium
* debian/bin/gencontrol.py: Fix cross-build-dependencies if invoked under
dpkg-buildpackage
-- Ben Hutchings <ben@decadent.org.uk> Mon, 26 Sep 2016 22:27:31 +0100
linux (4.7.5-1) unstable; urgency=medium
* New upstream stable update: