Rebase after "redo config of plugin build".

Change-Id: If0d4c64742d0984f32c7c68bc903332ceea656e9
(cherry picked from commit 06a429353c0f41083928499589db288ae3275f2a)

diff --git a/Makefile b/Makefile
index afcaf94..7723c72 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ build:
                        QEMU_REPO=${root}/upstream/fuel-plugin-qemu \
                        OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
                        ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
+                       ODL_CHANGE= \
                        FUELLIB_COMMIT=HEAD \
                        NAILGUN_COMMIT=HEAD \
                        FUEL_AGENT_COMMIT=HEAD \

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 d3b2587..10df99a 100644 (file)
--- 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 2bc2d4c..8634687 100644 (file)
--- 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