diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-12 16:44:20 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:26:41 +0000 |
| commit | 42f2a34e30c9ba10115dfbc5680fd712b9c0d0d4 (patch) | |
| tree | 8313945b56f570b983d2fcc68609555455918ae9 /patches | |
| parent | 41f9cc5ef28f0f67bb9ccba4d32d96cf71c860a2 (diff) | |
Rebase after "redo config of plugin build".
Change-Id: If0d4c64742d0984f32c7c68bc903332ceea656e9
(cherry picked from commit 06a429353c0f41083928499589db288ae3275f2a)
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch | 15 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch | 18 |
2 files changed, 17 insertions, 16 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 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 2bc2d4c7..8634687f 100644 --- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch +++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch @@ -4,20 +4,22 @@ Subject: [PATCH] Allow customizing fuel-plugin-opendaylight Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com> --- - build/f_isoroot/f_odlpluginbuild/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + build/f_isoroot/f_odlpluginbuild/config.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index 589adb8..0486416 100644 ---- a/build/f_isoroot/f_odlpluginbuild/Makefile -+++ b/build/f_isoroot/f_odlpluginbuild/Makefile -@@ -8,8 +8,8 @@ +diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk +index 4ebf519..86d7b76 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 ############################################################################## - TOP := $(shell pwd) -ODL_BRANCH=brahmaputra-sr2 +-ODL_CHANGE=b876df2345bf8c785dceea74f4c271fdfcc9563c -ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" +ODL_BRANCH:=brahmaputra-sr2 ++ODL_CHANGE:=b876df2345bf8c785dceea74f4c271fdfcc9563c +ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git" export USE_JAVA8=true |