Updates docs for SR1 with final revision

[genesis.git] / fuel / build / Makefile

diff --git a/fuel/build/Makefile b/fuel/build/Makefile
index 284f519..ba4beaf 100644 (file)
--- a/fuel/build/Makefile
+++ b/fuel/build/Makefile
@@ -15,7 +15,7 @@ SHELL = /bin/bash
 #Input args
 export UNIT_TEST = FALSE
 export INTERACTIVE = TRUE
-export ISOSRC = file:$(shell pwd)/fuel-6.0.1.iso
+export ISOSRC = file:$(shell pwd)/fuel-6.1.iso
 export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
 export PRODNO = "OPNFV_BGS"
 export REVSTATE = "P0000"
@@ -37,12 +37,6 @@ export TOPDIR := $(shell pwd)
 #Build subclasses
 
 SUBDIRS := f_isoroot
-SUBDIRS += f_opnfv_puppet
-SUBDIRS += f_osnaily
-SUBDIRS += f_l23network
-SUBDIRS += f_resolvconf
-SUBDIRS += f_ntp
-SUBDIRS += f_odl_docker
 
 # f_example is only an example of how to generate a .deb package and
 # should not be enabled in official builds.
@@ -62,7 +56,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
 
@@ -82,24 +75,25 @@ $(ISOCACHE):
        @echo "fuel" `git -C /tmp/fuel-main show | grep commit | head -1 | cut -d " " -f2` >> $(VERSION_FILE)
        # Setup cgroups for docker-in-docker
        sudo /root/enable_dockerx2
-       # Patch to fix race condition when doing "Docker-in-Docker" build
-       cd /tmp/fuel-main && patch -p1 < $(TOPDIR)/fuel-main_1.patch
-       # 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
-
+       # Patch for adding dosfstools, as Fuel 6.1 is running mkfs.vfat
+       cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_5.patch
        # Remove Docker optimizations, otherwise multistrap will fail during
        # Fuel build.
        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 .
 
@@ -123,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
@@ -135,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
@@ -150,6 +139,12 @@ $(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"
+
+# Start a bash shell in docker for Makefile debugging
+.PHONY: debug
+debug:
+       @docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1)
+       docker/runcontext $(DOCKERIMG) bash