Merge "Rebase after "Bugfix Broadcast Group"."

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index afcaf94..9490f5a 100644 (file)
--- 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 \