diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-10-07 11:17:10 +0200 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-11-18 13:42:40 +0100 |
| commit | 4a6b1e8352731902fb9596176a510f4e24d7e965 (patch) | |
| tree | f945a647c9c084282bcd63d2c40ad8e836cec92e /fuel/build/Makefile | |
| parent | 27c12b01000ddaa12a57b3383c717fac65417db4 (diff) | |
EXPERIMENTAL; DO NOT MERGE! Fuel 7.0 rebase
This is work in progress, do not merge but feel free to experiment
with this commit changeset as a base.
Change-Id: Ifbe1db9c892a94e64abbcfaaf1c98abce0c03dd4
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Conflicts:
fuel/build/config.mk
Diffstat (limited to 'fuel/build/Makefile')
| -rw-r--r-- | fuel/build/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fuel/build/Makefile b/fuel/build/Makefile index 80ef8ea51..6e7041dc0 100644 --- a/fuel/build/Makefile +++ b/fuel/build/Makefile @@ -18,7 +18,7 @@ SHELL = /bin/bash # BEGIN of variables to customize # #Input args -export ISOSRC = file:$(shell pwd)/fuel-6.1.iso +export ISOSRC = file:$(shell pwd)/fuel-7.0.iso export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC)) export PRODNO = "OPNFV_BGS" export REVSTATE = "P0000" @@ -77,9 +77,6 @@ $(ISOCACHE): @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 - # Temporary patch to accomodate for new Ubuntu trusty devops keys not yet - # backported to fuel 6.0 or 6.1 - cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_3.patch # 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 |