diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-04-07 10:50:42 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:22:23 +0000 |
| commit | d8451852f403bc1a820452478328bdb7d7d2fa47 (patch) | |
| tree | 43afa0eb9de2812ec574db0b8edf60561d24a65f | |
| parent | d12f7200df2887d40fd8102668f7b8b2eaf88a29 (diff) | |
Rebase after Fuel update
(cherry picked from commit 47546677064ce3108123c4fcd6cb98bae16eccbc)
Change-Id: I27439774905f670591ef7e1a5d1c134333a2c5fb
| -rw-r--r-- | patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch | 8 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch | 6 |
2 files changed, 7 insertions, 7 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 diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch index 61ba7e3c..2bc2d4c7 100644 --- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch +++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch @@ -8,16 +8,16 @@ Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index 3ecf680..b0449d0 100644 +index 589adb8..0486416 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -8,8 +8,8 @@ ############################################################################## TOP := $(shell pwd) --ODL_BRANCH=brahmaputra-release +-ODL_BRANCH=brahmaputra-sr2 -ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" -+ODL_BRANCH:=brahmaputra-release ++ODL_BRANCH:=brahmaputra-sr2 +ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git" export USE_JAVA8=true |