projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install pip requirements as user
[osm/devops.git]
/
descriptor-packages
/
mk
/
pkg.mk
diff --git
a/descriptor-packages/mk/pkg.mk
b/descriptor-packages/mk/pkg.mk
index
07c0ed8
..
4226ebf
100644
(file)
--- a/
descriptor-packages/mk/pkg.mk
+++ b/
descriptor-packages/mk/pkg.mk
@@
-20,7
+20,7
@@
TOOLS_DIR := $(TOPDIR)/descriptor-packages/tools
PKG_BASE_NAME := $(shell basename $(shell pwd))
PKG_NAME := $(addsuffix .tar.gz, $(PKG_BASE_NAME))
PKG_BASE_NAME := $(shell basename $(shell pwd))
PKG_NAME := $(addsuffix .tar.gz, $(PKG_BASE_NAME))
-CHARM_DIR := $(TOPDIR)/
juju-
charms
+CHARM_DIR := $(TOPDIR)/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
@@
-69,14
+69,14
@@
else
$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
$(Q)charm build -o $(CHARM_DIR) $<
endif
$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
$(Q)charm build -o $(CHARM_DIR) $<
endif
-
+
clean:
$(Q)rm -rf $(BUILD_DIR)
$(Q)rm -rf $(CHARM_BUILD_DIR)
test:
clean:
$(Q)rm -rf $(BUILD_DIR)
$(Q)rm -rf $(CHARM_BUILD_DIR)
test:
- $(Q)echo -n testing $(shell readlink -f src/*.yaml) " "
+ $(Q)echo -n testing $(shell readlink -f src/*.yaml) " "
$(Q)$(TEST_PKG) src/*.yaml
$(Q)echo OK
$(Q)$(TEST_PKG) src/*.yaml
$(Q)echo OK
-
+
.DEFAULT_GOAL := all
.DEFAULT_GOAL := all