@@ -35,7 +35,6 @@ 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 or udebs in a cross compile environment.
ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
@@ -160,6 +160,9 @@ do_common_headers_indep=true
# add a 'full source' mode
do_full_source=false
+# build common tools
+do_tools_common=true
+
# build tools
ifneq ($(wildcard $(CURDIR)/tools),)
ifeq ($(do_tools),)
BugLink: https://bugs.launchpad.net/bugs/1691814 In order to allow derivatives to really override do_tools_common inside hooks.mk, it needs to be unconditionally set to true in 0-common-vars.mk, which is included before hooks.mk. Otherwise, hooks.mk won't be able to override it, and it will be true unless other conditions apply. This has caused derivatives to fail to build after commit 13d6fbbef038fdaee35200496131e6c6c77eb4b4 ("UBUNTU: [Packaging] prevent linux-*-tools-common from being produced from non linux packages"). Fixes: 13d6fbbef038fdaee35200496131e6c6c77eb4b4 Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian/rules | 1 - debian/rules.d/0-common-vars.mk | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-)