On Wed, Nov 06, 2013 at 08:48:43PM -0600, zongchun...@freescale.com wrote: > From: Zongchun Yu <zongchun...@freescale.com> > > *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.
Can you update the packagegroup in meta-oe which depends on tcpdump? PACKAGECONFIG or just dropping tcpdump from it is fine with me. > Signed-off-by: Zongchun Yu <zongchun...@freescale.com> > --- > .../0001-minimal-IEEE802.15.4-allowed.patch | 0 > .../tcpdump/tcpdump-4.3.0/configure.patch | 0 > .../tcpdump/tcpdump-4.3.0/ipv6-cross.patch | 0 > .../tcpdump-4.3.0/tcpdump_configure_no_-O2.patch | 0 > .../recipes-support/tcpdump/tcpdump_4.3.0.bb | 0 > .../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 - > 10 files changed, 146 insertions(+), 1 deletion(-) > rename {meta-oe => > meta-networking}/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch > (100%) > rename {meta-oe => > meta-networking}/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch (100%) > rename {meta-oe => > meta-networking}/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch (100%) > rename {meta-oe => > meta-networking}/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch > (100%) > rename {meta-oe => meta-networking}/recipes-support/tcpdump/tcpdump_4.3.0.bb > (100%) > 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 > > diff --git > a/meta-oe/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 > similarity index 100% > rename from > meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch > rename to > meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch > diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch > b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch > similarity index 100% > rename from meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch > rename to > meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch > diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch > b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch > similarity index 100% > rename from meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch > rename to > meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch > diff --git > a/meta-oe/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 > similarity index 100% > rename from > meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch > rename to > meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch > diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb > b/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb > similarity index 100% > rename from meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb > rename to meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb > 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 <zongchun...@freescale.com> > + > +--- 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 <zongchun...@freescale.com> > + > +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 <zongchun...@freescale.com> > + > +--- 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 = "\ > -- > 1.7.9.7 > > -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel