summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-08 13:26:00 +0100
committerStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-17 12:10:12 +0100
commit8e599759ede512a773eccef59eb2824940307564 (patch)
tree645f1a95633dfa00ed4c64135cbc1ee7fe79519c /build/Makefile
parentc14790e44122781b96b1b287f901c36645d7df7b (diff)
Fuel 8 uplift
Introducing Fuel 8 with associated changes: Improvements in usage of cgroups - they are now bind mounted from the host which solved a Docker-in-Docker problem. The cache tool (cache.mk) has a new argument "getbiweek" which is used by the top Makefile when building the Fuel ISO. This makes sure that there's a fresh build every second week even if the cache is not purged automatically based on its meta data. This is something we should add everywhere (in a separate change set). And obviously, Fuel is now building from stable/8.0 upstream. NOTE! f_repobuild has been disabled for now, it throws an error when run. Will be fixed separately. Change-Id: I7e2ee737fd3bedc75f58539fbc3c5fd1fa08cfa1 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/build/Makefile b/build/Makefile
index 542269617..0ad83bff6 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*
@@ -184,6 +182,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