diff options
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch | 29 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch | 23 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/add-ptest.patch) | 0 | ||||
-rwxr-xr-x | meta-networking/recipes-support/tcpdump/tcpdump/run-ptest (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/run-ptest) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb (renamed from meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb) | 6 |
7 files changed, 2 insertions, 56 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch deleted file mode 100644 index 3697420fd..000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | --- | ||
2 | aclocal.m4 | 1 - | ||
3 | configure.in | 1 + | ||
4 | 2 files changed, 1 insertions(+), 1 deletions(-) | ||
5 | |||
6 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
7 | index 40b5866..0c662b0 100644 | ||
8 | --- a/aclocal.m4 | ||
9 | +++ b/aclocal.m4 | ||
10 | @@ -40,7 +40,6 @@ dnl | ||
11 | AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, | ||
12 | [AC_PREREQ(2.50) | ||
13 | AC_BEFORE([$0], [AC_LBL_C_INIT]) | ||
14 | - AC_BEFORE([$0], [AC_PROG_CC]) | ||
15 | AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) | ||
16 | AC_BEFORE([$0], [AC_LBL_DEVEL]) | ||
17 | AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) | ||
18 | diff --git a/configure.in b/configure.in | ||
19 | index 11257c9..7f9591c 100644 | ||
20 | --- a/configure.in | ||
21 | +++ b/configure.in | ||
22 | @@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) | ||
23 | AC_PREREQ(2.50) | ||
24 | AC_INIT(tcpdump.c) | ||
25 | |||
26 | +AC_PROG_CC | ||
27 | AC_CANONICAL_HOST | ||
28 | |||
29 | AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch deleted file mode 100644 index b414b72e9..000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Fix getaddinfo check when cross compiling | ||
2 | |||
3 | Upstream-Status: Pending. | ||
4 | |||
5 | AC_TRY_RUN defaults to td_cv_buggygetaddrinfo=yes when | ||
6 | cross-compiling. So this change indicates that we | ||
7 | are cross-compiling. | ||
8 | |||
9 | Signed-of-by: Aws Ismail <aws.ismail@windriver.com> | ||
10 | |||
11 | diff --git a/configure.in b/configure.in | ||
12 | index ca277c0..283035e 100644 | ||
13 | --- a/configure.in | ||
14 | +++ b/configure.in | ||
15 | @@ -434,7 +434,7 @@ main() | ||
16 | ], | ||
17 | td_cv_buggygetaddrinfo=no, | ||
18 | td_cv_buggygetaddrinfo=yes, | ||
19 | - td_cv_buggygetaddrinfo=yes)]) | ||
20 | + td_cv_buggygetaddrinfo=cross)]) | ||
21 | if test "$td_cv_buggygetaddrinfo" = no; then | ||
22 | AC_MSG_RESULT(good) | ||
23 | else | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 358f6050f..358f6050f 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/run-ptest b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index c03a8b8ef..c03a8b8ef 100755 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/run-ptest +++ b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch b/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch index 50e2d5439..50e2d5439 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index d7a3ac23b..d7a3ac23b 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb index 1fdaf308d..e01f5fb96 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb | |||
@@ -7,15 +7,13 @@ DEPENDS = "libpcap" | |||
7 | 7 | ||
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | http://www.tcpdump.org/release/${BP}.tar.gz \ | 9 | http://www.tcpdump.org/release/${BP}.tar.gz \ |
10 | file://configure.patch \ | ||
11 | file://unnecessary-to-check-libpcap.patch \ | 10 | file://unnecessary-to-check-libpcap.patch \ |
12 | file://tcpdump-configure-dlpi.patch \ | 11 | file://tcpdump-configure-dlpi.patch \ |
13 | file://tcpdump-cross-getaddrinfo.patch \ | ||
14 | file://add-ptest.patch \ | 12 | file://add-ptest.patch \ |
15 | file://run-ptest \ | 13 | file://run-ptest \ |
16 | " | 14 | " |
17 | SRC_URI[md5sum] = "dab267ec30216a069747d10314079ec7" | 15 | SRC_URI[md5sum] = "58af728de36f499341918fc4b8e827c3" |
18 | SRC_URI[sha256sum] = "4c88c2a9aeb4047074f344fc9b2b6577b219972d359e192f6d12ccf983a13fd7" | 16 | SRC_URI[sha256sum] = "6be520269a89036f99c0b2126713a60965953eab921002b07608ccfc0c47d9af" |
19 | export LIBS=" -lpcap" | 17 | export LIBS=" -lpcap" |
20 | 18 | ||
21 | inherit autotools-brokensep ptest | 19 | inherit autotools-brokensep ptest |