From: Alexandru Avadanii Date: Tue, 31 May 2016 18:45:51 +0000 (+0200) Subject: Makefile: Mitaka update. X-Git-Tag: colorado.1.rc1~430 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F15167%2F1;p=armband.git Makefile: Mitaka update. 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 --- diff --git a/Makefile b/Makefile index 333bf5a5..f2e52424 100644 --- 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) \