Makefile: Mitaka update. 67/15167/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 31 May 2016 18:45:51 +0000 (20:45 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 4 Jun 2016 16:43:47 +0000 (18:43 +0200)
Remove unnecesary overrides from Makefile.
Switch Armband repo from 8.0 to 9.0, trimming "-fuel" repo URL suffix.
ODL plugin build remains enabled.
All other plugins are currently not built.

Some cleanup is due in the future:

FIXME: Switch to our own JDK later.
FIXME: Remove FUEL_CENTOS_8.0 stuff.

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Makefile

index 333bf5a..f2e5242 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,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) \