From nobody Sun Feb 8 15:29:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605287029; cv=none; d=zohomail.com; s=zohoarc; b=SpJqGCkd1OF2I6j69riBhS5QGXLEThws3wgryCijYzvLVY837KENVGZAW6gqxdqz0c+6/c9qSaVMGBC3B2eBQjSAyCv7ldtKCLz8pFmrLSVYMp1MWalOw3vWcWJNvuy1xbTZIZ1dKU+JOGccmH0AvbnNN+Pt/JZhrnk1ls4kXiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605287029; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6DVAxu2lm6W8oJiv3diTRNcAMlCEuzp536M+C2m1THU=; b=U/H5/jLMvAgW6uHMvFJ8x4mRFW0DUgUrax/dFFexg0QJCCfA2PSvPStV0Bq7pxNjajt46QZppn+xWd4B93dnufabyCPn1y+A769Zj8z8U4s5EZd7uGtZEcaZlhotdTqqFgjD9vLbbc/mFzHLLpqgyasejtGM7vXow0NzXbQdCE8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605287029836434.22086988308206; Fri, 13 Nov 2020 09:03:49 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-540-PVcP1-yGNH24yC1mPDjsfw-1; Fri, 13 Nov 2020 12:03:44 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8FD88030D9; Fri, 13 Nov 2020 17:03:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B42FF1002D46; Fri, 13 Nov 2020 17:03:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7AEF058104; Fri, 13 Nov 2020 17:03:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ADH3SSj030815 for ; Fri, 13 Nov 2020 12:03:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6BE5D5C629; Fri, 13 Nov 2020 17:03:28 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-180.ams2.redhat.com [10.36.113.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id B38B65C26A; Fri, 13 Nov 2020 17:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605287028; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6DVAxu2lm6W8oJiv3diTRNcAMlCEuzp536M+C2m1THU=; b=CDwmbPMpfEShP83ODGmSh5mH9woF8pPptyPfxM/vkjdtravHueJD2pUyA7xjfczC7LNXXA bCCVO7IOS1YlUVdqBaUid4CQhnn0hxAPyGzoFse4up4KGoYBxFdXca4tpwn8+uvdgjE2Tm Fc4pjV5CIa12wRigHlo0i83dmZ5RgFw= X-MC-Unique: PVcP1-yGNH24yC1mPDjsfw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] meson: bump min wireshark to 2.6.0 Date: Fri, 13 Nov 2020 17:03:16 +0000 Message-Id: <20201113170318.100088-3-berrange@redhat.com> In-Reply-To: <20201113170318.100088-1-berrange@redhat.com> References: <20201113170318.100088-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) If using the declared min version of wireshark, 2.4.0, libvirt plugin fails to build. This min version isn't present in any supported distros and thus not tested by CI. We don't support wireshark on RHEL-7 since it has 1.x.x series. The next oldest version present in supported distros is 2.6.2 on RHEL-8. Thus we should bump the min version to 2.6.0. This also lets us assume that the "plugindir" variable exists in pkg-config. Signed-off-by: Daniel P. Berrang=C3=A9 --- meson.build | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 816cf97a19..565a5f12e2 100644 --- a/meson.build +++ b/meson.build @@ -1403,7 +1403,7 @@ else win32_link_flags =3D [] endif =20 -wireshark_version =3D '2.4.0' +wireshark_version =3D '2.6.0' wireshark_dep =3D dependency('wireshark', version: '>=3D' + wireshark_vers= ion, required: get_option('wireshark_dissector')) if wireshark_dep.found() wireshark_plugindir =3D get_option('wireshark_plugindir') @@ -1411,31 +1411,22 @@ if wireshark_dep.found() wireshark_plugindir =3D wireshark_dep.get_pkgconfig_variable('plugindi= r') endif =20 - # On some systems the plugindir variable may not be stored within pkg co= nfig. - # Fall back to older style of constructing the plugin dir path. - if wireshark_plugindir =3D=3D '' - wireshark_modversion =3D wireshark_dep.version() - wireshark_plugindir =3D '@0@/wireshark/plugins/@1@'.format( - libdir, wireshark_modversion - ) - else - wireshark_prefix =3D wireshark_dep.get_pkgconfig_variable('prefix') - if wireshark_prefix =3D=3D '' - # If wireshark's prefix cannot be retrieved from pkg-config, - # this is our best bet. - wireshark_prefix =3D '/usr' - endif - # Replace wireshark's prefix with our own. - # There is no replace method in meson so we have to workaround it. - rc =3D run_command( - 'python3', '-c', - 'print("@0@".replace("@1@", "@2@"))'.format( - wireshark_plugindir, wireshark_prefix, prefix, - ), - check: true, - ) - wireshark_plugindir =3D rc.stdout().strip() - endif + wireshark_prefix =3D wireshark_dep.get_pkgconfig_variable('prefix') + if wireshark_prefix =3D=3D '' + # If wireshark's prefix cannot be retrieved from pkg-config, + # this is our best bet. + wireshark_prefix =3D '/usr' + endif + # Replace wireshark's prefix with our own. + # There is no replace method in meson so we have to workaround it. + rc =3D run_command( + 'python3', '-c', + 'print("@0@".replace("@1@", "@2@"))'.format( + wireshark_plugindir, wireshark_prefix, prefix, + ), + check: true, + ) + wireshark_plugindir =3D rc.stdout().strip() =20 # Since wireshark 2.5.0 plugins can't live in top level plugindir but ha= ve # to be under one of ["epan", "wiretap", "codecs"] subdir. The first one= looks okay. --=20 2.28.0