X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=333bf5a5c5047a8508479261f6e3c7c3977d6a89;hb=70f2caa773fc5f0e2b1154a5c095665375f02666;hp=9490f5a98693abf3d525562c9f8045b244f5990a;hpb=fa47cae0599281bf3ae3c8d7b4816b22d39e3583;p=armband.git

diff --git a/Makefile b/Makefile
index 9490f5a9..333bf5a5 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ submodules-init:
 submodules-clean:
 	@git submodule -q foreach \
 		'git am --abort; \
-                git checkout -q armband-workbench-root; \
+		git checkout -q armband-workbench-root; \
 		git branch -q -D armband-workbench; \
 		git tag -d armband-workbench-root; \
 		git reset -q --hard HEAD; git clean -xdff'
@@ -33,12 +33,13 @@ patches-import:
 	@git submodule -q foreach 'git checkout -q -b armband-workbench'
 	@git submodule -q foreach \
 		'if [ ! -z "$$(ls ${root}/patches/$$name/)" ]; then \
+			echo "-- patching $$name"; \
 			git am ${root}/patches/$$name/*.patch; \
 		fi'
 clean-docker:
 	docker stop FUEL_CENTOS_8.0 || true
-	docker rm $(docker ps -a -q) || true
-	docker rmi -f $(docker images -q) || true
+	docker rm $(shell docker ps -a -q) || true
+	docker rmi -f $(shell docker images -q) || true
 
 clean-build:
 	sudo rm -rf /tmp/fuel-main
@@ -48,34 +49,38 @@ clean-build:
 release: export LC_ALL=en_US.UTF-8
 release: submodules-clean clean-docker clean-build submodules-init patches-import build
 
+ifneq ($(REVSTATE),)
+    EXTRA_PARAMS="REVSTATE=$(REVSTATE)"
+endif
+
 build:
 	cd ${root}/upstream/fuel/build && \
-		time make \
+		make \
 			BUILD_FUEL_PLUGINS=f_odlpluginbuild \
 			FUEL_MAIN_REPO=${root}/upstream/fuel-main \
 			FUEL_MAIN_TAG= \
 			UBUNTU_ARCH="amd64 arm64" \
 			FUELLIB_REPO=${root}/upstream/fuel-library \
 			NAILGUN_REPO=${root}/upstream/fuel-web \
+			ASTUTE_REPO=${root}/upstream/fuel-astute \
 			FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
+			FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \
 			FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
-			QEMU_REPO=${root}/upstream/fuel-plugin-qemu \
-			OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
 			ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
 			ODL_CHANGE= \
 			FUELLIB_COMMIT=HEAD \
 			NAILGUN_COMMIT=HEAD \
+			ASTUTE_COMMIT=HEAD \
 			FUEL_AGENT_COMMIT=HEAD \
+			FUEL_NAILGUN_AGENT_COMMIT=HEAD \
 			FUEL_MIRROR_COMMIT=HEAD \
-			QEMU_BRANCH=HEAD \
-			OVSNFV_DPDK_BRANCH=armband-workbench \
 			ODL_BRANCH=armband-workbench \
 			PRODUCT_VERSION=8.0 \
 			PRODUCT_NAME=mos \
 			CENTOS_MAJOR=7 \
-			MIRROR_FUEL=http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/os/x86_64/ \
-			MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
-			LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
+			EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/armband/x86_64,10" \
+			MIRROR_MOS_UBUNTU=linux.enea.com \
 			JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \
+			$(EXTRA_PARAMS) \
 			iso 2>&1 | tee ${root}/build.log