UBUNTU: [Debian] do_common_tools should always be on

do_common_tools is a mode specifier, it is on when we want tools and off
when we do not want tools.  It is intended to be flipped by the bootstrap
modes.  Whether those common tools are actually built is determined by
whether we are calling binary or binary-arch not related to whether we
want those packages to have content.

Enable this unconditionally.  This allows us to build the indep packages
on any arch is needed.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules b/debian/rules
index fb3210f8a744c758d9dc2eb04bb087fa1eb37c15..1b65a1015cf78d21f0936f8b15cfb4bd5b998183 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,7 @@ include $(DROOT)/rules.d/1-maintainer.mk
 
 do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86)))
 do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv)))
+do_tools_common=true
 
 # Don't build tools in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))