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/fuel-main_2.patch | |
| 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/fuel-main_2.patch')
| -rw-r--r-- | fuel-build/fuel-main_2.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/fuel-build/fuel-main_2.patch b/fuel-build/fuel-main_2.patch new file mode 100644 index 0000000..0cea655 --- /dev/null +++ b/fuel-build/fuel-main_2.patch @@ -0,0 +1,17 @@ +*** fuel-main/sandbox.mk.orig 2015-02-13 12:12:55.362989171 +0100 +--- fuel-main/sandbox.mk 2015-02-13 14:50:39.103017653 +0100 +*************** +*** 71,77 **** +--- 71,83 ---- + echo "Updating apt package database" + sudo chroot $(SANDBOX_UBUNTU) apt-get update + echo "Installing additional packages: $(SANDBOX_DEB_PKGS)" ++ test -e $(SANDBOX_UBUNTU)/sbin/start.orig || mv $(SANDBOX_UBUNTU)/sbin/start $(SANDBOX_UBUNTU)/sbin/start.orig ++ echo "#!/bin/sh" > $(SANDBOX_UBUNTU)/sbin/start ++ echo "exit 0" >> $(SANDBOX_UBUNTU)/sbin/start ++ chmod 755 $(SANDBOX_UBUNTU)/sbin/start + test -n "$(SANDBOX_DEB_PKGS)" && sudo chroot $(SANDBOX_UBUNTU) apt-get install --yes $(SANDBOX_DEB_PKGS) ++ test -e $(SANDBOX_UBUNTU)/sbin/start.orig && (cp $(SANDBOX_UBUNTU)/sbin/start.orig $(SANDBOX_UBUNTU)/sbin/start; \ ++ rm $(SANDBOX_UBUNTU)/sbin/start.orig) + echo "SANDBOX_UBUNTU_UP: done" + endef |