Needed rebase after fuel dev-ops changes

[genesis.git] / fuel / build / Makefile

diff --git a/fuel/build/Makefile b/fuel/build/Makefile
index 6c98ed9..d3afe83 100644 (file)
--- a/fuel/build/Makefile
+++ b/fuel/build/Makefile
@@ -43,7 +43,6 @@ SUBDIRS += f_l23network
 SUBDIRS += f_resolvconf
 SUBDIRS += f_ntp
 SUBDIRS += f_odl_docker
-SUBDIRS += f_lith_odl_docker
 #SUBDIRS += f_odl
 
 # f_example is only an example of how to generate a .deb package and
@@ -65,7 +64,6 @@ all:
        @echo "cache.mk" $(shell md5sum $(BUILD_BASE)/cache.mk | cut -f1 -d " ") >> $(VERSION_FILE)
        @echo "config.mk" $(shell md5sum $(BUILD_BASE)/config.mk | cut -f1 -d " ") >> $(VERSION_FILE)
        $(MAKE) -C f_odl_docker -f Makefile all
-       $(MAKE) -C f_lith_odl_docker -f Makefile all
        @make -C docker
        @docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso
 
@@ -90,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*