1 files changed, 19 insertions, 9 deletions

diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
index f8ff354fe1..c46de4b963 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
+++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
@@ -1,6 +1,6 @@
-From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001
-From: "Hongjun.Yang" <hongjun.yang@windriver.com>
-Date: Wed, 2 Oct 2019 16:57:06 -0400
+From 5f0f70192b0e20336e642b02ca9662ba2fef66cf Mon Sep 17 00:00:00 2001
+From: Yi Fan Yu <yifan.yu@windriver.com>
+Date: Fri, 19 Feb 2021 15:21:18 -0500
 Subject: [PATCH] Add ptest for tcpdump
 
 Upstream-Status: Pending
@@ -8,15 +8,21 @@ Upstream-Status: Pending
 Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com>
 Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
 
+remove perl script not required by ptest causing QA problems
+
+reference upstream issue/commit:
+https://github.com/the-tcpdump-group/tcpdump/issues/26
+
+Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
 ---
- Makefile.in | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ Makefile.in | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 3b589184..7b10e38c 100644
+index ea1ef1d0..e7987bd8 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -437,9 +437,17 @@ distclean:
+@@ -445,9 +445,18 @@ distclean:
             tests/failure-outputs.txt
         rm -rf autom4te.cache tests/DIFF tests/NEW
  
@@ -24,14 +30,18 @@ index 3b589184..7b10e38c 100644
 +buildtest-TESTS: tcpdump
 +
 +runtest-PTEST:
-        (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh )
+        $(srcdir)/tests/TESTrun
  
 +install-ptest:
 +       cp -r tests                     $(DESTDIR)
++       rm $(DESTDIR)/tests/setkey2esp-secrets.pl
 +       cp -r config.h                  $(DESTDIR)
 +       install -m 0755 Makefile        $(DESTDIR)
-+       ln -sf /usr/sbin/tcpdump        $(DESTDIR)/tcpdump
++       ln -s /usr/bin/tcpdump          $(DESTDIR)/tcpdump
 +
  extags: $(TAGFILES)
         ctags $(TAGFILES)
  
+-- 
+2.29.2
+