projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix to upgrade tool
[osm/devops.git]
/
descriptor-packages
/
mk
/
pkg.mk
diff --git
a/descriptor-packages/mk/pkg.mk
b/descriptor-packages/mk/pkg.mk
index
0264602
..
9c623c4
100644
(file)
--- a/
descriptor-packages/mk/pkg.mk
+++ b/
descriptor-packages/mk/pkg.mk
@@
-24,7
+24,7
@@
CHARM_DIR := $(TOPDIR)/juju-charms
CHARM_SRC_DIR := $(CHARM_DIR)/layers
CHARM_DOCKER_TAG := charm-tools
CHARM_BUILD_DIR := $(CHARM_DIR)/builds
CHARM_SRC_DIR := $(CHARM_DIR)/layers
CHARM_DOCKER_TAG := charm-tools
CHARM_BUILD_DIR := $(CHARM_DIR)/builds
-DOCKER_BUILD ?=
$(shell which docker)
+DOCKER_BUILD ?=
Q=@
Q=@
@@
-36,25
+36,27
@@
BUILD_VNFD := $(shell readlink -f .|sed -e 's/\/.*descriptor-packages//' | gre
DEP_FILES = $(wildcard src/*)
ifdef BUILD_VNFD
DEP_FILES = $(wildcard src/*)
ifdef BUILD_VNFD
-$(BUILD_DIR)/$(PKG_BASE_NAME): src
$(DEP_FILES)
+$(BUILD_DIR)/$(PKG_BASE_NAME): src
$(Q)mkdir -p $@
$(Q)cp -rf $</. $@
$(Q)$(GEN_VNFD_PKG) $< $@
else
$(Q)mkdir -p $@
$(Q)cp -rf $</. $@
$(Q)$(GEN_VNFD_PKG) $< $@
else
-$(BUILD_DIR)/$(PKG_BASE_NAME): src
$(DEP_FILES)
+$(BUILD_DIR)/$(PKG_BASE_NAME): src
$(Q)mkdir -p $@
$(Q)cp -rf $</. $@
$(Q)$(GEN_NSD_PKG) $< $@
endif
ifdef VNFD_CHARM
$(Q)mkdir -p $@
$(Q)cp -rf $</. $@
$(Q)$(GEN_NSD_PKG) $< $@
endif
ifdef VNFD_CHARM
-$(BUILD_DIR)/$(PKG_NAME): $(
BUILD_DIR)/$(PKG_BASE_NAME
) $(CHARM_BUILD_DIR)/$(VNFD_CHARM)
+$(BUILD_DIR)/$(PKG_NAME): $(
DEP_FILES
) $(CHARM_BUILD_DIR)/$(VNFD_CHARM)
$(Q)echo "building $(PKG_BASE_NAME) with charm $(VNFD_CHARM)"
$(Q)echo "building $(PKG_BASE_NAME) with charm $(VNFD_CHARM)"
+ $(Q)$(MAKE) --no-print-directory $(BUILD_DIR)/$(PKG_BASE_NAME)
$(Q)cp -rf $(CHARM_BUILD_DIR)/$(VNFD_CHARM) $(BUILD_DIR)/$(PKG_BASE_NAME)/charms
$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
else
$(Q)cp -rf $(CHARM_BUILD_DIR)/$(VNFD_CHARM) $(BUILD_DIR)/$(PKG_BASE_NAME)/charms
$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
else
-$(BUILD_DIR)/$(PKG_NAME): $(BUILD_DIR)/$(PKG_BASE_NAME)
- $(Q)echo "building $(PKG_BASE_NAME)"
+$(BUILD_DIR)/$(PKG_NAME): $(DEP_FILES)
+ $(Q)echo "building $(PKG_BASE_NAME) $(BUILD_DIR)"
+ $(Q)$(MAKE) --no-print-directory $(BUILD_DIR)/$(PKG_BASE_NAME)
$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
endif
$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
endif