From patchwork Fri May 19 13:48:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 764673 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3wTqCJ0BMmz9s7k; Fri, 19 May 2017 23:48:44 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1dBiGj-0007VU-Ou; Fri, 19 May 2017 13:48:37 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dBiGc-0007Ud-A2 for kernel-team@lists.ubuntu.com; Fri, 19 May 2017 13:48:30 +0000 Received: from [187.101.79.164] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dBiGb-0002h0-Ju; Fri, 19 May 2017 13:48:30 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Packaging] Set do_tools_common in common vars Date: Fri, 19 May 2017 10:48:16 -0300 Message-Id: <20170519134821.7939-2-cascardo@canonical.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170519134821.7939-1-cascardo@canonical.com> References: <20170519134821.7939-1-cascardo@canonical.com> Cc: apw@canonical.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 --- debian/rules | 1 - debian/rules.d/0-common-vars.mk | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f2e801c62c82..8b18711125fe 100755 --- 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 ccc65dc03358..0628e552183c 100644 --- 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),)