UBUNTU: [Packaging] Set do_tools_common in common vars

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>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian/rules b/debian/rules
index f2e801c62c82ec8d9ea2f508a667c355b49213dc..8b18711125fe9e05b2b2671c97d839ec00b43a75 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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))

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index ccc65dc033586dba9a48d38266025b2b86273abf..0628e552183cfb7d6ebd4196d3b82fdcce68dfd9 100644 (file)
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -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),)