diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-04-07 10:50:42 +0200 |
|---|---|---|
| committer | Stanislaw Kardach <kda@semihalf.com> | 2016-04-07 10:50:42 +0200 |
| commit | 47546677064ce3108123c4fcd6cb98bae16eccbc (patch) | |
| tree | 3505e4beec4c6b4020027b9f2d4e00462faca2de /patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch | |
| parent | 1de27fd674ab66a08e393582c65c3eccb295583a (diff) | |
Rebase after Fuel update
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 | 8 |
1 files changed, 4 insertions, 4 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 410aa19d..d3b25874 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 @@ -8,17 +8,17 @@ Subject: [PATCH] Allow customizing java and fuel-mirror URLs 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index 5287ca8..3ecf680 100644 +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-release +@@ -12,7 +12,7 @@ ODL_BRANCH=brahmaputra-sr2 ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" 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 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.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz - + 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 |