On Sun, Jul 20, 2014 at 01:21:25PM -0700, Armin Kuster wrote: > Inital wireshark support on gtk+ > Added gtk3. > Cleaned up PACKAGECONFIG options > README with additional info
RP submitted few fixes for this change, can you please check wireshark in master-next and send just follow-up patch or comment on fixes RP did? Thanks > > Signed-off-by: Armin Kuster <akus...@mvista.com> > --- > meta-networking/recipes-support/wireshark/README | 37 +++++++++++++++++++ > .../wireshark/wireshark_1.12.0-rc2.bb | 42 > ++++++++++++++++++++++ > 2 files changed, 79 insertions(+) > create mode 100644 meta-networking/recipes-support/wireshark/README > create mode 100644 > meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb > > diff --git a/meta-networking/recipes-support/wireshark/README > b/meta-networking/recipes-support/wireshark/README > new file mode 100644 > index 0000000..0e0c526 > --- /dev/null > +++ b/meta-networking/recipes-support/wireshark/README > @@ -0,0 +1,37 @@ > +# > +Wireshark - Notes > + > +URL: http://www.wireshark.org/ > +User Guide: http://www.wireshark.org/docs/wsug_html_chunked/ > +Secruity advisories: http://www.wireshark.org/security/ > + > +Wireshark is slowly moving away from gtk and towards QT as their graphical > stack. > +Currently gtk is supported with this release and I plan on integrating QT. > + > + > + > +Adding the wireshark to your build > +======================================== > + > +via local.conf > +IMAGE_INSTALL_append = " wireshark" > + > +Adding the wireshark to your graphical build > +======================================== > +via local.conf > +EXTRA_IMAGE_FEATURES += "x11-base" > + > +or use the "core-image-x11" > + > + > +Maintenance > +----------- > + > +Send patches, comments or questions to > openembedded-devel@lists.openembedded.org > + > +When sending single patches, please using something like: > +'git send-email -1 --to openembedded-devel@lists.openembedded.org --cc > akus...@mvista.com --subject-prefix=meta-security][PATCH' > + > +Maintainer: Armin Kuster <akus...@mvista.com> > + > + > diff --git > a/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb > b/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb > new file mode 100644 > index 0000000..6860419 > --- /dev/null > +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb > @@ -0,0 +1,42 @@ > +DESCRIPTION = "wireshark - a popular network protocol analyzer" > +HOMEPAGE = "http://www.wireshark.org" > +SECTION = "network" > +LICENSE = "GPL-2.0" > + > +DEPENDS = "perl-native libpcap pcre expat glib-2.0 libsmi" > + > +inherit autotools > + > +ARM_INSTRUCTION_SET = "arm" > + > +# Works with either gtk+ or gtk3. > +WHICH_GTK = "gtk3" > + > +PACKAGECONFIG ??= "gnutls gcrypt" > +PACKAGECONFIG += " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", > "${WHICH_GTK} graphics", "", d)}" > + > +PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", > "", d)}" > + > +PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+" > +PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3" > +PACKAGECONFIG[graphics] = "--enable-wireshark, --disable-wireshark," > +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," > +PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" > +PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" > + > +EXTRA_OECONF = "--with-qt=no --enable-usr-local=no -enable-tshark" > + > +LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" > +SRC_URI = > "http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0-rc2.tar.bz2 > " > + > +SRC_URI[md5sum] = "dc1149073066a29f91116c168558262e" > +SRC_URI[sha256sum]= > "31009bb450126e9b12808267419f31016d14e6fde7b5e39c85ad37459908cffb" > + > +do_configure_prepend() { > + # force to use fallback > + sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags > +} > + > +ALLOW_EMPTY_${PN} = "1" > +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" > + > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- 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