diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2016-11-05 11:00:36 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2016-11-29 08:22:21 -0800 |
| commit | 24c9c2b253c2e6533bd81505df1586b1cb8289a8 (patch) | |
| tree | dfe54527a99f9f66eb5d5d1b36f981e81af29110 /meta-networking | |
| parent | b840fceeb6fd225edbc5de937159df07211740db (diff) | |
| download | meta-openembedded-contrib-24c9c2b253c2e6533bd81505df1586b1cb8289a8.tar.gz | |
wireshark: install missing header files
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
V3]
restore removed FILES append and fixed missing sbc in PACKAGECONFIG
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
(cherry picked from commit 7f8915a6ecdd5c4b03c7e5b5f1fa903f89c2d560)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb | 31 |
1 files changed, 26 insertions, 5 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 a5fb7f69b0..a8f61fead2 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" @@ -16,8 +16,7 @@ inherit autotools pkgconfig perlnative ARM_INSTRUCTION_SET = "arm" - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap" +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" #PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" @@ -37,13 +36,35 @@ 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 + + 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 +} FILES_${PN} += "${datadir}*" |