From be7e4761f817e0dbfc89e3364970324f853ba335 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 26 Sep 2016 22:29:13 +0100 Subject: [PATCH] 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. --- debian/bin/gencontrol.py | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 776642a04..76a1790fe 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -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) diff --git a/debian/changelog b/debian/changelog index 03ce3a735..29fdb4865 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 26 Sep 2016 22:27:31 +0100 + linux (4.7.5-1) unstable; urgency=medium * New upstream stable update: