Makefile: Mitaka update.

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index 619d0b7..f2e5242 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ submodules-init:
 submodules-clean:
        @git submodule -q foreach \
                'git am --abort; \
-                git checkout -q armband-workbench-root; \
+               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'
@@ -33,6 +33,7 @@ patches-import:
        @git submodule -q foreach 'git checkout -q -b armband-workbench'
        @git submodule -q foreach \
                'if [ ! -z "$$(ls ${root}/patches/$$name/)" ]; then \
+                       echo "-- patching $$name"; \
                        git am ${root}/patches/$$name/*.patch; \
                fi'
 clean-docker:
@@ -74,10 +75,8 @@ build:
                        FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \
                        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" \
+                       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) \