Correction of cache handling for ISO build

The cache id was not generated considering config.mk nor
Makefile.

Change-Id: I29ae0d60b89d4653cb38cffe83f666c5056daf63
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>

diff --git a/build/Makefile b/build/Makefile
index 4f2ca65..6d252ce 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -82,7 +82,7 @@ $(ISOCACHE):
        cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
        @echo "fuel" `git -C /tmp/fuel-main show | grep commit | head -1 | cut -d " " -f2` >> $(VERSION_FILE)
        # Patch for adding dosfstools, as Fuel 6.1 is running mkfs.vfat
-       cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_5.patch
+       cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_5.patch
        # Patch for using the Czech Fuel mirror
        # cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_7.patch
        # Remove Docker optimizations, otherwise multistrap will fail during
@@ -91,8 +91,8 @@ $(ISOCACHE):
        #
        # Need to replace the old Docker v. 1.5.0 with a later version to be
        # able to access the Docker remote repository!
-       cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_docker_version.patch
-       cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_docker_dns.patch
+       cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_docker_version.patch
+       # cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_docker_dns.patch
        #
        cd /tmp/fuel-main && ./prepare-build-env.sh
        cd /tmp/fuel-main && make repos
@@ -183,6 +183,8 @@ debug:
        cd /tmp/fuel-main && make repos
        $(REPOINFO) -r /tmp/fuel-main > .cachedata
        sha1sum fuel-main*.patch >> .cachedata
+       sha1sum config.mk >> .cachedata
+       sha1sum Makefile >> .cachedata
        $(CACHETOOL) getbiweek >> .cachedata
        cat .cachedata | $(CACHETOOL) getid > .cacheid
        # Not removing fuel-main as it is re-used in build