diff options
Diffstat (limited to 'patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch')
| -rw-r--r-- | patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch index d3b25874..10df99a8 100644 --- a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch +++ b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch @@ -3,15 +3,15 @@ Date: Wed, 24 Feb 2016 20:02:25 +0100 Subject: [PATCH] Allow customizing java and fuel-mirror URLs --- - build/f_isoroot/f_odlpluginbuild/Makefile | 2 +- - build/f_isoroot/f_repobuild/Makefile | 3 ++- + build/f_isoroot/f_odlpluginbuild/config.mk | 2 +- + build/f_isoroot/f_repobuild/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index e8afd4a..589adb8 100644 ---- a/build/f_isoroot/f_odlpluginbuild/Makefile -+++ b/build/f_isoroot/f_odlpluginbuild/Makefile -@@ -12,7 +12,7 @@ ODL_BRANCH=brahmaputra-sr2 +diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk +index a94d7e2..4ebf519 100644 +--- a/build/f_isoroot/f_odlpluginbuild/config.mk ++++ b/build/f_isoroot/f_odlpluginbuild/config.mk +@@ -12,6 +12,6 @@ ODL_CHANGE=b876df2345bf8c785dceea74f4c271fdfcc9563c ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" export USE_JAVA8=true @@ -19,7 +19,6 @@ index e8afd4a..589adb8 100644 +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/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz export ODL_VERSION_NUMBER=0.4.1 - .PHONY: all diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index e95dbf2..709ca6b 100644 --- a/build/f_isoroot/f_repobuild/Makefile |