diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-17 19:18:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-17 19:18:59 +0000 |
| commit | 58ab9100f56b4252578c9c13cb8060d87285f1ba (patch) | |
| tree | 8294e825620f38d7be12875b0bb3e7db0aa7683e /build/Makefile | |
| parent | 76aa5bd1daf9568ab91f7586b0627062ffb26fb0 (diff) | |
| parent | 8e599759ede512a773eccef59eb2824940307564 (diff) | |
Merge "Fuel 8 uplift"
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/build/Makefile b/build/Makefile index d58f3ad76..4f2ca6520 100644 --- a/build/Makefile +++ b/build/Makefile @@ -18,7 +18,7 @@ SHELL = /bin/bash # BEGIN of variables to customize # #Input args -export ISOSRC = file:$(shell pwd)/fuel-7.0.iso +export ISOSRC = file:$(shell pwd)/fuel-8.0.iso export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC)) export PRODNO = "OPNFV_BGS" export REVSTATE = "P0000" @@ -81,12 +81,10 @@ $(ISOCACHE): fi 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) - # Setup cgroups for docker-in-docker - sudo /root/enable_dockerx2 # Patch for adding dosfstools, as Fuel 6.1 is running mkfs.vfat cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_5.patch - # Patch for changing the second layer Docker --bip address - cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_6.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 # Fuel build. sudo rm -f /etc/apt/apt.conf.d/docker* @@ -185,6 +183,7 @@ debug: cd /tmp/fuel-main && make repos $(REPOINFO) -r /tmp/fuel-main > .cachedata sha1sum fuel-main*.patch >> .cachedata + $(CACHETOOL) getbiweek >> .cachedata cat .cachedata | $(CACHETOOL) getid > .cacheid # Not removing fuel-main as it is re-used in build |