commit 1a6beb93a730957802aee371f987b70008aeb5eb
author Philip Joseph <philip.joseph@riftio.com> Thu Oct 13 11:54:52 2016 +0530
committer Philip Joseph <philip.joseph@riftio.com> Fri Nov 11 11:31:30 2016 +0530
tree 5b97a3333e06852be002e06374ae203e5c4e030c
parent 9b9904dc99740fd51e98678a9e1eb6208b985dc1

Bug 85: Fix VyOS package build

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>

Makefile

diff --git a/Makefile b/Makefile
index 1199c09..cf0f8cd 100644
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,9 @@
 	# Copy the PE Charm into the PE vnf package directory before packaging
 	cp -rf $(BUILD_DIR)/juju-charms/builds/vpe-router $(VNFD_BUILD_DIR)/6wind_vnf/charms
 
-$(VNFD_BUILD_DIR)/VyOS_vnf/charms/VyOS-proxy: $(VNFD_BUILD_DIR)/VyOS_vnf $(BUILD_DIR)/juju-charms
+$(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy: $(VNFD_BUILD_DIR)/VyOS_vnf $(BUILD_DIR)/juju-charms
 	# Copy the PE Charm into the PE vnf package directory before packaging
-	cp -rf $(BUILD_DIR)/juju-charms/builds/VyOS-proxy $(VNFD_BUILD_DIR)/VyOS_vnf/charms
+	cp -rf $(BUILD_DIR)/juju-charms/builds/vyos-proxy $(VNFD_BUILD_DIR)/VyOS_vnf/charms
 
-$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/VyOS-proxy
+$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy
 	src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/vnfd_pkgs $<