[oe] iperf3: refresh local patches to avoid fuzz warnings

Message ID 1522796439-37319-1-git-send-email-denis@denix.org
State New
Headers show
Series
  • [oe] iperf3: refresh local patches to avoid fuzz warnings
Related show

Commit Message

Denys Dmytriyenko April 3, 2018, 11 p.m.
From: Denys Dmytriyenko <denys@ti.com>


Signed-off-by: Denys Dmytriyenko <denys@ti.com>

---
 ...nclude-stdint.h-for-various-std-c99-int-types.patch | 16 +++++++---------
 .../iperf3/0002-Remove-pg-from-profile_CFLAGS.patch    | 12 +++++-------
 .../iperf3/iperf3/automake-foreign.patch               | 18 ++++++++++++++----
 3 files changed, 26 insertions(+), 20 deletions(-)

-- 
2.7.4

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Anuj Mittal April 3, 2018, 11:19 p.m. | #1
On 04/04/2018 07:00 AM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>

> 

> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> ---

>  ...nclude-stdint.h-for-various-std-c99-int-types.patch | 16 +++++++---------

>  .../iperf3/0002-Remove-pg-from-profile_CFLAGS.patch    | 12 +++++-------

>  .../iperf3/iperf3/automake-foreign.patch               | 18 ++++++++++++++----

>  3 files changed, 26 insertions(+), 20 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..3db188f 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

> @@ -1,21 +1,22 @@

> -From be653711fb92d2430b3ecc546b4e3ad927d19ec5 Mon Sep 17 00:00:00 2001

> +From b26687cfe958c6be009717a6267da403cb802197 Mon Sep 17 00:00:00 2001

>  From: Khem Raj <raj.khem@gmail.com>

>  Date: Fri, 14 Jul 2017 12:59:42 -0700

> -Subject: [PATCH 1/2] include stdint.h for various std c99 int types

> +Subject: [PATCH] include stdint.h for various std c99 int types

>  

>  Signed-off-by: Khem Raj <raj.khem@gmail.com>

> +

>  ---

>   src/cjson.h | 2 ++

>   src/timer.h | 1 +

>   2 files changed, 3 insertions(+)

>  

>  diff --git a/src/cjson.h b/src/cjson.h

> -index fb8cd3b..69cd272 100644

> +index fa7cb73..41a41dd 100644

>  --- a/src/cjson.h

>  +++ b/src/cjson.h

> -@@ -23,6 +23,8 @@

> - #ifndef cJSON__h

> - #define cJSON__h

> +@@ -28,6 +28,8 @@

> + #include <stdint.h>

> + #endif

>   

>  +#include <stdint.h>

>  +


This patch should probably be removed now since it's now just adding
stdint.h twice. Upstream has fixed this.
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

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..3db188f 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
@@ -1,21 +1,22 @@ 
-From be653711fb92d2430b3ecc546b4e3ad927d19ec5 Mon Sep 17 00:00:00 2001
+From b26687cfe958c6be009717a6267da403cb802197 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 14 Jul 2017 12:59:42 -0700
-Subject: [PATCH 1/2] include stdint.h for various std c99 int types
+Subject: [PATCH] include stdint.h for various std c99 int types
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  src/cjson.h | 2 ++
  src/timer.h | 1 +
  2 files changed, 3 insertions(+)
 
 diff --git a/src/cjson.h b/src/cjson.h
-index fb8cd3b..69cd272 100644
+index fa7cb73..41a41dd 100644
 --- a/src/cjson.h
 +++ b/src/cjson.h
-@@ -23,6 +23,8 @@
- #ifndef cJSON__h
- #define cJSON__h
+@@ -28,6 +28,8 @@
+ #include <stdint.h>
+ #endif
  
 +#include <stdint.h>
 +
@@ -34,6 +35,3 @@  index 0f9c5eb..0b195be 100644
  
  /* TimerClientData is an opaque value that tags along with a timer.  The
  ** client can use it for whatever, and it gets passed to the callback when
--- 
-2.13.3
-
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch
index 06eb41a..056e7cc 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch
@@ -1,20 +1,21 @@ 
-From 6db0e28f906bc3784019dfb5bb011237a8034fda Mon Sep 17 00:00:00 2001
+From 4ce0f33b25b02b9079d7d9470b6d2d0749255f52 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 14 Jul 2017 13:00:16 -0700
-Subject: [PATCH 2/2] Remove -pg from profile_CFLAGS
+Subject: [PATCH] Remove -pg from profile_CFLAGS
 
 musl fails to link with missing gcrt1.o
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  src/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 23b0c72..6268145 100644
+index 11d763d..c394bef 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -49,9 +49,9 @@ iperf3_LDFLAGS          = -g
+@@ -52,9 +52,9 @@ iperf3_LDFLAGS          = -g
  iperf3_profile_SOURCES  = main.c \
  						  $(libiperf_la_SOURCES)
  
@@ -26,6 +27,3 @@  index 23b0c72..6268145 100644
  
  # Specify the sources and various flags for the test cases
  t_timer_SOURCES         = t_timer.c
--- 
-2.13.3
-
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch
index 06c394e..03f68c9 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch
@@ -1,12 +1,22 @@ 
-Pass the 'foreign' option to automake to enable iperf3 to build.
+From 7135d946ab3da77109dae731ac0e70bff02d3719 Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <b40290@freescale.com>
+Date: Mon, 5 Jan 2015 11:39:45 -0600
+Subject: [PATCH] Pass the 'foreign' option to automake to enable iperf3 to
+ build.
 
 Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Chunrong Guo <b40290@freescale.com>
 
---- a/configure.ac	2015-10-19 02:49:30.471867352 -0500
-+++ b/configure.ac	2015-10-19 02:46:36.207873572 -0500
-@@ -33,7 +33,7 @@
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b988322..a554fcf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,7 +34,7 @@ AC_CONFIG_AUX_DIR(config)
  
  
  # Initialize the automake system