[oe-commits] [meta-openembedded] 57/91: iperf3: refresh patch

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.

commit d3832d38a30055c448caffcde2391ba9c82ffe86
Author: Hains van den Bosch <hainsvdbosch at ziggo.nl>
AuthorDate: Fri Mar 23 08:54:24 2018 +0100

    iperf3: refresh patch
    
    WARNING: iperf3-3.2-r0 do_patch:
    Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
    The context lines in the patches can be updated with devtool:
    
        devtool modify <recipe>
        devtool finish --force-patch-refresh <recipe> <layer_path>
    
    Then the updated patches and the source tree (in devtool's workspace)
    should be reviewed to make sure the patches apply in the correct place
    and don't introduce duplicate lines (which can, and does happen
    when some of the context is ignored). Further information:
    http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
    https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
    Details:
    Applying patch 0001-include-stdint.h-for-various-std-c99-int-types.patch
    patching file src/cjson.h
    Hunk #1 succeeded at 28 with fuzz 2 (offset 5 lines).
    patching file src/timer.h
    
    Now at patch 0001-include-stdint.h-for-various-std-c99-int-types.patch
    
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 ...-include-stdint.h-for-various-std-c99-int-types.patch | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch
index ae36208..599ee1d 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch
@@ -5,23 +5,9 @@ Subject: [PATCH 1/2] include stdint.h for various std c99 int types
 
 Signed-off-by: Khem Raj <raj.khem at gmail.com>
 ---
- src/cjson.h | 2 ++
  src/timer.h | 1 +
- 2 files changed, 3 insertions(+)
+ 1 file changed, 1 insertions(+)
 
-diff --git a/src/cjson.h b/src/cjson.h
-index fb8cd3b..69cd272 100644
---- a/src/cjson.h
-+++ b/src/cjson.h
-@@ -23,6 +23,8 @@
- #ifndef cJSON__h
- #define cJSON__h
- 
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C"
- {
 diff --git a/src/timer.h b/src/timer.h
 index 0f9c5eb..0b195be 100644
 --- a/src/timer.h

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.