X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2FMakefile;h=ba4beaf390120fdc2c5f09c6070e53ae8c7ef0c2;hb=563547b4a9f44090f32c0e17d040114854563760;hp=086839dd13f818fc84f99bf5a19ed502892a7b41;hpb=5d4a36b80fcd0b69e35e4d4f59cfb64a62453c28;p=genesis.git

diff --git a/fuel/build/Makefile b/fuel/build/Makefile
index 086839d..ba4beaf 100644
--- a/fuel/build/Makefile
+++ b/fuel/build/Makefile
@@ -85,6 +85,15 @@ $(ISOCACHE):
 	sudo rm -f /etc/apt/apt.conf.d/docker*
 	#
 	cd /tmp/fuel-main && ./prepare-build-env.sh
+	cd /tmp/fuel-main && make repos
+	# Patch for speeding up image creation in virtual environments,
+	# https://review.openstack.org/#/c/197943/
+	cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-agent_1.patch
+	cd /tmp/fuel-main/build/repos/nailgun && git config --global user.email "build$opnfv.org"
+	cd /tmp/fuel-main/build/repos/nailgun && git config --global user.name "OPNFV build"
+	cd /tmp/fuel-main/build/repos/nailgun && git add -u .
+	cd /tmp/fuel-main/build/repos/nailgun && git commit -m "Added patch"
+	#
 	cd /tmp/fuel-main && make iso
 	mv /tmp/fuel-main/build/artifacts/fuel*.iso .
 
@@ -108,10 +117,6 @@ $(SUBDIRS):
 patch-packages:
 	ORIGISO=$(ISOCACHE) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
 
-.PHONY: prepare
-prepare:
-	#$(MAKE) -C opendaylight -f Makefile setup
-
 .PHONY: build-clean $(SUBCLEAN)
 build-clean: $(SUBCLEAN)
 	$(MAKE) -C patch-packages -f Makefile clean
@@ -120,9 +125,8 @@ build-clean: $(SUBCLEAN)
 	@rm -f $(NEWISO)
 
 .PHONY: clean $(SUBCLEAN)
-clean:  clean-cache prepare $(SUBCLEAN)
+clean:  clean-cache $(SUBCLEAN)
 	$(MAKE) -C patch-packages -f Makefile clean
-	#$(MAKE) -C opendaylight -f Makefile clean
 	@rm -f *.iso
 	@rm -Rf release
 	@rm -Rf newiso
@@ -135,7 +139,7 @@ $(SUBCLEAN): %.clean:
 # Todo: Make things smarter - we shouldn't need to clean everything
 # betwen make invocations.
 .PHONY: iso
-iso:	prepare build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
+iso:	build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
 	install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
 	@printf "\n\nProduct ISO is $(NEWISO)\n\n"