All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH] iperf3: refresh patch
@ 2018-03-23  7:08 Hains van den Bosch
  0 siblings, 0 replies; only message in thread
From: Hains van den Bosch @ 2018-03-23  7:08 UTC (permalink / raw)
  To: openembedded-devel

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

Patch for cjson.h already applied in version 3.2.

Signed-off-by: Hains van den Bosch <hainsvdbosch@ziggo.nl>
---
 ...001-include-stdint.h-for-various-std-c99-int-types.patch | 13 -------------
 1 file changed, 13 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 ae3620800..bcc32e253 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
@@ -9,19 +9,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  src/timer.h | 1 +
  2 files changed, 3 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
-- 
2.15.1



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-03-23  7:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-23  7:08 [meta-oe][PATCH] iperf3: refresh patch Hains van den Bosch

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.