From patchwork Wed Apr 3 13:58:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thibault Ferrante X-Patchwork-Id: 1919336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V8mZN4Y4lz23tl for ; Thu, 4 Apr 2024 00:59:07 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rs18i-0004fw-JM; Wed, 03 Apr 2024 13:58:56 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rs18h-0004fX-1A for kernel-team@lists.ubuntu.com; Wed, 03 Apr 2024 13:58:55 +0000 Received: from Q58-sff.fritz.box (2.general.thibf.uk.vpn [10.172.200.120]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id B81913F070; Wed, 3 Apr 2024 13:58:54 +0000 (UTC) From: Thibault Ferrante To: kernel-team@lists.ubuntu.com Subject: [RFC][U/N][PATCH 1/1] UBUNTU: [Packaging] Don't package tools_host when tools_common is disabled Date: Wed, 3 Apr 2024 15:58:30 +0200 Message-ID: <20240403135830.3437851-2-thibault.ferrante@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240403135830.3437851-1-thibault.ferrante@canonical.com> References: <20240403135830.3437851-1-thibault.ferrante@canonical.com> 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Thibault Ferrante --- debian/rules.d/3-binary-indep.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index c34161332257..1c5ca7524840 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -126,8 +126,6 @@ ifeq ($(do_tools_acpidbg),true) install -m755 debian/tools/generic $(toolsbin)/acpidbg endif -endif - ifeq ($(do_tools_host),true) install -d $(hosttoolsbin) install -d $(hosttoolsman)/man1 @@ -141,6 +139,7 @@ ifeq ($(do_tools_host),true) install -m644 $(builddir)/tools/tools/kvm/kvm_stat/*.1 \ $(hosttoolsman)/man1 endif +endif $(stampdir)/stamp-prepare-indep: @echo Debug: $@ @@ -192,11 +191,11 @@ endif # and dh_systemd_start are called: dh_installinit -p$(cloudpkg) --no-start --no-enable --name intel-sgx-load-module endif -endif ifeq ($(do_tools_host),true) # Keep kvm_stat.service disabled by default (after dh_systemd_enable # and dh_systemd_start: dh_installinit -p$(hosttoolspkg) --no-enable --no-start --name kvm_stat +endif endif dh_installdeb -i $(lockme) dh_gencontrol -i