Needed rebase after fuel dev-ops changes

[genesis.git] / fuel / build / Makefile

diff --git a/fuel/build/Makefile b/fuel/build/Makefile
index 364fe31..d3afe83 100644 (file)
--- a/fuel/build/Makefile
+++ b/fuel/build/Makefile
@@ -27,6 +27,7 @@ export NEWISO = $(shell pwd)/release/opnfv-${REVSTATE}.iso
 #Build variables
 export BUILD_BASE := $(shell pwd)
 export DEB_DEST := $(BUILD_BASE)/release/packages/ubuntu/pool/main
+export UDEB_DEST := $(BUILD_BASE)/release/packages/ubuntu/pool/debian-installer
 export PUPPET_DEST := $(BUILD_BASE)/release/puppet/modules
 export CACHE_DIR := $(BUILD_BASE)/cache
 export VERSION_FILE := $(BUILD_BASE)/.versions
@@ -62,6 +63,7 @@ all:
        @echo "Versions of cached build results built by" $(shell hostname) "at" $(shell date -u) > $(VERSION_FILE)
        @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 docker
        @docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso
 
@@ -86,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*
@@ -107,7 +117,7 @@ umount-origiso:
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS):
-       @mkdir -p release/packages/ubuntu/pool/main release/puppet/modules release/isoroot
+       @mkdir -p release/packages/ubuntu/pool/main release/packages/ubuntu/pool/debian-installer release/puppet/modules release/isoroot
        $(MAKE) -C $@ -f Makefile release
 
 .PHONY: patch-packages