[oe] [meta-networking][V2]PATCH] wireshark: install missing header files
Martin Jansa
martin.jansa at gmail.com
Tue Nov 1 18:04:18 UTC 2016
On Sun, Oct 30, 2016 at 08:57:46PM -0700, Armin Kuster wrote:
> Wireshark does not install header files. add install_append
> Remove ALLOW_EMPTY & INHIBIT_PACKAGE_DEBUG_SPLIT, they are no longer needed
>
> V2]
> add missing libssh and sbc config
>
> Signed-off-by: Armin Kuster <akuster808 at gmail.com>
> ---
> .../recipes-support/wireshark/wireshark_2.2.1.bb | 28 ++++++++++++++++++----
> 1 file changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb b/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb
> index a5fb7f6..4e23bae 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb
> @@ -4,7 +4,7 @@ SECTION = "net"
> LICENSE = "GPL-2.0"
> LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
>
> -DEPENDS = "pcre expat glib-2.0 sbc"
> +DEPENDS = "pcre expat glib-2.0"
>
> SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2"
>
> @@ -37,13 +37,33 @@ PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua"
> PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib"
> PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip"
> PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no"
> +PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc"
> +
> +PACKAGECONFIG[libssh] = "--with-ssh=yes, --with-ssh=no, libssh2"
> +
>
> # these next two options require addional layers
> PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares"
>
> EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark"
>
> -ALLOW_EMPTY_${PN} = "1"
> -INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
> +# Currently wireshark does not install header files
> +do_install_append () {
> +
> + install -d ${D}/${includedir}/${BPN}
> + install -d ${D}/${includedir}/${BPN}/epan
> + install -d ${D}/${includedir}/${BPN}/epan/crypt
> + install -d ${D}/${includedir}/${BPN}/epan/dfilter
> + install -d ${D}/${includedir}/${BPN}/epan/dissectors
> + install -d ${D}/${includedir}/${BPN}/epan/ftypes
> + install -d ${D}/${includedir}/${BPN}/epan/wmem
>
> -FILES_${PN} += "${datadir}*"
Doesn't this still cause many unpackaged files and QA errors as reported
earlier?
> + install config.h ${D}/${includedir}/${BPN}
> + install ${S}/register.h ${D}/${includedir}/${BPN}
> + install -D ${S}/epan/*.h ${D}/${includedir}/${BPN}/epan
> + install -D ${S}/epan/crypt/*.h ${D}/${includedir}/${BPN}/epan/crypt
> + install -D ${S}/epan/dfilter/*.h ${D}/${includedir}/${BPN}/epan/dfilter
> + install -D ${S}/epan/dissectors/*.h ${D}/${includedir}/${BPN}/epan/dissectors
> + install -D ${S}/epan/ftypes/*.h ${D}/${includedir}/${BPN}/epan/ftypes
> + install -D ${S}/epan/wmem/*.h ${D}/${includedir}/${BPN}/epan/wmem
> +}
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20161101/898acf56/attachment-0002.sig>
More information about the Openembedded-devel
mailing list