X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=df14ef68aff16cb3406483766c08da2ae1bc7558;hb=61364d2990e6d2a20c83e316a9f2766c0bba3a74;hp=2dbf769b50aad85eac371fe6b4518120e7196c2e;hpb=8729c530665164205678e18afdbe6706fe93588d;p=armband.git

diff --git a/Makefile b/Makefile
index 2dbf769b..df14ef68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,18 @@
 root:=$(shell pwd)
+include config.mk
 
 all: build
 
+config.mk: submodules-init
+	@ln -s -f ${root}/upstream/fuel/build/config.mk ${root}/config.mk
+
 .PHONY: submodules-init submodules-clean
 submodules-init:
-	@git submodule -q init
-	@git submodule -q sync
-	@git submodule update --remote
+	@if [ ! -d ${root}/upstream/fuel/build ]; then \
+		git submodule -q init; \
+		git submodule -q sync; \
+		git submodule update --remote; \
+	fi
 
 # Cleans any changes made to submodules
 submodules-clean:
@@ -28,6 +34,18 @@ patches-export:
 
 # apply patches from patches/* to respective submodules
 patches-import:
+	@cd ${root}/upstream/fuel-agent && \
+		git checkout -q ${FUEL_AGENT_COMMIT}
+	@cd ${root}/upstream/fuel-astute && \
+		git checkout -q ${ASTUTE_COMMIT}
+	@cd ${root}/upstream/fuel-library && \
+		git checkout -q ${FUELLIB_COMMIT}
+	@cd ${root}/upstream/fuel-mirror && \
+		git checkout -q ${FUEL_MIRROR_COMMIT}
+	@cd ${root}/upstream/fuel-nailgun-agent && \
+		git checkout -q ${FUEL_NAILGUN_AGENT_COMMIT}
+	@cd ${root}/upstream/fuel-web && \
+		git checkout -q ${NAILGUN_COMMIT}
 	@git submodule -q foreach 'mkdir -p ${root}/patches/$$name'
 	@git submodule -q foreach 'git tag armband-workbench-root'
 	@git submodule -q foreach 'git checkout -q -b armband-workbench'
@@ -64,7 +82,7 @@ build:
 		make \
 			BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
 			UBUNTU_ARCH="amd64 arm64" \
-			PRODNO="OPNFV_ARMBAND_FUEL" \
+			PRODNO="OPNFV_A_FUEL" \
 			OPNFV_GIT_SHA=$(shell git rev-parse HEAD) \
 			ASTUTE_REPO=${root}/upstream/fuel-astute \
 			ASTUTE_COMMIT=HEAD \