diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-02-13 17:09:52 +0100 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-02-17 16:22:42 +0100 |
| commit | ec0606c650706be7444370128624924a3dd1767e (patch) | |
| tree | c36e86482c38d119bd8a06301af47fb09bc3494a /fuel-build/Makefile | |
| parent | 41048f09b545b34ff1ed398b1dd76aad48a98718 (diff) | |
Update of Fuel based build system to Fuel 6.0.1
Rebase of the build system to build Fuel from the stable/6.0 branch
which currently creates Fuel 6.0.1. The Fuel baseline thus becomes:
- OpenStack Juno
- Ubuntu 12.04.4
- CentOS 6.5
An additional patch is added to the Fuel build system to enable
a newer version of Fuel to be built under Docker (as the Ubuntu
sandbox chroot is installing atd, where the post install expects
upstart to be running which is not the case in the build container).
Rebase of patches on top of Fuel to support 6.0.1.
Change-Id: I2e884d27e1533be8d60c071a7ea9db998a4f5fea
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'fuel-build/Makefile')
| -rw-r--r-- | fuel-build/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fuel-build/Makefile b/fuel-build/Makefile index 98b108c..eb37b4d 100644 --- a/fuel-build/Makefile +++ b/fuel-build/Makefile @@ -12,7 +12,7 @@ # BEGIN of variables to customize # SHELL = /bin/bash -ISOSRC = file:$(shell pwd)/fuel-5.1.1.iso +ISOSRC = file:$(shell pwd)/fuel-6.0.1.iso ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC)) PRODUCT_NAME = "OPNFV_BGS" VERSION = "P0000" @@ -40,7 +40,7 @@ SUBDIRS += f_ntp SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) .PHONY: all -all: +all: @docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1) @make -C docker @docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso @@ -48,11 +48,14 @@ all: $(ISOCACHE): # Clone Fuel to non-persistent location and build cd /tmp && git clone https://github.com/stackforge/fuel-main - cd /tmp/fuel-main && git checkout 5.1.1 + cd /tmp/fuel-main && git checkout stable/6.0 # Setup cgroups for docker-in-docker sudo /root/enable_dockerx2 # Patch to fix race condition when doing "Docker-in-Docker" build - cd /tmp/fuel-main && patch -p1 < $(TOPDIR)/fuel-main.patches + cd /tmp/fuel-main && patch -p1 < $(TOPDIR)/fuel-main_1.patch + # Patch to make the sandbox chroot in Fuel succeed with package + # installation in a Docker build + cd /tmp/fuel-main && patch -p1 < $(TOPDIR)/fuel-main_2.patch # Remove Docker optimizations, otherwise multistrap will fail during # Fuel build. sudo rm -f /etc/apt/apt.conf.d/docker* |