Merge "submodule: fuel-plugin-ovs."

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index f2e5242..19a690d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ all: build
 submodules-init:
        @git submodule -q init
        @git submodule -q sync
-       @git submodule update
+       @git submodule update --remote
 
 # Cleans any changes made to submodules
 submodules-clean:
@@ -37,9 +37,15 @@ patches-import:
                        git am ${root}/patches/$$name/*.patch; \
                fi'
 clean-docker:
-       docker stop FUEL_CENTOS_8.0 || true
-       docker rm $(shell docker ps -a -q) || true
-       docker rmi -f $(shell docker images -q) || true
+       @if [ -d ${root}/upstream/fuel/build ]; then \
+               sudo make -C ${root}/upstream/fuel/build deepclean; \
+       fi
+       @for container in $(shell sudo docker ps -a -q); do \
+               sudo docker rm -f -v $${container}; \
+       done
+       @for image in $(shell sudo docker images -q); do \
+               sudo docker rmi -f $${image}; \
+       done
 
 clean-build:
        sudo rm -rf /tmp/fuel-main
@@ -57,25 +63,22 @@ build:
        cd ${root}/upstream/fuel/build && \
                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 \
                        ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
                        ODL_CHANGE= \
+                       OVS_NSH_DPDK_REPO=${root}/upstream/fuel-plugin-ovs \
+                       OVS_NSH_DPDK_BRANCH=HEAD \
                        FUELLIB_COMMIT=HEAD \
                        NAILGUN_COMMIT=HEAD \
-                       ASTUTE_COMMIT=HEAD \
                        FUEL_AGENT_COMMIT=HEAD \
                        FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \
                        ODL_BRANCH=armband-workbench \
-                       CENTOS_MAJOR=7 \
                        EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/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 \