Fix repo cloning target (#67)

onosproject · May 3, 2021 · 03716a1 · 03716a1
1 parent 40484ed
commit 03716a1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,22 @@ riab: option version
 	@echo "Option:" $(OPT)
 endif
 
-option: | $(M)
+$(M)/repos: | $(M)
+	mkdir -p $(CHARTDIR)
+	cd $(CHARTDIR)
+	@if [[ ! -d "$(AETHERCHARTDIR)" ]]; then \
+                echo "aether-helm-chart repo is not in $(CHARTDIR) directory. Start to clone - it requires HTTPS key"; \
+				git clone $(CORD_GERRIT_URL)/aether-helm-charts $(AETHERCHARTDIR); \
+				cd $(AETHERCHARTDIR); \
+				git checkout $(AETHERCHARTCID); \
+	fi
+	@if [[ ! -d "$(SDRANCHARTDIR)" ]]; then \
+                echo "sdran-helm-chart repo is not in $(CHARTDIR) directory. Start to clone - it requires Github credential"; \
+				git clone $(ONOS_GITHUB_URL)/sdran-helm-charts $(SDRANCHARTDIR) || true; \
+	fi
+	touch $@
+
+option: | $(M) $(M)/repos
 ifeq ($(OPT), ransim)
 	$(eval OPT=ransim)
 	$(eval HELM_ARGS=$(HELM_ARGS_RANSIM))
@@ -66,7 +81,7 @@ else
 	@echo "Helm arguments for ransim (default): $(HELM_ARGS_RANSIM)"
 endif
 
-version: | $(M)
+version: | $(M) $(M)/repos
 	@cd $(AETHERCHARTDIR); git checkout $(AETHERCHARTCID)
 ifeq ($(VER), v1.0.0)
 	$(eval VER=v1.0.0)

diff --git a/mk/preliminaries.mk b/mk/preliminaries.mk
@@ -4,22 +4,7 @@
 # PHONY definitions
 PRELIMINARIES_PHONY			:= preliminaries
 
-preliminaries: $(M) $(M)/repos $(M)/system-check $(M)/setup
-
-$(M)/repos: | $(M)
-	mkdir -p $(CHARTDIR)
-	cd $(CHARTDIR)
-	@if [[ ! -d "$(AETHERCHARTDIR)" ]]; then \
-                echo "aether-helm-chart repo is not in $(CHARTDIR) directory. Start to clone - it requires HTTPS key"; \
-				git clone $(CORD_GERRIT_URL)/aether-helm-charts $(AETHERCHARTDIR); \
-				cd $(AETHERCHARTDIR); \
-				git checkout $(AETHERCHARTCID); \
-	fi
-	@if [[ ! -d "$(SDRANCHARTDIR)" ]]; then \
-                echo "sdran-helm-chart repo is not in $(CHARTDIR) directory. Start to clone - it requires Github credential"; \
-				git clone $(ONOS_GITHUB_URL)/sdran-helm-charts $(SDRANCHARTDIR) || true; \
-	fi
-	touch $@
+preliminaries: $(M) $(M)/system-check $(M)/setup
 
 $(M)/system-check: | $(M) $(M)/repos
 	@if [[ $(CPU_FAMILY) -eq 6 ]]; then \