From 69ce1a6187740da9914af545e4fa2afa8215144c Mon Sep 17 00:00:00 2001 From: Tushar Aggarwal Date: Wed, 5 Aug 2020 10:10:09 -0700 Subject: [PATCH] Add make-deps as dependency to image building tgts --- images/capi/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/images/capi/Makefile b/images/capi/Makefile index b570f46bcb..ea08fe0d44 100644 --- a/images/capi/Makefile +++ b/images/capi/Makefile @@ -182,50 +182,50 @@ DO_BUILD_TARGETS := $(addprefix build-,$(DO_BUILD_NAMES)) QEMU_BUILD_TARGETS := $(addprefix build-,$(QEMU_BUILD_NAMES)) .PHONY: $(NODE_OVA_LOCAL_BUILD_TARGETS) -$(NODE_OVA_LOCAL_BUILD_TARGETS): +$(NODE_OVA_LOCAL_BUILD_TARGETS): deps-ova packer build $(PACKER_NODE_FLAGS) -var-file="packer/ova/packer-common.json" -var-file="$(abspath packer/ova/$(subst build-node-ova-local-,,$@).json)" -except=esx -except=vsphere -only=vmware-iso $(ABSOLUTE_PACKER_VAR_FILES) packer/ova/packer-node.json .PHONY: $(NODE_OVA_ESX_BUILD_TARGETS) -$(NODE_OVA_ESX_BUILD_TARGETS): +$(NODE_OVA_ESX_BUILD_TARGETS): deps-ova packer build $(PACKER_NODE_FLAGS) -var-file="packer/ova/packer-common.json" -var-file="$(abspath packer/ova/$(subst build-node-ova-esx-,,$@).json)" -var-file="packer/ova/esx.json" -except=local -except=vsphere -only=vmware-iso $(ABSOLUTE_PACKER_VAR_FILES) packer/ova/packer-node.json .PHONY: $(NODE_OVA_VSPHERE_BUILD_TARGETS) -$(NODE_OVA_VSPHERE_BUILD_TARGETS): +$(NODE_OVA_VSPHERE_BUILD_TARGETS): deps-ova packer build $(PACKER_NODE_FLAGS) -var-file="packer/ova/packer-common.json" -var-file="$(abspath packer/ova/$(subst build-node-ova-vsphere-,,$@).json)" -var-file="packer/ova/vsphere.json" -except=esx -except=local -only=vsphere-iso $(ABSOLUTE_PACKER_VAR_FILES) -only=vsphere packer/ova/packer-node.json .PHONY: $(HAPROXY_OVA_LOCAL_BUILD_TARGETS) -$(HAPROXY_OVA_LOCAL_BUILD_TARGETS): +$(HAPROXY_OVA_LOCAL_BUILD_TARGETS): deps-ova packer build $(PACKER_HAPROXY_FLAGS) -var-file="packer/ova/packer-common.json" -var-file="$(abspath packer/ova/$(subst build-haproxy-ova-local-,,$@).json)" -except=esx -except=vsphere -only=vmware-iso $(ABSOLUTE_PACKER_VAR_FILES) packer/ova/packer-haproxy.json .PHONY: $(HAPROXY_OVA_ESX_BUILD_TARGETS) -$(HAPROXY_OVA_ESX_BUILD_TARGETS): +$(HAPROXY_OVA_ESX_BUILD_TARGETS): deps-ova packer build $(PACKER_HAPROXY_FLAGS) -var-file="packer/ova/packer-common.json" -var-file="$(abspath packer/ova/$(subst build-haproxy-ova-esx-,,$@).json)" -var-file="packer/ova/esx.json" -except=local -except=vsphere -only=vmware-iso $(ABSOLUTE_PACKER_VAR_FILES) packer/ova/packer-haproxy.json .PHONY: $(HAPROXY_OVA_VSPHERE_BUILD_TARGETS) -$(HAPROXY_OVA_VSPHERE_BUILD_TARGETS): +$(HAPROXY_OVA_VSPHERE_BUILD_TARGETS): deps-ova packer build $(PACKER_HAPROXY_FLAGS) -var-file="packer/ova/packer-common.json" -var-file="$(abspath packer/ova/$(subst build-haproxy-ova-vsphere-,,$@).json)" -var-file="packer/ova/vsphere.json" -except=esx -except=local -only=vsphere-iso $(ABSOLUTE_PACKER_VAR_FILES) -only=vsphere packer/ova/packer-haproxy.json .PHONY: $(AMI_BUILD_TARGETS) -$(AMI_BUILD_TARGETS): +$(AMI_BUILD_TARGETS): deps-ami packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/ami/$(subst build-ami-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/ami/packer.json .PHONY: $(GCE_BUILD_TARGETS) -$(GCE_BUILD_TARGETS): +$(GCE_BUILD_TARGETS): deps-gce packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/gce/$(subst build-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/gce/packer.json .PHONY: $(AZURE_BUILD_VHD_TARGETS) -$(AZURE_BUILD_VHD_TARGETS): +$(AZURE_BUILD_VHD_TARGETS): deps-azure . $(abspath packer/azure/scripts/init-vhd.sh) && packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/azure/azure-config.json)" -var-file="$(abspath packer/azure/azure-vhd.json)" -only="$(subst build-azure-,,$@)" $(ABSOLUTE_PACKER_VAR_FILES) packer/azure/packer.json .PHONY: $(AZURE_BUILD_SIG_TARGETS) -$(AZURE_BUILD_SIG_TARGETS): +$(AZURE_BUILD_SIG_TARGETS): deps-azure . $(abspath packer/azure/scripts/init-sig.sh) && packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/azure/azure-config.json)" -var-file="$(abspath packer/azure/azure-sig.json)" -only="$(subst build-azure-,,$@)" $(ABSOLUTE_PACKER_VAR_FILES) packer/azure/packer.json -$(DO_BUILD_TARGETS): +$(DO_BUILD_TARGETS): deps-do packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/digitalocean/$(subst build-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/digitalocean/packer.json .PHONY: $(DO_BUILD_TARGETS) -$(QEMU_BUILD_TARGETS): +$(QEMU_BUILD_TARGETS): deps-qemu packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/qemu/$(subst build-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/qemu/packer.json .PHONY: $(QEMU_BUILD_TARGETS)