| Message ID | 20250923154124.2726663-1-archana.polampalli@windriver.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [meta-networking,1/1] tcpreplay: upgrade 4.5.1 -> 4.5.2 | expand |
Can you please also send this patch for the walnascar branch as well, thanks On Wed, Sep 24, 2025 at 3:41 AM Polampalli, Archana via lists.openembedded.org <archana.polampalli=windriver.com@lists.openembedded.org> wrote: > > From: Archana Polampalli <archana.polampalli@windriver.com> > > Changelog: > https://github.com/appneta/tcpreplay/releases/tag/v4.5.2 > > Drop patches that have been merged upstream. > > Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> > --- > .../0001-Fix-linker-error-for-TX_RING.patch | 71 ------------------- > ...mpatible-type-assignment-in-txring.c.patch | 31 -------- > ...{tcpreplay_4.5.1.bb => tcpreplay_4.5.2.bb} | 4 +- > 3 files changed, 1 insertion(+), 105 deletions(-) > delete mode 100644 meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch > delete mode 100644 meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch > rename meta-networking/recipes-support/tcpreplay/{tcpreplay_4.5.1.bb => tcpreplay_4.5.2.bb} (75%) > > diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch > deleted file mode 100644 > index d8f0ab270c..0000000000 > --- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch > +++ /dev/null > @@ -1,71 +0,0 @@ > -From 36e038d9e4047ae42a148f671f18971cc6a68558 Mon Sep 17 00:00:00 2001 > -From: "mark.yang" <mark.yang@lge.com> > -Date: Thu, 10 Apr 2025 18:30:52 +0900 > -Subject: [PATCH] Fix linker error for TX_RING > - > -Found similar issue in gcc 15 build environment. > -- See more details at: http://errors.yoctoproject.org/Errors/Details/851800/ > -``` > -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket': > -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put' > -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf': > -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init' > -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket': > -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put' > -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf': > -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init' > -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket': > -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put' > -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf': > -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init' > -``` > -- The result of "nm -u txring.o" shows no symbols exist. > - > -- The config.h has HAVE_TX_RING defined but txring.c is not aware of it. > - txring.c and txring.h include config.h at the beginning. > - > -- This resulted in a successful build in my build environment. > - > -It may > -Fixes #731 > -Fixes #904 > - > -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924] > -Signed-off-by: mark.yang <mark.yang@lge.com> > ---- > - src/common/txring.c | 3 +++ > - src/common/txring.h | 4 ++-- > - 2 files changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/src/common/txring.c b/src/common/txring.c > -index d5768d75..f522893d 100644 > ---- a/src/common/txring.c > -+++ b/src/common/txring.c > -@@ -31,6 +31,9 @@ > - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - */ > - > -+#include "defines.h" > -+#include "config.h" > -+ > - #ifdef HAVE_TX_RING > - > - #include "txring.h" > -diff --git a/src/common/txring.h b/src/common/txring.h > -index 309da84c..3f14cac0 100644 > ---- a/src/common/txring.h > -+++ b/src/common/txring.h > -@@ -33,11 +33,11 @@ > - > - #pragma once > - > --#ifdef HAVE_TX_RING > -- > - #include "defines.h" > - #include "config.h" > - > -+#ifdef HAVE_TX_RING > -+ > - #if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 > - #include <net/ethernet.h> /* the L2 protocols */ > - #include <netpacket/packet.h> > diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch > deleted file mode 100644 > index 906c30e147..0000000000 > --- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 5615e8f7bbf83f03acacd6d6ba9ff8dc6fdc91df Mon Sep 17 00:00:00 2001 > -From: "mark.yang" <mark.yang@lge.com> > -Date: Thu, 10 Apr 2025 18:49:51 +0900 > -Subject: [PATCH] fix incompatible type assignment in txring.c > - > -* There is an incompatible type assignment error in txring.c. > - txring.c:200:12: error: incompatible types when assigning to type 'txring_t' {aka 'struct txring_s'} from type 'txring_t *' {aka 'struct txring_s *'} > - 200 | *txp = (txring_t *)safe_malloc(sizeof(txring_t)); > - | ^ > - > - txp is allocated as txring_t *, so I fixed it. > - > -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924] > -Signed-off-by: mark.yang <mark.yang@lge.com> > ---- > - src/common/txring.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/common/txring.c b/src/common/txring.c > -index f522893d..b062dac2 100644 > ---- a/src/common/txring.c > -+++ b/src/common/txring.c > -@@ -197,7 +197,7 @@ txring_init(int fd, unsigned int mtu) > - txring_t *txp; > - > - /* allocate memory for structure and fill it with different stuff*/ > -- *txp = (txring_t *)safe_malloc(sizeof(txring_t)); > -+ txp = (txring_t *)safe_malloc(sizeof(txring_t)); > - txp->treq = (struct tpacket_req *)safe_malloc(sizeof(struct tpacket_req)); > - > - txring_mkreq(txp->treq, mtu); > diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.2.bb > similarity index 75% > rename from meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb > rename to meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.2.bb > index 46e06a928e..96a7087b0b 100644 > --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb > +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.2.bb > @@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" > > SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ > file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ > - file://0001-Fix-linker-error-for-TX_RING.patch \ > - file://0002-fix-incompatible-type-assignment-in-txring.c.patch \ > " > > -SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85" > +SRC_URI[sha256sum] = "ccff3bb29469a04ccc20ed0b518e3e43c4a7b5a876339d9435bfd9db7fe5d0f1" > > UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" > > -- > 2.40.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#119716): https://lists.openembedded.org/g/openembedded-devel/message/119716 > Mute This Topic: https://lists.openembedded.org/mt/115396111/3619737 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ankur.tyagi85@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch deleted file mode 100644 index d8f0ab270c..0000000000 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 36e038d9e4047ae42a148f671f18971cc6a68558 Mon Sep 17 00:00:00 2001 -From: "mark.yang" <mark.yang@lge.com> -Date: Thu, 10 Apr 2025 18:30:52 +0900 -Subject: [PATCH] Fix linker error for TX_RING - -Found similar issue in gcc 15 build environment. -- See more details at: http://errors.yoctoproject.org/Errors/Details/851800/ -``` -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket': -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put' -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf': -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init' -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket': -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put' -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf': -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init' -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket': -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put' -TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf': -/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init' -``` -- The result of "nm -u txring.o" shows no symbols exist. - -- The config.h has HAVE_TX_RING defined but txring.c is not aware of it. - txring.c and txring.h include config.h at the beginning. - -- This resulted in a successful build in my build environment. - -It may -Fixes #731 -Fixes #904 - -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924] -Signed-off-by: mark.yang <mark.yang@lge.com> ---- - src/common/txring.c | 3 +++ - src/common/txring.h | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/common/txring.c b/src/common/txring.c -index d5768d75..f522893d 100644 ---- a/src/common/txring.c -+++ b/src/common/txring.c -@@ -31,6 +31,9 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include "defines.h" -+#include "config.h" -+ - #ifdef HAVE_TX_RING - - #include "txring.h" -diff --git a/src/common/txring.h b/src/common/txring.h -index 309da84c..3f14cac0 100644 ---- a/src/common/txring.h -+++ b/src/common/txring.h -@@ -33,11 +33,11 @@ - - #pragma once - --#ifdef HAVE_TX_RING -- - #include "defines.h" - #include "config.h" - -+#ifdef HAVE_TX_RING -+ - #if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 - #include <net/ethernet.h> /* the L2 protocols */ - #include <netpacket/packet.h> diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch deleted file mode 100644 index 906c30e147..0000000000 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5615e8f7bbf83f03acacd6d6ba9ff8dc6fdc91df Mon Sep 17 00:00:00 2001 -From: "mark.yang" <mark.yang@lge.com> -Date: Thu, 10 Apr 2025 18:49:51 +0900 -Subject: [PATCH] fix incompatible type assignment in txring.c - -* There is an incompatible type assignment error in txring.c. - txring.c:200:12: error: incompatible types when assigning to type 'txring_t' {aka 'struct txring_s'} from type 'txring_t *' {aka 'struct txring_s *'} - 200 | *txp = (txring_t *)safe_malloc(sizeof(txring_t)); - | ^ - - txp is allocated as txring_t *, so I fixed it. - -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924] -Signed-off-by: mark.yang <mark.yang@lge.com> ---- - src/common/txring.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/txring.c b/src/common/txring.c -index f522893d..b062dac2 100644 ---- a/src/common/txring.c -+++ b/src/common/txring.c -@@ -197,7 +197,7 @@ txring_init(int fd, unsigned int mtu) - txring_t *txp; - - /* allocate memory for structure and fill it with different stuff*/ -- *txp = (txring_t *)safe_malloc(sizeof(txring_t)); -+ txp = (txring_t *)safe_malloc(sizeof(txring_t)); - txp->treq = (struct tpacket_req *)safe_malloc(sizeof(struct tpacket_req)); - - txring_mkreq(txp->treq, mtu); diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.2.bb similarity index 75% rename from meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb rename to meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.2.bb index 46e06a928e..96a7087b0b 100644 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.2.bb @@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ - file://0001-Fix-linker-error-for-TX_RING.patch \ - file://0002-fix-incompatible-type-assignment-in-txring.c.patch \ " -SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85" +SRC_URI[sha256sum] = "ccff3bb29469a04ccc20ed0b518e3e43c4a7b5a876339d9435bfd9db7fe5d0f1" UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases"