Merge "submodule: fuel-plugin-ovs."

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index d106df2..19a690d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,6 @@ 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 \
@@ -73,13 +71,14 @@ build:
                        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 \
                        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 \