X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2FMakefile;h=4acf5e201ce547f1fc096726dcd45ae0b3a35d1d;hb=e65ed372ee84b1f634ec24002fb7bfd7d48fd7e7;hp=5f631200b3d2a870eb88dc8de98ed2d8526c6192;hpb=c8e03977c194a1581515981aa6fbf4bae45f1be8;p=genesis.git

diff --git a/fuel/build/Makefile b/fuel/build/Makefile
index 5f63120..4acf5e2 100644
--- a/fuel/build/Makefile
+++ b/fuel/build/Makefile
@@ -42,8 +42,6 @@ SUBDIRS += f_osnaily
 SUBDIRS += f_l23network
 SUBDIRS += f_resolvconf
 SUBDIRS += f_ntp
-SUBDIRS += f_odl_docker
-#SUBDIRS += f_odl
 
 # f_example is only an example of how to generate a .deb package and
 # should not be enabled in official builds.
@@ -63,7 +61,6 @@ 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
 
@@ -88,6 +85,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*
@@ -120,10 +125,6 @@ patch-packages:
 prepare:
 	#$(MAKE) -C opendaylight -f Makefile setup
 
-.PHONY: odl
-odl:
-	#$(MAKE) -C opendaylight -f Makefile
-
 .PHONY: build-clean $(SUBCLEAN)
 build-clean: $(SUBCLEAN)
 	$(MAKE) -C patch-packages -f Makefile clean
@@ -138,7 +139,6 @@ clean:  clean-cache prepare $(SUBCLEAN)
 	@rm -f *.iso
 	@rm -Rf release
 	@rm -Rf newiso
-	@rm -f f_odl
 	@rm -f $(NEWISO)
 	@rm -f $(BUILD_BASE)/.versions
 
@@ -148,6 +148,6 @@ $(SUBCLEAN): %.clean:
 # Todo: Make things smarter - we shouldn't need to clean everything
 # betwen make invocations.
 .PHONY: iso
-iso:	prepare build-clean odl $(ISOCACHE) $(SUBDIRS) patch-packages
+iso:	prepare build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
 	install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
 	@printf "\n\nProduct ISO is $(NEWISO)\n\n"