From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by mail.openembedded.org (Postfix) with ESMTP id B83E070675 for ; Thu, 24 Jul 2014 10:38:21 +0000 (UTC) Received: by mail-wi0-f177.google.com with SMTP id ho1so3705100wib.10 for ; Thu, 24 Jul 2014 03:38:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=zwgQsY/5P4LRCRoF3m7MvtXv2dsYE3qd+IJE75idT+8=; b=Jhzs2sAk1pEvP4gws+RnH6l4OG8xvy0kY6vNpPgNcR6dDMIfApacRP3F89wSqcCKg4 7XoSWibjz+lbsGcbb3KyjuQSY8tRRLSkhKgdcz3YXihhkEFd9yFQ2vINFuMWcFeizkgt 1ni03gmtpBRr6C/zYg1nxI05p95ZfjGR4IolWOmXAI+AO5NIfMGFRk4x7PN0ezogPtcI 99viC62qW4FDfbU7zvhcwiXxt6LtVLCp14VuZ7T2BzC1jr+qtzVYQqqU1QL/ZbJCcY7t al3SKJhLiz0t9X1QkpsYOsBen0TYE2hLpYkgAoXvibq2PPhE8hJZ5Swc+YwE6dqfU1VG pKNQ== X-Received: by 10.180.82.166 with SMTP id j6mr33227227wiy.71.1406198298856; Thu, 24 Jul 2014 03:38:18 -0700 (PDT) Received: from localhost (ip-89-176-104-3.net.upcbroadband.cz. [89.176.104.3]) by mx.google.com with ESMTPSA id nc19sm21192710wic.4.2014.07.24.03.38.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jul 2014 03:38:17 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa Date: Thu, 24 Jul 2014 12:38:35 +0200 To: openembedded-devel@lists.openembedded.org Message-ID: <20140724103835.GD2492@jama> References: <1405981228-26871-1-git-send-email-akuster@mvista.com> <20140723135616.GD22875@jama> MIME-Version: 1.0 In-Reply-To: <20140723135616.GD22875@jama> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [meta-networking][PATCH] v3] Wireshark: build fix and recipe update X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2014 10:38:24 -0000 X-Groupsio-MsgNum: 51225 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="KJY2Ze80yH5MUxol" Content-Disposition: inline --KJY2Ze80yH5MUxol Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 23, 2014 at 03:56:16PM +0200, Martin Jansa wrote: > On Mon, Jul 21, 2014 at 03:20:28PM -0700, Armin Kuster wrote: > > Backported Arm build fix > > Added gtk3 support > > Cleaned up PACKAGECONFIG options >=20 > You cannot use IMAGE_FEATURES to define PACKAGECONFIG, see what I did > with it in master-next (and confirm that you're ok with my changes). >=20 > Also please notice wrong number of ']' in subject, no big deal, but I > had to strip 'v3]" from subject lines manually when cherry-picking from > patchwork. Can you please fix these floating dependencies before we merge this? WARN: packages/armv5te-oe-linux-gnueabi/wireshark/wireshark/latest lost dependency on libcap libnl libnl-genl libnl-nf libnl-route portaudio-v19 sbc >=20 > > Signed-off-by: Armin Kuster > > --- > > .../files/va_list-can-t-be-NULL-on-ARM.patch | 98 ++++++++++++++= ++++++++ > > .../wireshark/wireshark_1.12.0-rc2.bb | 5 +- > > 2 files changed, 102 insertions(+), 1 deletion(-) > > create mode 100644 meta-networking/recipes-support/wireshark/files/va_= list-can-t-be-NULL-on-ARM.patch > >=20 > > diff --git a/meta-networking/recipes-support/wireshark/files/va_list-ca= n-t-be-NULL-on-ARM.patch b/meta-networking/recipes-support/wireshark/files/= va_list-can-t-be-NULL-on-ARM.patch > > new file mode 100644 > > index 0000000..301c381 > > --- /dev/null > > +++ b/meta-networking/recipes-support/wireshark/files/va_list-can-t-be-= NULL-on-ARM.patch > > @@ -0,0 +1,98 @@ > > +From 320c4f0d705a3ed94f710fb4b7b3eef897ff7bc4 Mon Sep 17 00:00:00 2001 > > +From: Steev Klimaszewski > > +Date: Thu, 19 Jun 2014 16:54:57 -0500 > > +Subject: [PATCH] va_list can't be NULL on ARM. > > + > > +Bug: 10209 > > +Change-Id: Ibd63a530450b7d2d4ec244e91c77caa731ba63aa > > +Signed-off-by: Steev Klimaszewski > > +Signed-off-by: Balint Reczey > > +Reviewed-on: https://code.wireshark.org/review/2464 > > +Reviewed-by: Evan Huus > > +Reviewed-by: Michael Mann > > + > > +The patch was imported from the wireshark git server > > + (https://code.wireshark.org/review/p/wireshark.git) as of commit id > > + 320c4f0d705a3ed94f710fb4b7b3eef897ff7bc4. > > + > > +Signed-off-by: Armin Kuster > > + > > +--- > > + epan/expert.c | 36 +++++++++++++++++++++++++++++------- > > + 1 file changed, 29 insertions(+), 7 deletions(-) > > + > > +diff --git a/epan/expert.c b/epan/expert.c > > +index 46be838..a69566d 100644 > > +--- a/epan/expert.c > > ++++ b/epan/expert.c > > +@@ -381,15 +381,26 @@ expert_set_info_vformat(packet_info *pinfo, prot= o_item *pi, int group, int sever > > + tap_queue_packet(expert_tap, pinfo, ei); > > + } > > +=20 > > +-void > > +-expert_add_info(packet_info *pinfo, proto_item *pi, expert_field *exp= index) > > ++/* Helper function for expert_add_info() to work around compiler's sp= ecial needs on ARM*/ > > ++static inline void > > ++expert_add_info_internal(packet_info *pinfo, proto_item *pi, expert_f= ield *expindex, ...) > > + { > > ++ /* the va_list is ignored */ > > ++ va_list unused; > > + expert_field_info* eiinfo; > > +=20 > > + /* Look up the item */ > > + EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo); > > +=20 > > +- expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity, = *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL); > > ++ va_start(unused, expindex); > > ++ expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity, = *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused); > > ++ va_end(unused); > > ++} > > ++ > > ++void > > ++expert_add_info(packet_info *pinfo, proto_item *pi, expert_field *exp= index) > > ++{ > > ++ expert_add_info_internal(pinfo, pi, expindex); > > + } > > +=20 > > + void > > +@@ -406,22 +417,33 @@ expert_add_info_format(packet_info *pinfo, proto= _item *pi, expert_field *expinde > > + va_end(ap); > > + } > > +=20 > > +-proto_item * > > +-proto_tree_add_expert(proto_tree *tree, packet_info *pinfo, expert_fi= eld* expindex, > > +- tvbuff_t *tvb, gint start, gint length) > > ++/* Helper function for expert_add_expert() to work around compiler's = special needs on ARM*/ > > ++static inline proto_item * > > ++proto_tree_add_expert_internal(proto_tree *tree, packet_info *pinfo, = expert_field* expindex, > > ++ tvbuff_t *tvb, gint start, gint length, ...) > > + { > > + expert_field_info* eiinfo; > > + proto_item *ti; > > ++ va_list unused; > > +=20 > > + /* Look up the item */ > > + EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo); > > +=20 > > + ti =3D proto_tree_add_text(tree, tvb, start, length, "%s", eiinfo->s= ummary); > > +- expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity, = *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL); > > ++ va_start(unused, length); > > ++ expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity, = *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused); > > ++ va_end(unused); > > + return ti; > > + } > > +=20 > > + proto_item * > > ++proto_tree_add_expert(proto_tree *tree, packet_info *pinfo, expert_fi= eld* expindex, > > ++ tvbuff_t *tvb, gint start, gint length) > > ++{ > > ++ return proto_tree_add_expert_internal(tree, pinfo, expindex, tvb, st= art, length); > > ++} > > ++ > > ++proto_item * > > + proto_tree_add_expert_format(proto_tree *tree, packet_info *pinfo, ex= pert_field* expindex, > > + tvbuff_t *tvb, gint start, gint length, const char *format, ...) > > + { > > +--=20 > > +1.9.1 > > + > > diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.0= -rc2.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb > > index 66716c3..47e72f4 100644 > > --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb > > +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb > > @@ -14,6 +14,7 @@ PACKAGECONFIG +=3D " ${@bb.utils.contains("IMAGE_FEAT= URES", "x11-base", "gtk2 grap > > PACKAGECONFIG +=3D " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "= ipv6", "", d)}" > > =20 > > PACKAGECONFIG[gtk2] =3D "--with-gtk2=3Dyes,--with-gtk2=3Dno, gtk+" > > +PACKAGECONFIG[gtk3] =3D "--with-gtk3=3Dyes, --with-gtk3=3Dno, gtk+3" > > PACKAGECONFIG[graphics] =3D "--enable-wireshark, --disable-wireshark," > > PACKAGECONFIG[ipv6] =3D "--enable-ipv6,--disable-ipv6," > > PACKAGECONFIG[gnutls] =3D "--with-gnutls=3Dyes,--with-gnutls=3Dno, gnu= tls" > > @@ -22,7 +23,9 @@ PACKAGECONFIG[gcrypt] =3D "--with-gcrypt=3Dyes,--with= -gcrypt=3Dno, libgcrypt" > > EXTRA_OECONF =3D "--with-gtk3=3Dno --with-qt=3Dno --enable-usr-local= =3Dno -enable-tshark" > > =20 > > LIC_FILES_CHKSUM =3D "file://README.linux;md5=3D631e077455b7972172eb14= 9195e065b0" > > -SRC_URI =3D "http://wiresharkdownloads.riverbed.com/wireshark/src/wire= shark-1.12.0-rc2.tar.bz2 " > > +SRC_URI =3D "http://wiresharkdownloads.riverbed.com/wireshark/src/wire= shark-1.12.0-rc2.tar.bz2 \ > > + file://va_list-can-t-be-NULL-on-ARM.patch \ > > + " > > =20 > > SRC_URI[md5sum] =3D "dc1149073066a29f91116c168558262e" > > SRC_URI[sha256sum]=3D "31009bb450126e9b12808267419f31016d14e6fde7b5e39= c85ad37459908cffb" > > --=20 > > 1.9.1 > >=20 > > --=20 > > _______________________________________________ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel >=20 > --=20 > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --KJY2Ze80yH5MUxol Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlPQ4isACgkQN1Ujt2V2gByOPACgr49XXcG/72f9whcAZ14HKXLY TrUAoJroQZK9C+Z5xwAAmYXd4HW/ATF5 =Gvye -----END PGP SIGNATURE----- --KJY2Ze80yH5MUxol--