X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2FMakefile~;fp=fuel-build%2FMakefile;h=7f16a28c4cacc0039f6e2b44aa6b5fdb056b7ec7;hb=6cb518c68eb136ad448e96716ef8b1348440949f;hp=eb37b4dd9876173de1c852769d82898011ee3ff4;hpb=1e106bbaca2780c10bd02b4e5fa3702d36acdf39;p=genesis.git

diff --git a/fuel-build/Makefile b/fuel/build/Makefile~
similarity index 70%
rename from fuel-build/Makefile
rename to fuel/build/Makefile~
index eb37b4d..7f16a28 100644
--- a/fuel-build/Makefile
+++ b/fuel/build/Makefile~
@@ -12,18 +12,25 @@
 # BEGIN of variables to customize
 #
 SHELL = /bin/bash
+
+include config.mk
+
+export BUILD_BASE = $(shell pwd)
+export DEB_DEST := $(BUILD_BASE)/release/packages/ubuntu/pool/main
+export PUPPET_DEST := $(BUILD_BASE)/release/puppet/modules
+
 ISOSRC = file:$(shell pwd)/fuel-6.0.1.iso
 ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
-PRODUCT_NAME = "OPNFV_BGS"
-VERSION = "P0000"
-NEWISO = $(shell pwd)/release/opnfv-${VERSION}.iso
+PRODNO = "OPNFV_BGS"
+REVSTATE = "P0000"
+NEWISO = $(shell pwd)/release/opnfv-${REVSTATE}.iso
 DOCKERIMG = opnfv.org/ubuntu-builder:14.04
-# Note! Invoke with "make VERSION=RXXXX iso" to make release build!
+# Note! Invoke with "make REVSTATE=RXXXX iso" to make release build!
 # Invoke with ICOCACHE=/full/path/to/iso if cached ISO is in non-standard location.
 #
 # END of variables to customize
 #############################################################################
-TOPDIR := $(shell pwd)
+export TOPDIR := $(shell pwd)
 ORIGDIR := $(TOPDIR)/origiso
 
 SUBDIRS := f_isoroot
@@ -32,6 +39,19 @@ SUBDIRS += f_osnaily
 SUBDIRS += f_l23network
 SUBDIRS += f_resolvconf
 SUBDIRS += f_ntp
+SUBDIRS += f_gif
+SUBDIRS += f_libnss
+SUBDIRS += f_libpcs
+SUBDIRS += f_libxt
+SUBDIRS += f_comm_java
+SUBDIRS += f_ca_cert
+SUBDIRS += f_atk_wrap
+SUBDIRS += f_jre_head
+SUBDIRS += f_jre
+SUBDIRS += f_java
+SUBDIRS += f_odl
+
+
 
 # f_example is only an example of how to generate a .deb package and
 # should not be enabled in official builds.
@@ -47,8 +67,8 @@ all:
 
 $(ISOCACHE):
 	# Clone Fuel to non-persistent location and build
-	cd /tmp && git clone https://github.com/stackforge/fuel-main
-	cd /tmp/fuel-main && git checkout stable/6.0
+	cd /tmp && git clone $(FUEL_MAIN_REPO)
+	cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
 	# Setup cgroups for docker-in-docker
 	sudo /root/enable_dockerx2
 	# Patch to fix race condition when doing "Docker-in-Docker" build
@@ -82,13 +102,31 @@ $(SUBDIRS):
 
 .PHONY: patch-packages
 patch-packages:
-	ORIGISO=$(ISOCACHE) VERSION=$(VERSION) $(MAKE) -C $@ -f Makefile release
+	ORIGISO=$(ISOCACHE) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
+
+.PHONY: prepare
+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
+	@rm -Rf release
+	@rm -Rf newiso
+	@rm -f $(NEWISO)
 
 .PHONY: clean $(SUBCLEAN)
-clean: $(SUBCLEAN)
+clean: prepare $(SUBCLEAN)
 	$(MAKE) -C patch-packages -f Makefile clean
+	$(MAKE) -C opendaylight -f Makefile clean
+	@rm -f *.iso
 	@rm -Rf release
 	@rm -Rf newiso
+	@rm -f f_odl
 	@rm -f $(NEWISO)
 
 $(SUBCLEAN): %.clean:
@@ -97,6 +135,6 @@ $(SUBCLEAN): %.clean:
 # Todo: Make things smarter - we shouldn't need to clean everything
 # betwen make invocations.
 .PHONY: iso
-iso:	clean $(ISOCACHE) $(SUBDIRS) patch-packages
-	install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODUCT_NAME) $(VERSION)
+iso:	prepare build-clean odl $(ISOCACHE) $(SUBDIRS) patch-packages
+	install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
 	@printf "\n\nProduct ISO is $(NEWISO)\n\n"