From patchwork Wed Mar 13 12:09:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1056020 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44K9cW2vJtz9s4Y; Wed, 13 Mar 2019 23:09:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1h42gz-0005ra-Ad; Wed, 13 Mar 2019 12:09:05 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1h42gx-0005rN-MM for kernel-team@lists.ubuntu.com; Wed, 13 Mar 2019 12:09:03 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1h42gx-0002Ca-Av; Wed, 13 Mar 2019 12:09:03 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [SRU trusty/master-next 1/1] Revert "UBUNTU: [Packaging] skip cloud tools packaging when not building package" Date: Wed, 13 Mar 2019 12:09:02 +0000 Message-Id: <20190313120902.6330-1-apw@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This reverts commit 1147a790e33fbef16a83d8e6deb5e7dfc5c194f4. This is plain wrong. We always build the linux-tools-common and linux-cloud-tools-common packages out of the primary linux package in any series. That kernel must produce them in the indep phase even if the indep architecture does not produce cloud packages as all and any derivative may depend on them in any architecture including the indep build architecture. If a package is failing to build for lack of a control entry, and it is a master branch it needs the control entry adding not this disabling. I will also note thaat at this point the code this omits no longer contains any packaging steps, so this part of the change would now be ineffective. BugLink: http://bugs.launchpad.net/bugs/1819869 Signed-off-by: Andy Whitcroft Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- debian/rules.d/3-binary-indep.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 5488fd1e7ba0..b4c90e381390 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -126,8 +126,6 @@ endif install -m644 $(CURDIR)/tools/power/x86/x86_energy_perf_policy/*.8 $(toolsman)/man8 install -m644 $(CURDIR)/tools/power/x86/turbostat/*.8 $(toolsman)/man8 -ifeq ($(do_cloud_tools),true) -ifeq ($(do_tools_hyperv),true) install -d $(cloudsbin) install -m755 debian/tools/generic $(cloudsbin)/hv_kvp_daemon install -m755 debian/tools/generic $(cloudsbin)/hv_vss_daemon @@ -138,8 +136,6 @@ ifeq ($(do_tools_hyperv),true) install -d $(cloudman)/man8 install -m644 $(CURDIR)/tools/hv/*.8 $(cloudman)/man8 -endif -endif endif