Updated armband

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index e01517d..df14ef6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,18 @@
 root:=$(shell pwd)
+include config.mk
 
 all: build
 
+config.mk: submodules-init
+       @ln -s -f ${root}/upstream/fuel/build/config.mk ${root}/config.mk
+
 .PHONY: submodules-init submodules-clean
 submodules-init:
-       @git submodule -q init
-       @git submodule -q sync
-       @git submodule update --remote
+       @if [ ! -d ${root}/upstream/fuel/build ]; then \
+               git submodule -q init; \
+               git submodule -q sync; \
+               git submodule update --remote; \
+       fi
 
 # Cleans any changes made to submodules
 submodules-clean:
@@ -28,6 +34,18 @@ patches-export:
 
 # apply patches from patches/* to respective submodules
 patches-import:
+       @cd ${root}/upstream/fuel-agent && \
+               git checkout -q ${FUEL_AGENT_COMMIT}
+       @cd ${root}/upstream/fuel-astute && \
+               git checkout -q ${ASTUTE_COMMIT}
+       @cd ${root}/upstream/fuel-library && \
+               git checkout -q ${FUELLIB_COMMIT}
+       @cd ${root}/upstream/fuel-mirror && \
+               git checkout -q ${FUEL_MIRROR_COMMIT}
+       @cd ${root}/upstream/fuel-nailgun-agent && \
+               git checkout -q ${FUEL_NAILGUN_AGENT_COMMIT}
+       @cd ${root}/upstream/fuel-web && \
+               git checkout -q ${NAILGUN_COMMIT}
        @git submodule -q foreach 'mkdir -p ${root}/patches/$$name'
        @git submodule -q foreach 'git tag armband-workbench-root'
        @git submodule -q foreach 'git checkout -q -b armband-workbench'
@@ -62,23 +80,28 @@ endif
 build:
        cd ${root}/upstream/fuel/build && \
                make \
-                       BUILD_FUEL_PLUGINS=f_odlpluginbuild \
+                       BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
                        UBUNTU_ARCH="amd64 arm64" \
-                       FUELLIB_REPO=${root}/upstream/fuel-library \
+                       PRODNO="OPNFV_A_FUEL" \
+                       OPNFV_GIT_SHA=$(shell git rev-parse HEAD) \
+                       ASTUTE_REPO=${root}/upstream/fuel-astute \
+                       ASTUTE_COMMIT=HEAD \
                        NAILGUN_REPO=${root}/upstream/fuel-web \
+                       NAILGUN_COMMIT=HEAD \
                        FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
+                       FUEL_AGENT_COMMIT=HEAD \
                        FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \
+                       FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
+                       FUEL_MIRROR_COMMIT=HEAD \
+                       FUELLIB_REPO=${root}/upstream/fuel-library \
+                       FUELLIB_COMMIT=HEAD \
                        ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
+                       ODL_BRANCH=armband-workbench \
                        ODL_CHANGE= \
+                       OPNFV_QUAGGE_PACKAGING_REPO="https://github.com/alexandruavadanii/opnfv-quagga-packaging" \
                        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 \
                        VSPERF_REPO=${root}/upstream/vswitchperf \
                        VSPERF_BRANCH=armband-workbench \
                        VSPERF_CHANGE= \
@@ -87,7 +110,6 @@ build:
                        YARDSTICK_CHANGE= \
                        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 \
                        $(EXTRA_PARAMS) \
                        iso 2>&1 | tee ${root}/build.log