From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Sun, 20 Sep 2015 16:47:01 +0000 (+0000)
Subject: Merge "Missed a reference to prepare target which was earlier used by odl" into stabl... 
X-Git-Tag: arno.2015.2.0~33
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=279fb82409ad6cd18f1ab59ea3db8592d05b3095;hp=-c;p=genesis.git

Merge "Missed a reference to prepare target which was earlier used by odl" into stable/arno
---

279fb82409ad6cd18f1ab59ea3db8592d05b3095
diff --combined fuel/build/cache.mk
index 6ce75a5,af1de18..b88ac2f
--- a/fuel/build/cache.mk
+++ b/fuel/build/cache.mk
@@@ -1,4 -1,4 +1,4 @@@
- ##############################################################################
+ #############################################################################
  # Copyright (c) 2015 Ericsson AB and others.
  # stefan.k.berg@ericsson.com
  # jonas.bjurel@ericsson.com
@@@ -15,8 -15,10 +15,8 @@@ CACHECLEAN := $(addsuffix .clean,$(CACH
  ############################################################################
  # 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))
  #
@@@ -59,7 -61,7 +59,7 @@@ $(CACHEFILES)
  	fi
  
  .PHONY: validate-cache
- validate-cache: prepare $(CACHEVALIDATE)
+ 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;\