From 4648d77c60bb20beaff753e92d34affadc086daf Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 8 Jun 2016 17:32:15 +0200 Subject: Rebase: rm p/f/Allow-customizing-fuel-plugin-odl. Upstream change [1] made this patch obsolete. While at it, update related patch context after same change. [1] https://gerrit.opnfv.org/gerrit/#/c/14385/ Change-Id: I21753e4dafdd0ab83c5eac37f394aa704bbe236b Signed-off-by: Alexandru Avadanii --- ...low-customizing-java-and-fuel-mirror-URLs.patch | 7 +++--- ...llow-customizing-fuel-plugin-opendaylight.patch | 26 ---------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch (limited to 'patches') diff --git a/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch index 719ec935..65d0359f 100644 --- a/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch +++ b/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch @@ -11,14 +11,13 @@ diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlp index a5e8a96..e64a05e 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk -@@ -12,6 +12,6 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a - ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" +@@ -12,5 +12,5 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a 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.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz - export ODL_VERSION_NUMBER=0.4.1 + 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 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 diff --git a/patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch deleted file mode 100644 index c47b166c..00000000 --- a/patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Florin Dumitrascu -Date: Thu, 17 Mar 2016 19:37:19 +0100 -Subject: [PATCH] Allow customizing fuel-plugin-opendaylight - -Signed-off-by: Florin Dumitrascu ---- - build/f_isoroot/f_odlpluginbuild/config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk -index e64a05e..bca432c 100644 ---- a/build/f_isoroot/f_odlpluginbuild/config.mk -+++ b/build/f_isoroot/f_odlpluginbuild/config.mk -@@ -7,9 +7,9 @@ - # http://www.apache.org/licenses/LICENSE-2.0 - ############################################################################## - --ODL_BRANCH=brahmaputra-sr2 --ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a --ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" -+ODL_BRANCH:=brahmaputra-sr2 -+ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a -+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 -- cgit 1.2.3-korg