]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
UBUNTU: [Packaging] Only install cloud init files when do_tools_common=true
authorMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Wed, 4 Apr 2018 20:15:01 +0000 (17:15 -0300)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 5 Apr 2018 13:30:27 +0000 (08:30 -0500)
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>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
debian/rules.d/3-binary-indep.mk

index 4d9125a4740732ce1474c27c96d7e2829a7e8579..f41da6dffd0a8b3f4397288d955d203a23c8d9bf 100644 (file)
@@ -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
@@ -179,6 +180,7 @@ ifeq ($(do_tools_hyperv),true)
        dh_installinit -p$(cloudpkg) -o --name hv-fcopy-daemon
        dh_systemd_start -p$(cloudpkg)
 endif
+endif
 endif
        dh_installdeb -i
        $(lockme) dh_gencontrol -i