aboutsummaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-23 20:56:48 +0100
committerStefan Berg <sfb@consultron.com>2016-01-29 14:25:47 +0100
commit36895dd570e1c602ea3171fa4c8bb77b19bc91d4 (patch)
treed18e310cec7849e03069c9de99d26f64447587fc /build/Makefile
parent19f52239658b8e8b905acf4e8613db51f8d03e02 (diff)
Cache as we go instead of in the end
In order to speed up the build process when building with the cache enabled, cache immediately following the build of a sub artifact instead of at the end. Should the build fail, we don't need to rebuild those parts that already were successful in the last build. Change-Id: I23b59f7ba4a04272aea855cf451793158fe12241 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit d2c5a1dde91d10b4f3f9f5ac0b1570527247e03c)
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/build/Makefile b/build/Makefile
index 550f360f9..1d85bf263 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -120,10 +120,9 @@ $(ISOCACHE):
# Repeat build up to ten times
sudo ./fuel_build_loop
cp /tmp/fuel-main/build/artifacts/fuel*.iso .
-
- # Attempt to store ISO in cache to speed up the next
- # build attempt. If cache is not enabled no harm is done.
- $(MAKE) -f Makefile put-cache
+ # Store artifact in cache straight away if caching is enabled
+ # (no .cacheid will be present unless this is a cached build)
+ test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
.PHONY: mount-origiso umount-origiso
mount-origiso: $(ISOCACHE)