mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

wireshark: install missing header files

Browse Source 
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>
This commit is contained in:
Armin Kuster
2016-11-05 11:00:36 -07:00
committed by Joe MacDonald
parent 294d7126ff
commit 7f8915a6ec
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb
+26 -5
View File
@@ -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}*"