From db89245a1648e72b67080ba6f293487b078fcdc4 Mon Sep 17 00:00:00 2001 From: Felipe Vicens Date: Mon, 22 Jun 2020 21:34:01 +0200 Subject: [PATCH] Generating ngui version for NGUI_VERSION variable Change-Id: If252ec0dbdcfe69929166e05e8401cb4696ac497 Signed-off-by: Felipe Vicens --- docker/mk/Makefile.include | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index 1369a6d4..6d5f2615 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -34,7 +34,7 @@ CONTAINER_NAME ?= $(LOWER_MDG) CMD_DOCKER_ARGS ?= -q DOCKER_ARGS = $(CMD_DOCKER_ARGS) -DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui NG-UI PLA +DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS)) @@ -49,6 +49,9 @@ $(MKBUILD)/.dep_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_ngui: + $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m NG-UI -p ngui > $@ + $(MKBUILD)/.dep_%: $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@ @@ -70,7 +73,7 @@ build: $(MKBUILD) $(DEPS_TARGETS) --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \ --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \ --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \ - --build-arg NGUI_VERSION==$(shell cat $(MKBUILD)/.dep_NG-UI) \ + --build-arg NGUI_VERSION==$(shell cat $(MKBUILD)/.dep_ngui) \ $(DOCKER_ARGS) . clean: -- 2.25.1