[oe] [meta-networking][PATCH] wireshark: install missing header files

Martin Jansa martin.jansa at gmail.com
Tue Oct 25 13:33:34 UTC 2016


On Tue, Oct 18, 2016 at 05:28:45PM -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

There is also:
wireshark-2.2.1: wireshark rdepends on libssh, but it isn't a build
dependency, missing libssh in DEPENDS or PACKAGECONFIG? [build-deps]

Probably not caused by this change, but one of previous 2 upgrades.


> Signed-off-by: Armin Kuster <akuster808 at gmail.com>
> ---
>  .../recipes-support/wireshark/wireshark_2.2.1.bb   | 22 +++++++++++++++++++---
>  1 file changed, 19 insertions(+), 3 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..f7d7927 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb
> @@ -43,7 +43,23 @@ 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 () {
>  
> -FILES_${PN} += "${datadir}*"
> +	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
> +
> +	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/20161025/ad741aec/attachment-0002.sig>


More information about the Openembedded-devel mailing list