[oe] [meta-networking][PATCH v2] wireshark: upgrade to 3.0.0

Mon Mar 11 04:35:09 UTC 2019

On Sun, Mar 10, 2019 at 7:47 AM akuster808 <akuster808 at gmail.com> wrote:
>
>
>
> On 3/9/19 10:00 PM, Khem Raj wrote:
> > Hi Oleksandr
> >
> > I merged v1, can you rebase this on top of master and send the delta in
> > v3?
> Why this patch was taken when there was an objection and the issues did
> not get addresses?
>

patchwork fooled me into reapplying v1 instead of v2, somehow it did
not obsolete it.

> - armin
> >
> > On Sat, Mar 9, 2019 at 6:19 AM Oleksandr Kravchuk
> > <open.source at oleksandr-kravchuk.com> wrote:
> >> From: Oleksandr Kravchuk <open.source at oleksandr-kravchuk.com>
> >>
> >> Signed-off-by: Oleksandr Kravchuk <open.source at oleksandr-kravchuk.com>
> >> ---
> >>  .../0001-Add-libm-to-link-for-fmod-API.patch  | 29 -------------------
> >>  ...{wireshark_2.6.6.bb => wireshark_3.0.0.bb} | 21 +++-----------
> >>  2 files changed, 4 insertions(+), 46 deletions(-)
> >>  delete mode 100644 meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch
> >>  rename meta-networking/recipes-support/wireshark/{wireshark_2.6.6.bb => wireshark_3.0.0.bb} (71%)
> >>
> >> diff --git a/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch b/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch
> >> deleted file mode 100644
> >> index e65ef9b10..000000000
> >> --- a/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch
> >> +++ /dev/null
> >> @@ -1,29 +0,0 @@
> >> -From 1a6a5d2bcb1adec9ba138c2ebee7bbc994620aff Mon Sep 17 00:00:00 2001
> >> -From: Khem Raj <raj.khem at gmail.com>
> >> -Date: Tue, 12 Jun 2018 23:23:44 -0700
> >> -Subject: [PATCH] Add libm to link for fmod() API
> >> -
> >> -fixes
> >> -ld: CMakeFiles/tshark.dir/ui/cli/tap-comparestat.c.o: undefined reference to symbol 'fmod@@GLIBC_2.2.5'
> >> -| /mnt/a/oe/build/tmp/work/core2-64-bec-linux/wireshark/1_2.6.1-r0/recipe-sysroot/lib/libm.so.6: error adding symbols: DSO missing from command line
> >> -
> >> -Signed-off-by: Khem Raj <raj.khem at gmail.com>
> >> ----
> >> - CMakeLists.txt | 1 +
> >> - 1 file changed, 1 insertion(+)
> >> -
> >> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> >> -index 7950e85..acee140 100644
> >> ---- a/CMakeLists.txt
> >> -+++ b/CMakeLists.txt
> >> -@@ -2494,6 +2494,7 @@ if(BUILD_tshark)
> >> -               ${LIBEPAN_LIBS}
> >> -               ${APPLE_CORE_FOUNDATION_LIBRARY}
> >> -               ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
> >> -+              m
> >> -       )
> >> -       set(tshark_FILES
> >> -               capture_opts.c
> >> ---
> >> -2.17.1
> >> -
> >> diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb
> >> similarity index 71%
> >> rename from meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb
> >> rename to meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb
> >> index 4699f6798..dc55e3de0 100644
> >> --- a/meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb
> >> +++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb
> >> @@ -8,26 +8,20 @@ DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bi
> >>
> >>  DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
> >>
> >> -SRC_URI = "https://1.as.dl.wireshark.org/src/all-versions/${BP}.tar.xz \
> >> -           file://0001-Add-libm-to-link-for-fmod-API.patch \
> >> -          "
> >> +SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz"
> >>
> >>  UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
> >>
> >> -SRC_URI[md5sum] = "b30ba5b9b48ed2ff91c0ce357d33b46b"
> >> -SRC_URI[sha256sum] = "487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863"
> >> +SRC_URI[md5sum] = "258d62ac7434d126dc497303c8f7961b"
> >> +SRC_URI[sha256sum] = "bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e"
> >>
> >>  PE = "1"
> >>
> >> -inherit cmake pkgconfig pythonnative perlnative upstream-version-is-even
> >> +inherit cmake pkgconfig python3native perlnative upstream-version-is-even
> >>
> >>  ARM_INSTRUCTION_SET = "arm"
> >>
> >> -# Options: gtk+, gtk+3 and qt5
> >> -GTK = "gtk+3"
> >> -
> >>  PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
> >> -PACKAGECONFIG_append_class-target = " ${@bb.utils.contains("DISTRO_FEATURES", "x11", " ${GTK}", "", d)}"
> >>
> >>  PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
> >>
> >> @@ -36,8 +30,6 @@ PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DE
> >>  PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi"
> >>  PACKAGECONFIG[libnl] = ",,libnl"
> >>  PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19"
> >> -PACKAGECONFIG[gtk+] = "-DENABLE_GTK=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK=OFF, gtk+"
> >> -PACKAGECONFIG[gtk+3] = "-DENABLE_GTK3=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK3=OFF, gtk+3"
> >>  PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls"
> >>  PACKAGECONFIG[ssl] = ",,openssl"
> >>  PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5"
> >> @@ -79,16 +71,11 @@ do_install_append_class-target() {
> >>  }
> >>
> >>  PACKAGE_BEFORE_PN += "tshark"
> >> -PACKAGE_BEFORE_PN += "${PN}-gtk"
> >>
> >>  FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*"
> >> -FILES_${PN}-gtk = "${bindir}/wireshark-gtk ${datadir}/icons ${datadir}/appdata \
> >> -                   ${datadir}/applications ${datadir}/wireshark ${datadir}/mime \
> >> -                   ${mandir}/man1/wireshark.* "
> >>
> >>  FILES_${PN} += "${datadir}*"
> >>
> >>  RDEPENDS_tshark = "wireshark"
> >> -RDEPENDS_${PN}-gtk = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "${GTK}", "", d)} wireshark"
> >>
> >>  BBCLASSEXTEND = "native"
> >> --
> >> 2.17.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>