diff options
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch | 13 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch | 19 |
2 files changed, 17 insertions, 15 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 196cec7f2..b71435a04 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 | 1 | From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001 |
2 | From: "Hongjun.Yang" <hongjun.yang@windriver.com> | 2 | From: "Hongjun.Yang" <hongjun.yang@windriver.com> |
3 | Date: Wed, 22 Oct 2014 10:02:48 +0800 | 3 | Date: Wed, 22 Oct 2014 10:02:48 +0800 |
4 | Subject: [PATCH] Add ptest for tcpdump | 4 | Subject: [PATCH] Add ptest for tcpdump |
@@ -6,15 +6,16 @@ Subject: [PATCH] Add ptest for tcpdump | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> | 8 | Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> |
9 | |||
9 | --- | 10 | --- |
10 | Makefile.in | 10 +++++++++- | 11 | Makefile.in | 10 +++++++++- |
11 | 1 file changed, 9 insertions(+), 1 deletion(-) | 12 | 1 file changed, 9 insertions(+), 1 deletion(-) |
12 | 13 | ||
13 | Index: tcpdump-4.9.0/Makefile.in | 14 | diff --git a/Makefile.in b/Makefile.in |
14 | =================================================================== | 15 | index 0941f0e..3ce40c6 100644 |
15 | --- tcpdump-4.9.0.orig/Makefile.in | 16 | --- a/Makefile.in |
16 | +++ tcpdump-4.9.0/Makefile.in | 17 | +++ b/Makefile.in |
17 | @@ -436,9 +436,17 @@ distclean: | 18 | @@ -437,9 +437,17 @@ distclean: |
18 | tests/failure-outputs.txt | 19 | tests/failure-outputs.txt |
19 | rm -rf autom4te.cache tests/DIFF tests/NEW | 20 | rm -rf autom4te.cache tests/DIFF tests/NEW |
20 | 21 | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index d7a3ac23b..8cefadf28 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | unnecessary to check libpcap | 1 | From 741d77e42fc4af49804f7ee43b7237e01633cbcd Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | ||
3 | Date: Tue, 8 Jul 2014 13:20:47 +0800 | ||
4 | Subject: [PATCH] unnecessary to check libpcap | ||
2 | 5 | ||
3 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
4 | 7 | ||
@@ -11,23 +14,21 @@ In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to | |||
11 | check if libpcap existed. | 14 | check if libpcap existed. |
12 | 15 | ||
13 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 16 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
17 | |||
14 | --- | 18 | --- |
15 | configure.in | 2 +- | 19 | configure.in | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 21 | ||
18 | diff --git a/configure.in b/configure.in | 22 | diff --git a/configure.in b/configure.in |
19 | index 06fade1..9125de7 100644 | 23 | index b2305a5..b3b5dbf 100644 |
20 | --- a/configure.in | 24 | --- a/configure.in |
21 | +++ b/configure.in | 25 | +++ b/configure.in |
22 | @@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, | 26 | @@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber. |
23 | dnl AC_CHECK_LIB(z, uncompress) | 27 | AC_SEARCH_LIBS(getrpcbynumber, nsl, |
24 | dnl AC_CHECK_HEADERS(zlib.h) | 28 | AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) |
25 | 29 | ||
26 | -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) | 30 | -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) |
27 | +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) | 31 | +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) |
28 | 32 | ||
29 | # | 33 | # |
30 | # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate | 34 | # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate |
31 | -- | ||
32 | 1.7.9.5 | ||
33 | |||