diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-18 13:51:24 +0100 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-18 14:16:54 +0100 |
| commit | dc8eec07243d65c99be15bda2c112c35caa48c54 (patch) | |
| tree | fa601c484bd6e7cdcaf7fd08fd65ea48d022c7ac | |
| parent | 58ab9100f56b4252578c9c13cb8060d87285f1ba (diff) | |
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>
| -rw-r--r-- | build/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/Makefile b/build/Makefile index 4f2ca6520..6d252ce2b 100644 --- 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 |