X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2FMakefile;h=d3afe83bb94cd130f7c103dc4c0adb1749405b71;hb=54f52c1c01ba4543c8b82c5478b3deeed972f90f;hp=5f631200b3d2a870eb88dc8de98ed2d8526c6192;hpb=6d190f937d095a71578550bc3bb4a70f0905e594;p=genesis.git

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*