[RFC][U/N][PATCH 1/1] UBUNTU: [Packaging] Don't package tools_host when tools_common is disabled

Thibault Ferrante thibault.ferrante at canonical.com
Wed Apr 3 13:58:30 UTC 2024


Signed-off-by: Thibault Ferrante <thibault.ferrante at canonical.com>
---
 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
-- 
2.43.0




More information about the kernel-team mailing list