UBUNTU: [Packaging] skip cloud tools packaging when not building package

Currently 3-binary-indep.mk performs cloud packaging steps if
do_tools_common is true, which can cause errors if the
cloud-tools package isn't defined in the control file. Make these
steps depend on do_cloud_tools and do_tools_hyperv as appropriate.

BugLink: http://bugs.launchpad.net/bugs/1764794Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

debian/rules.d/3-binary-indep.mk

@@ -130,6 +130,8 @@ endif
 	install -m644 $(CURDIR)/tools/power/x86/x86_energy_perf_policy/*.8 $(toolsman)/man8
 	install -m644 $(CURDIR)/tools/power/x86/turbostat/*.8 $(toolsman)/man8
 
+ifeq ($(do_cloud_tools),true)
+ifeq ($(do_tools_hyperv),true)
 	install -d $(cloudsbin)
 	install -m755 debian/tools/generic $(cloudsbin)/hv_kvp_daemon
 	install -m755 debian/tools/generic $(cloudsbin)/hv_vss_daemon
@@ -141,6 +143,8 @@ endif
 
 	install -d $(cloudman)/man8
 	install -m644 $(CURDIR)/tools/hv/*.8 $(cloudman)/man8
+endif
+endif
 
 endif
 
@@ -179,11 +183,12 @@ binary-indep: install-indep
 	dh_installdocs -i
 	dh_compress -i
 	dh_fixperms -i
-ifeq ($(do_tools_common),true)
 ifneq ($(DEBIAN),debian.master)
 	echo "non-master branch building linux-cloud-tools-common, aborting"
 	exit 1
 endif
+ifeq ($(do_cloud_tools),true)
+ifeq ($(do_tools_hyperv),true)
 	dh_installinit -p$(cloudpkg) -n --name hv-kvp-daemon
 	dh_installinit -p$(cloudpkg) -n --name hv-vss-daemon
 	dh_installinit -p$(cloudpkg) -n --name hv-fcopy-daemon
@@ -192,6 +197,7 @@ endif
 	dh_installinit -p$(cloudpkg) -o --name hv-vss-daemon
 	dh_installinit -p$(cloudpkg) -o --name hv-fcopy-daemon
 	dh_systemd_start -p$(cloudpkg)
+endif
 endif
 	dh_installdeb -i
 	$(lockme) dh_gencontrol -i