[bionic] UBUNTU: [Packaging] Only install cloud init files when do_tools_common=true

Message ID 1522872901-24519-1-git-send-email-marcelo.cerri@canonical.com
State New
Headers show
Series
  • [bionic] UBUNTU: [Packaging] Only install cloud init files when do_tools_common=true
Related show

Commit Message

Marcelo Henrique Cerri April 4, 2018, 8:15 p.m.
Skip the inclusion of init file into the -cloud-tools-common package
when do_tools_common is false. That's necessary in order to support
linux-azure, that ships hyper-v tools but does not ship the common bits.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 debian/rules.d/3-binary-indep.mk | 2 ++
 1 file changed, 2 insertions(+)

Comments

Seth Forshee April 4, 2018, 8:42 p.m. | #1
On Wed, Apr 04, 2018 at 05:15:01PM -0300, Marcelo Henrique Cerri wrote:
> Skip the inclusion of init file into the -cloud-tools-common package
> when do_tools_common is false. That's necessary in order to support
> linux-azure, that ships hyper-v tools but does not ship the common bits.
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>

Applied to bionic/master-next and unstable/master, thanks!

Patch

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 4d9125a47407..f41da6dffd0a 100644
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -168,6 +168,7 @@  binary-indep: install-indep
 	dh_installdocs -i
 	dh_compress -i
 	dh_fixperms -i
+ifeq ($(do_tools_common),true)
 ifeq ($(do_cloud_tools),true)
 ifeq ($(do_tools_hyperv),true)
 	dh_installinit -p$(cloudpkg) -n --name hv-kvp-daemon
@@ -180,6 +181,7 @@  ifeq ($(do_tools_hyperv),true)
 	dh_systemd_start -p$(cloudpkg)
 endif
 endif
+endif
 	dh_installdeb -i
 	$(lockme) dh_gencontrol -i
 	dh_md5sums -i