Skip to contentSkip to conversation

wireshark: install missing header files

PATCH Superseded Armin Kuster 2 participants 4 messages Oct 19, 2016 – Oct 25, 2016

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 .../recipes-support/wireshark/wireshark_2.2.1.bb   | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb +19 -3
index a5fb7f6..f7d7927 100644
@@ -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
+}
Signature · 1 line
2.7.4
#1 lore raw
Quoted 13 lines · Armin Kuster

Wireshark does not install header files. add install_append Remove ALLOW_EMPTY & INHIBIT_PACKAGE_DEBUG_SPLIT, they are no longer needed

---
 .../recipes-support/wireshark/wireshark_2.2.1.bb   | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb +0 -0
index a5fb7f6..f7d7927 100644

meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" · line 49

Quoted 9 lines
meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb +2 -3
@@ -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}*"

Why was this removed?

Now there is couple QA errors:

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]

Quoted 25 lines
meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb +17 -0
+	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
+}
Signature · 7 lines
2.7.4

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
In reply to Armin Kuster
Quoted 2 lines · Armin Kuster

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.

Quoted 44 lines
---
 .../recipes-support/wireshark/wireshark_2.2.1.bb   | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb +19 -3
index a5fb7f6..f7d7927 100644
@@ -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
+}
Signature · 7 lines
2.7.4

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#3 lore raw
Quoted 8 lines · Martin Jansa
Quoted 2 lines · Armin Kuster

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.

k, thanks.

Will look in this.
Armin

Quoted 48 lines
Quoted 46 lines
---
  .../recipes-support/wireshark/wireshark_2.2.1.bb   | 22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)
meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb +19 -3
index a5fb7f6..f7d7927 100644
@@ -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
+}
Signature · 7 lines
2.7.4

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel