From: Alexandru Avadanii Date: Tue, 31 May 2016 20:08:25 +0000 (+0200) Subject: ODL build: Allow customizing JAVA URL X-Git-Tag: colorado.1.rc1~117 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c47a7f7a0198e2ce6ba54cbe485ae87983f785d2;p=fuel.git ODL build: Allow customizing JAVA URL For Armband, JAVA8_URL hardcode needs to be patched outside of the build system, so make related var overrideable. Change-Id: I308074a4ae0c5f8b22e5e5128965ce90fea3734e Signed-off-by: Alexandru Avadanii Signed-off-by: Stanislaw Kardach --- diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index c613af7ae..876998cd9 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -15,7 +15,7 @@ FPB_BRANCH ?= master FPB_CHANGE ?= 82191ca16b40021e445e854fad37c65cd8e70b0c FPB_REPO ?= https://github.com/openstack/fuel-plugins -export USE_JAVA8=true -export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb -export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz -export ODL_VERSION_NUMBER=0.4.2 +export USE_JAVA8?=true +export JAVA8_URL?=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb +export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz +export ODL_VERSION_NUMBER?=0.4.2