diff options
author | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-20 17:53:55 +0100 |
---|---|---|
committer | Stefan Berg <sfb@consultron.com> | 2016-01-29 13:59:45 +0100 |
commit | 80b903bcafeaf10c8d4f1270599d1c770703abab (patch) | |
tree | ace5a545cf11b2c188b927a4c4582b2a30c93606 /build/Makefile | |
parent | b65326f28448764f8993ceb856030615f68a9dfc (diff) |
Turn on fuelmenu by default, turn off biosdevname
Added experimental Fuel build loop, rebuilding up to ten times
while keeping the package cache, in the hope that all packages
will be able to download. Added snapshot support into this script
as well.
Changed naming of OPNFV iso label to OPNFV_FUEL_<id>, made changes
in ks.cfg and isolinux.cfg to look for this name at install.
Change-Id: Ic28a3af769cfc90416d7d988afd6f07eadcef4f1
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
(cherry picked from commit 35697966da656585c43e2a2342a135ada65703cb)
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 e3b79c2b3..6a74ad941 100644 --- a/build/Makefile +++ b/build/Makefile @@ -20,14 +20,14 @@ SHELL = /bin/bash #Input args export ISOSRC = file:$(shell pwd)/fuel-7.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! @@ -99,8 +99,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 @@ -184,7 +184,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 |