From: Zongchun Yu <[email protected]> *mv tcpdump from meta-oe to meta-networking *add tcpreplay - a suite of GPLv3 licensed tools for UNIX operating systems which gives you the ability to use previously captured traffic in libpcap format to test a variety of network devices.
Signed-off-by: Zongchun Yu <[email protected]> --- .../0001-minimal-IEEE802.15.4-allowed.patch | 22 +++++ .../tcpdump/tcpdump-4.3.0/configure.patch | 29 ++++++ .../tcpdump/tcpdump-4.3.0/ipv6-cross.patch | 41 +++++++++ .../tcpdump-4.3.0/tcpdump_configure_no_-O2.patch | 42 +++++++++ .../recipes-support/tcpdump/tcpdump_4.3.0.bb | 43 +++++++++ .../files/tcpreplay-3.4.4-cross-compile.patch | 92 ++++++++++++++++++++ ...ay-3.4.4-fix-unable-to-link-libpcap-issue.patch | 17 ++++ .../files/tcpreplay-3.4.4-no-bfp-support.patch | 15 ++++ .../recipes-support/tcpreplay/tcpreplay_3.4.4.bb | 22 +++++ .../packagegroups/packagegroup-cli-tools.bb | 1 - .../0001-minimal-IEEE802.15.4-allowed.patch | 22 ----- .../tcpdump/tcpdump-4.3.0/configure.patch | 29 ------ .../tcpdump/tcpdump-4.3.0/ipv6-cross.patch | 41 --------- .../tcpdump-4.3.0/tcpdump_configure_no_-O2.patch | 42 --------- meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb | 43 --------- 15 files changed, 323 insertions(+), 178 deletions(-) create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb create mode 100755 meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch create mode 100644 meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch create mode 100644 meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch create mode 100644 meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb delete mode 100644 meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch delete mode 100644 meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch delete mode 100644 meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch delete mode 100644 meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch delete mode 100644 meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch new file mode 100644 index 0000000..9d3d60d --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch @@ -0,0 +1,22 @@ +From: Sergey Lapin <[email protected]> +Date: Wed, 28 Jan 2009 16:34:15 +0300 +Subject: [PATCH] minimal IEEE802.15.4 allowed + +--- + tcpdump.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/tcpdump.c b/tcpdump.c +index 06683af..fbc944c 100644 +--- a/tcpdump.c ++++ b/tcpdump.c +@@ -282,6 +282,9 @@ static struct printer printers[] = { + #ifdef DLT_MFR + { mfr_if_print, DLT_MFR }, + #endif ++#ifdef DLT_IEEE802_15_4 ++ { raw_if_print, DLT_IEEE802_15_4 }, ++#endif + #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) + { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, + #endif diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch new file mode 100644 index 0000000..3697420 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch @@ -0,0 +1,29 @@ +--- + aclocal.m4 | 1 - + configure.in | 1 + + 2 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 40b5866..0c662b0 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -40,7 +40,6 @@ dnl + AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, + [AC_PREREQ(2.50) + AC_BEFORE([$0], [AC_LBL_C_INIT]) +- AC_BEFORE([$0], [AC_PROG_CC]) + AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) + AC_BEFORE([$0], [AC_LBL_DEVEL]) + AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) +diff --git a/configure.in b/configure.in +index 11257c9..7f9591c 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) + AC_PREREQ(2.50) + AC_INIT(tcpdump.c) + ++AC_PROG_CC + AC_CANONICAL_HOST + + AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch new file mode 100644 index 0000000..7eba2c5 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch @@ -0,0 +1,41 @@ +--- + configure.in | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index eb3e5e8..11257c9 100644 +--- a/configure.in ++++ b/configure.in +@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) + ipv6=no + ;; + esac ], +- +- AC_TRY_RUN([ /* AF_INET6 available check */ ++[ ++ if test x"$cross_compiling" != "xyes"; then ++ AC_TRY_RUN([ /* AF_INET6 avalable check */ + #include <sys/types.h> + #include <sys/socket.h> + main() +@@ -201,7 +202,10 @@ main() + ipv6=no], + [ AC_MSG_RESULT(no) + ipv6=no] +-)) ++ ) ++else ++ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) ++fi]) + + ipv6type=unknown + ipv6lib=none +@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then + fi + + +-if test "$ipv6" = "yes"; then ++if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then + # + # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" + # function in libc; there are "ngetaddrinfo()" and diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch new file mode 100644 index 0000000..7929da5 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch @@ -0,0 +1,42 @@ +--- + configure | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index cb51d19..73d51af 100755 +--- a/configure ++++ b/configure +@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="-g" + else + CFLAGS="-g" + fi + else + if test "$GCC" = yes; then +- CFLAGS="-O2" ++ CFLAGS="" + else + CFLAGS= + fi +@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$GCC" = yes ; then + if test "$SHLICC2" = yes ; then + ac_cv_lbl_gcc_vers=2 +- V_CCOPT="-O2" ++ V_CCOPT="" + else + { echo "$as_me:$LINENO: checking gcc version" >&5 + echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } +@@ -2847,7 +2847,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 + echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } + if test $ac_cv_lbl_gcc_vers -gt 1 ; then +- V_CCOPT="-O2" ++ V_CCOPT="" + fi + fi + else diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb new file mode 100644 index 0000000..1da8194 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/"; +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" +SECTION = "console/network" +DEPENDS = "libpcap" + +SRC_URI = " \ + http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ + file://tcpdump_configure_no_-O2.patch \ + file://0001-minimal-IEEE802.15.4-allowed.patch \ + file://ipv6-cross.patch \ + file://configure.patch \ +" +SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8" +SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286" + +inherit autotools +CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" + +EXTRA_OECONF = "--without-crypto --disable-rpath \ + ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" + +EXTRA_AUTORECONF += " -I m4" + +do_configure_prepend() { + mkdir -p ${S}/m4 + if [ -f aclocal.m4 ]; then + mv aclocal.m4 ${S}/m4 + fi + # AC_CHECK_LIB(dlpi.. was looking to host /lib + sed -i 's:-L/lib::g' ./configure.in +} +do_configure_append() { + sed -i 's:-L/usr/lib::' ./Makefile + sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile + sed -i 's:-I/usr/include::' ./Makefile +} + +do_install_append() { + # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 + rm -f ${D}${sbindir}/tcpdump.${PV} +} diff --git a/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch b/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch new file mode 100755 index 0000000..a856b18 --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch @@ -0,0 +1,92 @@ +Uptream-Status: Pending + +Signed-off-by: Zongchun Yu <[email protected]> + +--- a/configure.ac ++++ b/configure.ac +@@ -402,7 +402,6 @@ + + dnl 0.9.6 (which is still thinks it is 0.9.5 due to a bug) introduces an important + dnl fix for OSX. See: http://tcpreplay.synfin.net/trac/ticket/167 +-libpcap_version_096=no + AC_RUN_IFELSE(AC_LANG_PROGRAM([[ + #include <string.h> + #include <stdlib.h> +@@ -419,11 +418,12 @@ + exit(0); + + exit(1); +-]]), [ +- libpcap_version_096=yes +-]) ++]]), ++ [libpcap_version_096=yes], ++ [libpcap_version_096=no], ++ [libpcap_version_096=yes] ++) + +-libpcap_ver8=no + AC_RUN_IFELSE(AC_LANG_PROGRAM([[ + #include <string.h> + #include <stdlib.h> +@@ -444,13 +444,12 @@ + exit(0); + + exit(1); +-]]), [ +- libpcap_ver8=yes +-], [ +- libpcap_ver8=no +-]) ++]]), ++ [libpcap_ver8=yes], ++ [libpcap_ver8=no], ++ [libpcap_ver8=yes] ++) + +-libpcap_ver7=no + AC_RUN_IFELSE(AC_LANG_PROGRAM([[ + #include <string.h> + #include <stdlib.h> +@@ -469,11 +468,11 @@ + exit(0); + + exit(1); +-]]), [ +- libpcap_ver7=yes +-], [ +- libpcap_ver7=no +-]) ++]]), ++ [libpcap_ver7=yes], ++ [libpcap_ver7=no], ++ [libpcap_ver7=yes] ++) + + if test x$libpcap_ver8 = xyes ; then + AC_MSG_RESULT(>= 0.8.0) +@@ -761,8 +760,8 @@ + + have_bpf=no + dnl Check for BSD's BPF +-AC_MSG_CHECKING(for BPF device sending support) +-AC_TRY_RUN([ ++AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf, ++[AC_TRY_RUN([ + #include <stdio.h> + #include <stdlib.h> + #include <sys/types.h> +@@ -796,8 +795,11 @@ + [Do we have BPF device support?]) + AC_MSG_RESULT(yes) + have_bpf=yes +-],[ +- AC_MSG_RESULT(no) ++], ++[AC_MSG_RESULT(no)], ++[AC_MSG_ERROR([cross-compiling, ++ presetting ac_cv_have_bpf=(yes|no) will help])] ++) + ]) + + diff --git a/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch b/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch new file mode 100644 index 0000000..5f36c68 --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch @@ -0,0 +1,17 @@ +Uptream-Status: Pending + +Signed-off-by: Zongchun Yu <[email protected]> + +Index: tcpreplay-3.4.4/configure.ac +=================================================================== +--- tcpreplay-3.4.4.orig/configure.ac ++++ tcpreplay-3.4.4/configure.ac +@@ -389,7 +389,7 @@ CFLAGS="$CFLAGS -I$LPCAPINCDIR" + AC_SEARCH_LIBS([pcap_close], [pcap], + LPCAPLIB="$LIBS", + AC_ERROR([Unable to link libpcap in ${foundpcap}]), +- -lnl) ++ -lnl-3) + + AC_SUBST(LPCAPINC) + AC_SUBST(LPCAPLIB) diff --git a/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch b/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch new file mode 100644 index 0000000..3c11c92 --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch @@ -0,0 +1,15 @@ +Uptream-Status: Pending + +Signed-off-by: Zongchun Yu <[email protected]> + +--- a/configure.ac ++++ b/configure.ac +@@ -758,6 +758,8 @@ + AC_MSG_RESULT(no) + ]) + ++ac_cv_have_bpf=no ++ + have_bpf=no + dnl Check for BSD's BPF + AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf, diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb new file mode 100644 index 0000000..d211888 --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb @@ -0,0 +1,22 @@ +SUMMARY = "Use previously captured traffic to test network devices" + +HOMEPAGE = "http://tcpreplay.synfin.net/"; +SECTION = "console/network" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=c33cccf72cc1603e8a72a84811ae3ac8" + +SRC_URI = "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz \ + file://tcpreplay-3.4.4-cross-compile.patch \ + file://tcpreplay-3.4.4-no-bfp-support.patch \ + file://tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch \ + " +SRC_URI[md5sum] = "22725feb9b2590809f9350308ec65180" +SRC_URI[sha256sum] = "7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f" + +DEPENDS = "libpcap" + +EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" + +inherit siteinfo autotools + diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb index fa53a67..8807fd1 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb @@ -45,7 +45,6 @@ RDEPENDS_${PN}-debug = "\ s3c64xx-gpio \ serial-forward \ strace \ - tcpdump \ " RRECOMMENDS_${PN}-debug = "\ diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch deleted file mode 100644 index 9d3d60d..0000000 --- a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Sergey Lapin <[email protected]> -Date: Wed, 28 Jan 2009 16:34:15 +0300 -Subject: [PATCH] minimal IEEE802.15.4 allowed - ---- - tcpdump.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/tcpdump.c b/tcpdump.c -index 06683af..fbc944c 100644 ---- a/tcpdump.c -+++ b/tcpdump.c -@@ -282,6 +282,9 @@ static struct printer printers[] = { - #ifdef DLT_MFR - { mfr_if_print, DLT_MFR }, - #endif -+#ifdef DLT_IEEE802_15_4 -+ { raw_if_print, DLT_IEEE802_15_4 }, -+#endif - #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) - { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, - #endif diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch deleted file mode 100644 index 3697420..0000000 --- a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - aclocal.m4 | 1 - - configure.in | 1 + - 2 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 40b5866..0c662b0 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -40,7 +40,6 @@ dnl - AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, - [AC_PREREQ(2.50) - AC_BEFORE([$0], [AC_LBL_C_INIT]) -- AC_BEFORE([$0], [AC_PROG_CC]) - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) - AC_BEFORE([$0], [AC_LBL_DEVEL]) - AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) -diff --git a/configure.in b/configure.in -index 11257c9..7f9591c 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) - AC_PREREQ(2.50) - AC_INIT(tcpdump.c) - -+AC_PROG_CC - AC_CANONICAL_HOST - - AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch deleted file mode 100644 index 7eba2c5..0000000 --- a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- - configure.in | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index eb3e5e8..11257c9 100644 ---- a/configure.in -+++ b/configure.in -@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) - ipv6=no - ;; - esac ], -- -- AC_TRY_RUN([ /* AF_INET6 available check */ -+[ -+ if test x"$cross_compiling" != "xyes"; then -+ AC_TRY_RUN([ /* AF_INET6 avalable check */ - #include <sys/types.h> - #include <sys/socket.h> - main() -@@ -201,7 +202,10 @@ main() - ipv6=no], - [ AC_MSG_RESULT(no) - ipv6=no] --)) -+ ) -+else -+ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) -+fi]) - - ipv6type=unknown - ipv6lib=none -@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then - fi - - --if test "$ipv6" = "yes"; then -+if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then - # - # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" - # function in libc; there are "ngetaddrinfo()" and diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch deleted file mode 100644 index 7929da5..0000000 --- a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - configure | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index cb51d19..73d51af 100755 ---- a/configure -+++ b/configure -@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="-g" - else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="" - else - CFLAGS= - fi -@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "$GCC" = yes ; then - if test "$SHLICC2" = yes ; then - ac_cv_lbl_gcc_vers=2 -- V_CCOPT="-O2" -+ V_CCOPT="" - else - { echo "$as_me:$LINENO: checking gcc version" >&5 - echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } -@@ -2847,7 +2847,7 @@ fi - { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 - echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } - if test $ac_cv_lbl_gcc_vers -gt 1 ; then -- V_CCOPT="-O2" -+ V_CCOPT="" - fi - fi - else diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb deleted file mode 100644 index 1da8194..0000000 --- a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/"; -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" -SECTION = "console/network" -DEPENDS = "libpcap" - -SRC_URI = " \ - http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ - file://tcpdump_configure_no_-O2.patch \ - file://0001-minimal-IEEE802.15.4-allowed.patch \ - file://ipv6-cross.patch \ - file://configure.patch \ -" -SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8" -SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286" - -inherit autotools -CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" - -EXTRA_OECONF = "--without-crypto --disable-rpath \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" - -EXTRA_AUTORECONF += " -I m4" - -do_configure_prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi - # AC_CHECK_LIB(dlpi.. was looking to host /lib - sed -i 's:-L/lib::g' ./configure.in -} -do_configure_append() { - sed -i 's:-L/usr/lib::' ./Makefile - sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile - sed -i 's:-I/usr/include::' ./Makefile -} - -do_install_append() { - # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 - rm -f ${D}${sbindir}/tcpdump.${PV} -} -- 1.7.9.7 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
