X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=19a690d2149850d2c0c52083d99a63073ac55237;hb=7cb304c6b4fb8d84c72851d720f4bb02af6b31ee;hp=d106df2b29767c8aef9bfdd759ad04db141dbd67;hpb=1c049bf03ddff1c0b5d4f89a954bf5effe665b59;p=armband.git diff --git a/Makefile b/Makefile index d106df2b..19a690d2 100644 --- 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 \