Commit 6d88ed7f authored by Marcelo Henrique Cerri's avatar Marcelo Henrique Cerri Committed by Juerg Haefliger

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

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.

BugLink: http://bugs.launchpad.net/bugs/1764794Signed-off-by: default avatarMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 3c448b0a
...@@ -187,6 +187,7 @@ binary-indep: install-indep ...@@ -187,6 +187,7 @@ binary-indep: install-indep
dh_installdocs -i dh_installdocs -i
dh_compress -i dh_compress -i
dh_fixperms -i dh_fixperms -i
ifeq ($(do_tools_common),true)
ifneq ($(DEBIAN),debian.master) ifneq ($(DEBIAN),debian.master)
echo "non-master branch building linux-cloud-tools-common, aborting" echo "non-master branch building linux-cloud-tools-common, aborting"
exit 1 exit 1
...@@ -202,6 +203,7 @@ ifeq ($(do_tools_hyperv),true) ...@@ -202,6 +203,7 @@ ifeq ($(do_tools_hyperv),true)
dh_installinit -p$(cloudpkg) -o --name hv-fcopy-daemon dh_installinit -p$(cloudpkg) -o --name hv-fcopy-daemon
dh_systemd_start -p$(cloudpkg) dh_systemd_start -p$(cloudpkg)
endif endif
endif
endif endif
dh_installdeb -i dh_installdeb -i
$(lockme) dh_gencontrol -i $(lockme) dh_gencontrol -i
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment