build.sh: do not use readlink for unexisting dir

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index afcaf94..e58fe0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ submodules-init:
 # Cleans any changes made to submodules
 submodules-clean:
        @git submodule -q foreach \
-               'git checkout -q armband-workbench-root; \
+               'git am --abort; \
+                git checkout -q armband-workbench-root; \
                git branch -q -D armband-workbench; \
                git tag -d armband-workbench-root; \
                git reset -q --hard HEAD; git clean -xdff'
@@ -57,13 +58,16 @@ build:
                        FUELLIB_REPO=${root}/upstream/fuel-library \
                        NAILGUN_REPO=${root}/upstream/fuel-web \
                        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 \
                        FUEL_AGENT_COMMIT=HEAD \
+                       FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \
                        QEMU_BRANCH=HEAD \
                        OVSNFV_DPDK_BRANCH=armband-workbench \
@@ -71,7 +75,7 @@ build:
                        PRODUCT_VERSION=8.0 \
                        PRODUCT_NAME=mos \
                        CENTOS_MAJOR=7 \
-                       MIRROR_FUEL=http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/os/x86_64/ \
+                       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/ \
                        JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \