diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-29 13:29:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-29 13:29:43 +0000 |
| commit | 17b1ae56ee54b6db75ea9d0b4e1ca8820a155c89 (patch) | |
| tree | 7e7962bcead580dfdd368db542e2c76149b6e133 /build/Makefile | |
| parent | a9a74a47a32c57d664c4db540b6019292345318d (diff) | |
| parent | 36895dd570e1c602ea3171fa4c8bb77b19bc91d4 (diff) | |
Merge "Cache as we go instead of in the end" into stable/brahmaputra
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/Makefile b/build/Makefile index 71a4ad5d0..6c61714da 100644 --- a/build/Makefile +++ b/build/Makefile @@ -122,10 +122,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) |