[oe] [meta-networking][V2]PATCH] wireshark: install missing header files
akuster808
akuster808 at gmail.com
Fri Nov 4 05:49:16 UTC 2016
On 11/03/2016 02:38 PM, Martin Jansa wrote:
> On Tue, Nov 01, 2016 at 07:04:18PM +0100, Martin Jansa wrote:
>> 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?
> It does and sbc issue is still there as well:
dang it. ok. v3 is in order.
- armin
>
> wireshark-2.2.1: wireshark: Files/directories were installed but not
> shipped in any package:
> /usr/share/mime
> /usr/share/appdata
> /usr/share/icons
> /usr/share/mime/packages
> /usr/share/mime/packages/wireshark.xml
> /usr/share/appdata/wireshark.appdata.xml
> /usr/share/icons/hicolor
> /usr/share/icons/hicolor/16x16
> /usr/share/icons/hicolor/24x24
> /usr/share/icons/hicolor/32x32
> /usr/share/icons/hicolor/48x48
> /usr/share/icons/hicolor/64x64
> /usr/share/icons/hicolor/128x128
> /usr/share/icons/hicolor/256x256
> /usr/share/icons/hicolor/scalable
> /usr/share/icons/hicolor/16x16/apps
> /usr/share/icons/hicolor/16x16/mimetypes
> /usr/share/icons/hicolor/16x16/apps/wireshark.png
> /usr/share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
> /usr/share/icons/hicolor/24x24/apps
> /usr/share/icons/hicolor/24x24/mimetypes
> /usr/share/icons/hicolor/24x24/apps/wireshark.png
> /usr/share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
> /usr/share/icons/hicolor/32x32/apps
> /usr/share/icons/hicolor/32x32/mimetypes
> /usr/share/icons/hicolor/32x32/apps/wireshark.png
> /usr/share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png
> /usr/share/icons/hicolor/48x48/apps
> /usr/share/icons/hicolor/48x48/mimetypes
> /usr/share/icons/hicolor/48x48/apps/wireshark.png
> /usr/share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png
> /usr/share/icons/hicolor/64x64/apps
> /usr/share/icons/hicolor/64x64/mimetypes
> /usr/share/icons/hicolor/64x64/apps/wireshark.png
> /usr/share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
> /usr/share/icons/hicolor/128x128/apps
> /usr/share/icons/hicolor/128x128/mimetypes
> /usr/share/icons/hicolor/128x128/apps/wireshark.png
> /usr/share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
> /usr/share/icons/hicolor/256x256/apps
> /usr/share/icons/hicolor/256x256/mimetypes
> /usr/share/icons/hicolor/256x256/apps/wireshark.png
> /usr/share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
> /usr/share/icons/hicolor/scalable/apps
> /usr/share/icons/hicolor/scalable/apps/wireshark.svg
> Please set FILES such that these items are packaged. Alternatively if
> they are unneeded, avoid installing them or delete them within
> do_install.
> wireshark: 45 installed and not shipped files. [installed-vs-shipped]
> wireshark-2.2.1: wireshark rdepends on sbc, but it isn't a build
> dependency, missing sbc in DEPENDS or PACKAGECONFIG? [build-deps]
>
>>> + 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
>
>
More information about the Openembedded-devel
mailing list