X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2Fcache.mk;h=b88ac2fc4aabe9c9b93d30672e2d22d304452949;hb=563547b4a9f44090f32c0e17d040114854563760;hp=cc98f6825f9a503acc118ddafc37f0565695d9f4;hpb=3eed12baa4753bf7f1eadc2b99465af38086f14f;p=genesis.git

diff --git a/fuel/build/cache.mk b/fuel/build/cache.mk
index cc98f68..b88ac2f 100644
--- a/fuel/build/cache.mk
+++ b/fuel/build/cache.mk
@@ -1,4 +1,4 @@
-##############################################################################
+#############################################################################
 # Copyright (c) 2015 Ericsson AB and others.
 # stefan.k.berg@ericsson.com
 # jonas.bjurel@ericsson.com
@@ -15,10 +15,8 @@ CACHECLEAN := $(addsuffix .clean,$(CACHEFILES) $(CACHEDIRS))
 ############################################################################
 # BEGIN of variables to customize
 #
-#CACHEDIRS := opendaylight/f_odl/package
+#CACHEDIRS := foo/bar
 
-#CACHEFILES := opendaylight/.odl-build-history
-#CACHEFILES += opendaylight/.odl-build.log
 CACHEFILES += .versions
 CACHEFILES += $(shell basename $(ISOSRC))
 #
@@ -54,20 +52,20 @@ $(CACHEFILES):
 
 	@if [ ! -f $(BUILD_BASE)/$@ ]; then\
 	   echo " " > $(BUILD_BASE)/$@;\
- 	   ln -s $(BUILD_BASE)/$@ $(CACHE_DIR)/$@;\
+	   ln -s $(BUILD_BASE)/$@ $(CACHE_DIR)/$@;\
 	   rm -f $(BUILD_BASE)/$@;\
 	else\
 	   ln -s $(BUILD_BASE)/$@ $(CACHE_DIR)/$@;\
 	fi
 
 .PHONY: validate-cache
-validate-cache: prepare $(CACHEVALIDATE)
-	@if [[ $(shell md5sum $(BUILD_BASE)/config.mk | cut -f1 -d " ") != $(shell cat $(VERSION_FILE) | grep config.mk | awk '{print $$NF}') ]]; then\
+validate-cache: $(CACHEVALIDATE)
+	@if [ "$(shell md5sum $(BUILD_BASE)/config.mk | cut -f1 -d " ")" != "$(shell cat $(VERSION_FILE) | grep config.mk | awk '{print $$NF}')" ]; then\
 	   echo "Cache does not match current config.mk definition, cache must be rebuilt";\
 	   exit 1;\
 	fi;
 
-	@if [[ $(shell md5sum $(BUILD_BASE)/cache.mk | cut -f1 -d " ") != $(shell cat $(VERSION_FILE) | grep cache.mk | awk '{print $$NF}') ]]; then\
+	@if [ "$(shell md5sum $(BUILD_BASE)/cache.mk | cut -f1 -d " ")" != "$(shell cat $(VERSION_FILE) | grep cache.mk | awk '{print $$NF}')" ]; then\
 	   echo "Cache does not match current cache.mk definition, cache must be rebuilt";\
 	   exit 1;\
 	fi;
@@ -80,14 +78,12 @@ validate-cache: prepare $(CACHEVALIDATE)
 	then \
 	   REMOTE_ID=$(shell git ls-remote $(FUEL_MAIN_REPO) $(FUEL_MAIN_TAG) | awk '{print $$(NF-1)}'); \
 	fi; \
-	if [ $$REMOTE_ID != $(shell cat $(VERSION_FILE) | grep fuel | awk '{print $$NF}') ]; \
+	if [[ $$REMOTE_ID != $(shell cat $(VERSION_FILE) | grep fuel | awk '{print $$NF}') ]]; \
 	then \
 	   echo "Cache does not match upstream Fuel, cache must be rebuilt!"; \
 	   exit 1; \
 	fi
 
-	#$(MAKE) -C opendaylight validate-cache
-
 .PHONY: $(CACHEVALIDATE)
 $(CACHEVALIDATE): %.validate:
 	@echo VALIDATE $(CACHEVALIDATE)