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/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch | |
| parent | 41f9cc5ef28f0f67bb9ccba4d32d96cf71c860a2 (diff) | |
Rebase after "redo config of plugin build".
Change-Id: If0d4c64742d0984f32c7c68bc903332ceea656e9
(cherry picked from commit 06a429353c0f41083928499589db288ae3275f2a)
Diffstat (limited to 'patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch | 18 |
1 files changed, 10 insertions, 8 deletions
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 |