X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=9490f5a98693abf3d525562c9f8045b244f5990a;hb=5569b8a7d32b33bdc0bf47d9d8567192605f15b6;hp=afcaf94180f07530c5d2adbba52a3f5b6b895615;hpb=0f762e556ea7b2393f56ca7fb8e06f66f99880aa;p=armband.git

diff --git a/Makefile b/Makefile
index afcaf941..9490f5a9 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ submodules-init:
 # Cleans any changes made to submodules
 submodules-clean:
 	@git submodule -q foreach \
-		'git checkout -q armband-workbench-root; \
+		'git am --abort; \
+                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'
@@ -61,6 +62,7 @@ build:
 			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 \
 			FUEL_AGENT_COMMIT=HEAD \