diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-08-12 21:17:09 +0200 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-08-13 09:26:16 +0000 |
| commit | 54f52c1c01ba4543c8b82c5478b3deeed972f90f (patch) | |
| tree | 258efb99410988df25e4bc7d543077a1c3dbcb32 /fuel/build/Makefile | |
| parent | 6d190f937d095a71578550bc3bb4a70f0905e594 (diff) | |
Needed rebase after fuel dev-ops changes
Patch needed after updated fuel devops repo key change
Reference: https://github.com/stackforge/fuel-main/commit/82e77c7f476a23220f44b74c7f32fc04a7189a4e#diff-9d30c16c74e663e5cdb1dc7d9189ed2d
Patch needed after updated fuel devops python package versions
Reference: https://github.com/stackforge/fuel-main/commit/a765460d3fd69089e3b4d2b3a6b55e28e6fb53eb
Rebased site.pp
Change-Id: I138b383b0d57091a81f98acae3b6e7af6a189632
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit 82b3389ae1907b04c1d57a8ce87708726b00277a)
Diffstat (limited to 'fuel/build/Makefile')
| -rw-r--r-- | fuel/build/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fuel/build/Makefile b/fuel/build/Makefile index 5f63120..d3afe83 100644 --- a/fuel/build/Makefile +++ b/fuel/build/Makefile @@ -88,6 +88,14 @@ $(ISOCACHE): # 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 + # 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 + # Temporary patch for pidlockfile which was earlier part of python-daemon + # but in later pyhon versions is part of python-lockfile. This patch has + # not yet been backported to fuel 6.0 + cd /tmp/fuel-main/utils && patch -p0 < $(TOPDIR)/fuel-main_4.patch + # Remove Docker optimizations, otherwise multistrap will fail during # Fuel build. sudo rm -f /etc/apt/apt.conf.d/docker* |