Merge "Rebase: p/fuel-agent: Update UEFI after ec71a42."

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index f954a61..619d0b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,34 +54,31 @@ endif
 
 build:
        cd ${root}/upstream/fuel/build && \
-               time make \
+               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 \
-                       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 \
+                       ASTUTE_COMMIT=HEAD \
                        FUEL_AGENT_COMMIT=HEAD \
                        FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \
-                       QEMU_BRANCH=HEAD \
-                       OVSNFV_DPDK_BRANCH=armband-workbench \
                        ODL_BRANCH=armband-workbench \
                        PRODUCT_VERSION=8.0 \
                        PRODUCT_NAME=mos \
                        CENTOS_MAJOR=7 \
                        EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/armband/x86_64,10" \
-                       MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
-                       LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
+                       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 \
                        $(EXTRA_PARAMS) \
                        iso 2>&1 | tee ${root}/build.log