From f8f82be193316257a8956266c202333bfc4851da Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Wed, 20 Apr 2016 15:45:31 -0700 Subject: Cleanup patch-export bugs (cherry picked from commit be5864d1622dc080718422b313cf9954b123c3b0) Change-Id: I85fc2afcf51c618f5680b95d596a264d60f16f53 --- .../0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'patches/fuel-plugin-opendaylight') diff --git a/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch index e41275b5..a9a9387f 100644 --- a/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch +++ b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch @@ -12,7 +12,7 @@ https://bugs.opendaylight.org/show_bug.cgi?id=3973 Signed-off-by: Florin Dumitrascu --- - .../modules/opendaylight/files/leveldb-arm64.patch | 36 +++++ + .../modules/opendaylight/files/leveldb-arm64.patch | 35 +++++ .../opendaylight/files/leveldbjni-native.patch | 23 ++++ .../puppet/modules/opendaylight/manifests/init.pp | 8 ++ .../modules/opendaylight/manifests/install.pp | 12 +- @@ -20,14 +20,14 @@ Signed-off-by: Florin Dumitrascu deployment_tasks.yaml | 2 +- odl_package/ubuntu/opendaylight | 4 +- pre_build_hook | 9 +- - 8 files changed, 235 insertions(+), 9 deletions(-) + 8 files changed, 234 insertions(+), 9 deletions(-) create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch create mode 100644 deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch new file mode 100644 -index 0000000..c72efeb +index 0000000..e0824ca --- /dev/null +++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch @@ -0,0 +1,35 @@ @@ -68,7 +68,7 @@ index 0000000..c72efeb + } // namespace port diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch new file mode 100644 -index 0000000..7520205 +index 0000000..08a528b --- /dev/null +++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch @@ -0,0 +1,23 @@ @@ -150,7 +150,7 @@ index 7a3bf3f..f9bba56 100644 } diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp new file mode 100644 -index 0000000..c708611 +index 0000000..c599370 --- /dev/null +++ b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp @@ -0,0 +1,150 @@ -- cgit 1.2.3-korg