diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-21 12:48:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-21 12:48:39 +0000 |
| commit | f1cdd0c49d4495a59bd797ee7353cef816976d4a (patch) | |
| tree | 2ff8660c5192300995edab32dd41ca623d6d47d6 /build/Makefile | |
| parent | 218381cdc6073510d7ee280c1a5f54e56b25b051 (diff) | |
| parent | 35697966da656585c43e2a2342a135ada65703cb (diff) | |
Merge "Turn on fuelmenu by default, turn off biosdevname"
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build/Makefile b/build/Makefile index 6d252ce2b..f690b7c96 100644 --- a/build/Makefile +++ b/build/Makefile @@ -20,14 +20,14 @@ SHELL = /bin/bash #Input args export ISOSRC = file:$(shell pwd)/fuel-8.0.iso export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC)) -export PRODNO = "OPNFV_BGS" +export PRODNO = "OPNFV_FUEL" export REVSTATE = "P0000" ifdef BUILD_FUEL_PLUGINS $(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS)) -export NEWISO = $(shell pwd)/release/unofficial-opnfv-${REVSTATE}.iso +export NEWISO = $(shell pwd)/release/unofficial-opnfv-fuel-${REVSTATE}.iso else -export NEWISO = $(shell pwd)/release/opnfv-${REVSTATE}.iso +export NEWISO = $(shell pwd)/release/opnfv-fuel-${REVSTATE}.iso endif # Note! Invoke with "make REVSTATE=RXXXX all" to make release build! @@ -97,8 +97,8 @@ $(ISOCACHE): cd /tmp/fuel-main && ./prepare-build-env.sh cd /tmp/fuel-main && make repos $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt - # - cd /tmp/fuel-main && sudo make iso + # Repeat build up to ten times + sudo ./fuel_build_loop cp /tmp/fuel-main/build/artifacts/fuel*.iso . .PHONY: mount-origiso umount-origiso @@ -182,7 +182,8 @@ debug: cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG) cd /tmp/fuel-main && make repos $(REPOINFO) -r /tmp/fuel-main > .cachedata - sha1sum fuel-main*.patch >> .cachedata + sha1sum *.patch >> .cachedata + sha1sum fuel_build_loop >> .cachedata sha1sum config.mk >> .cachedata sha1sum Makefile >> .cachedata $(CACHETOOL) getbiweek >> .cachedata |