projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Workaround for Bug 1262"
[osm/devops.git]
/
docker
/
mk
/
Makefile.include
diff --git
a/docker/mk/Makefile.include
b/docker/mk/Makefile.include
index
f8e34c5
..
e151748
100644
(file)
--- a/
docker/mk/Makefile.include
+++ b/
docker/mk/Makefile.include
@@
-34,8
+34,7
@@
CONTAINER_NAME ?= $(LOWER_MDG)
CMD_DOCKER_ARGS ?= -q
DOCKER_ARGS = $(CMD_DOCKER_ARGS)
CMD_DOCKER_ARGS ?= -q
DOCKER_ARGS = $(CMD_DOCKER_ARGS)
-#DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests
-DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC ngui PLA tests
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests
DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
@@
-47,8
+46,8
@@
$(MKBUILD):
$(MKBUILD)/.dep_policy-module:
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m POL -p policy-module > $@
$(MKBUILD)/.dep_policy-module:
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m POL -p policy-module > $@
-
#
$(MKBUILD)/.dep_lightui:
-
#
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m LW-UI -p lightui > $@
+$(MKBUILD)/.dep_lightui:
+
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m LW-UI -p lightui > $@
$(MKBUILD)/.dep_ngui:
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m NG-UI -p ngui > $@
$(MKBUILD)/.dep_ngui:
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m NG-UI -p ngui > $@