From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536701; cv=none; d=zohomail.com; s=zohoarc; b=W74ThXjOyNXhpRp5tnFljAuG+KFL2B/rZcgbMHrfX4DtUaDPG/TrsHj4dKxRRJQRAwiA79PzQGSdq+8rabRw0pgaR0FgkjSO+iKwPWbyD8vI+mQ36lqycajj9eZEUfYpPo6uuVBGHh06sfJDruVQD4lj3mSs263KwtyOPnLoJgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536701; 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=m1GY92zbwHbIsKZKcDeE+cBC7F8IbepnN0gnez85bjs=; b=ihgEzxLl8DFmTKx9ESzOIl6TpqO/D22Ov2IoIWFw9Wgou5thr/OG+mjUwQd0OKSN5M1+ChFxgiSOoSaZllVgAQKdbuqh/ClrmL0o1g5xavlkZcMwsrAm3D9SEsXvSu1TKNphcedi7qXZv7qHjwFF4wtEKbNeO5kLQRsC9bx7SCQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536701914956.7271272422295; Tue, 1 Jun 2021 01:38:21 -0700 (PDT) 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-499-dA5NfeRNNX6LeLAlpmusUQ-1; Tue, 01 Jun 2021 04:38:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 349C8BBEE3; Tue, 1 Jun 2021 08:38:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83A9B60C4A; Tue, 1 Jun 2021 08:38:11 +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 174211800BB4; Tue, 1 Jun 2021 08:38:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518c5Wh025924 for ; Tue, 1 Jun 2021 04:38:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 383681FBCF; Tue, 1 Jun 2021 08:38:05 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 95B6917A63 for ; Tue, 1 Jun 2021 08:38:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536700; 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=m1GY92zbwHbIsKZKcDeE+cBC7F8IbepnN0gnez85bjs=; b=bkowKlv53lMH9orMhxlf5XRGdS1xz58w8wAxMhIL7ye7nWkJIoB9JZTE/AAJvzSoY/NByI 6WJzRPNlX3pkSMBHv68yI/zfal4LYOKe2233iuDJcEN+HHv9wP/5a5IKsq25r8FNenNCjO 6nzfYHVxyYe3sFlvz8R7NNKD1/qTczI= X-MC-Unique: dA5NfeRNNX6LeLAlpmusUQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 01/26] spec: Be explicit about more features Date: Tue, 1 Jun 2021 10:37:32 +0200 Message-Id: <20210601083757.10194-2-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We want to be explicit about which features are enabled in our RPM build instead of relying on default values. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- libvirt.spec.in | 3 +++ mingw-libvirt.spec.in | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7920599498..cc04efe081 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1098,6 +1098,8 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) -Dsasl=3Denabled \ -Dpolkit=3Denabled \ -Ddriver_libvirtd=3Denabled \ + -Ddriver_remote=3Denabled \ + -Ddriver_test=3Denabled \ %{?arg_esx} \ %{?arg_hyperv} \ %{?arg_vmware} \ @@ -1126,6 +1128,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) -Dselinux=3Denabled \ %{?arg_selinux_mount} \ -Dapparmor=3Ddisabled \ + -Dapparmor_profiles=3Dfalse \ -Dsecdriver_apparmor=3Ddisabled \ -Dudev=3Denabled \ -Dyajl=3Denabled \ diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 4674d7887a..87223e205c 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -103,10 +103,12 @@ exit 1 %mingw_meson \ --auto-features=3Denabled \ -Ddriver_remote=3Denabled \ + -Ddriver_test=3Denabled \ -Ddriver_esx=3Denabled \ -Dcurl=3Denabled \ -Ddocs=3Denabled \ -Dapparmor=3Ddisabled \ + -Dapparmor_profiles=3Dfalse \ -Dattr=3Ddisabled \ -Daudit=3Ddisabled \ -Dbash_completion=3Ddisabled \ --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536700; cv=none; d=zohomail.com; s=zohoarc; b=I/9g2VCPgy/1gJyjiIfMJi72reOkTnJQjtfCSxTenTH9X4PHHoRPVYuAnBL8LQ7J4iIkO/es4Mk5ztn99cj7NfbQ4k4l60OCRVxkaF3CwEynRQQS4N1K4b2gGG6NcItOUJGW80u6yzG4MTAjhQ0bifwQohHk6dM/RQHGFkPd9L0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536700; 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=fnJhmK69gDJdBfLdj5lElFu4ayhujOQE/7xBRIfdlxM=; b=W1IqcPbcuWeFzrSXiBwEG98ksZVytGamHZHiN0lmjKySWkzkxk534z8RtNXwRWDNb034yk/sx9m6DKm0upQCvF9P/audnxDOSD5PueeuD7YB4y060pv7hFKlrvj8GbyO3wggNug+F2TxgSS/nW2fsO0k/dX35dLdhXrK0E+ZDeI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536700634733.5188217015015; Tue, 1 Jun 2021 01:38:20 -0700 (PDT) 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-570-hdxIuNk0PMqojRmmX6jnWQ-1; Tue, 01 Jun 2021 04:38:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 685E1BBEE4; Tue, 1 Jun 2021 08:38:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 430055C661; Tue, 1 Jun 2021 08:38:12 +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 316691801265; Tue, 1 Jun 2021 08:38:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518c6j3025930 for ; Tue, 1 Jun 2021 04:38:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4053B17A63; Tue, 1 Jun 2021 08:38:06 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9AC602C1A4 for ; Tue, 1 Jun 2021 08:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536699; 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=fnJhmK69gDJdBfLdj5lElFu4ayhujOQE/7xBRIfdlxM=; b=Vbt2YOCXFtoTbfvbPgm0om6IhtRsZbPrtDZa4pihUK7bh0+ygg5wFgkFARy7+XHL4e2Dz7 x10Sl7JBtAGTiQcWoyhzwZov3Usl9oFHxLiPfcv0z3OU9DS/AZSgyxxadCHpLKWLbxKl/j LOyl/kJzdN8j2Cm4SAiFj/uWGR8Io0c= X-MC-Unique: hdxIuNk0PMqojRmmX6jnWQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 02/26] meson: Whitespace tweaks Date: Tue, 1 Jun 2021 10:37:33 +0200 Message-Id: <20210601083757.10194-3-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 24 ++++++++++++------------ src/locking/meson.build | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index 4f23f9104e..4d76e1f651 100644 --- a/meson.build +++ b/meson.build @@ -420,7 +420,7 @@ if get_option('warning_level') =3D=3D '2' if supported_cc_flags.contains('-Wlogical-op') # Broken in 6.0 and later # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D69602 - w_logical_op_args =3D ['-O2', '-Wlogical-op', '-Werror'] + w_logical_op_args =3D [ '-O2', '-Wlogical-op', '-Werror' ] w_logical_op_code =3D ''' #define TEST1 1 #define TEST2 TEST1 @@ -436,7 +436,7 @@ if get_option('warning_level') =3D=3D '2' endif =20 # Check whether clang gives bogus warning for -Wdouble-promotion. - w_double_promotion_args =3D ['-O2', '-Wdouble-promotion', '-Werror'] + w_double_promotion_args =3D [ '-O2', '-Wdouble-promotion', '-Werror' ] w_double_promotion_code =3D ''' #include =20 @@ -446,12 +446,12 @@ if get_option('warning_level') =3D=3D '2' } ''' if cc.compiles(w_double_promotion_code, args: w_double_promotion_args, n= ame: '-Wdouble-promotion') - supported_cc_flags +=3D ['-Wdouble-promotion'] + supported_cc_flags +=3D [ '-Wdouble-promotion' ] endif =20 # Clang complains about unused static inline functions which are common # with G_DEFINE_AUTOPTR_CLEANUP_FUNC. - w_unused_function_args =3D ['-Wunused-function', '-Werror'] + w_unused_function_args =3D [ '-Wunused-function', '-Werror' ] w_unused_function_code =3D ''' static inline void foo(void) {} =20 @@ -459,7 +459,7 @@ if get_option('warning_level') =3D=3D '2' ''' # -Wunused-function is implied by -Wall, we must turn it off explicitly. if not cc.compiles(w_unused_function_code, args: w_unused_function_args) - supported_cc_flags +=3D ['-Wno-unused-function'] + supported_cc_flags +=3D [ '-Wno-unused-function' ] endif =20 endif @@ -794,9 +794,9 @@ required_programs =3D [ ] =20 required_programs_groups =3D [ - {'name':'rpcgen', 'prog':['rpcgen', 'portable-rpcgen']}, - {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3']}, - {'name':'rst2man', 'prog':['rst2man', 'rst2man.py', 'rst2man-3']}, + { 'name': 'rpcgen', 'prog': [ 'rpcgen', 'portable-rpcgen' ] }, + { 'name': 'rst2html', 'prog': [ 'rst2html5', 'rst2html5.py', 'rst2html5-= 3' ] }, + { 'name': 'rst2man', 'prog': [ 'rst2man', 'rst2man.py', 'rst2man-3' ] }, ] =20 if host_machine.system() =3D=3D 'freebsd' @@ -1060,7 +1060,7 @@ endif libxml_version =3D '2.9.1' libxml_dep =3D dependency('libxml-2.0', version: '>=3D' + libxml_version) =20 -libm_dep =3D cc.find_library('m', required : false) +libm_dep =3D cc.find_library('m', required: false) =20 netcf_version =3D '0.1.8' netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) @@ -1602,7 +1602,7 @@ if not get_option('driver_qemu').disabled() endif conf.set_quoted('QEMU_MODDIR', qemu_moddir) =20 - if host_machine.system() in ['freebsd', 'darwin'] + if host_machine.system() in [ 'freebsd', 'darwin' ] default_qemu_user =3D 'root' default_qemu_group =3D 'wheel' else @@ -1894,7 +1894,7 @@ if conf.has('WITH_LIBVIRTD') =20 if not get_option('storage_zfs').disabled() zfs_enable =3D true - foreach name : ['zfs', 'zpool'] + foreach name : [ 'zfs', 'zpool' ] set_variable( '@0@_prog'.format(name), find_program(name, required: get_option('storage_zfs'), dirs: libv= irt_sbin_path) @@ -1907,7 +1907,7 @@ if conf.has('WITH_LIBVIRTD') if zfs_enable use_storage =3D true conf.set('WITH_STORAGE_ZFS', 1) - foreach name : ['zfs', 'zpool'] + foreach name : [ 'zfs', 'zpool' ] conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).path()) endforeach endif diff --git a/src/locking/meson.build b/src/locking/meson.build index 8a28310e40..184d3c3f56 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -184,7 +184,7 @@ if conf.has('WITH_LIBVIRTD') virt_conf_files +=3D qemu_lockd_conf virt_test_aug_files +=3D { 'name': 'test_libvirt_lockd.aug', - 'aug' : files('test_libvirt_lockd.aug.in'), + 'aug': files('test_libvirt_lockd.aug.in'), 'conf': qemu_lockd_conf, 'test_name': 'libvirt_lockd', 'test_srcdir': meson.current_source_dir(), @@ -213,7 +213,7 @@ if conf.has('WITH_LIBVIRTD') virt_conf_files +=3D qemu_sanlock_conf virt_test_aug_files +=3D { 'name': 'test_libvirt_sanlock.aug', - 'aug' : files('test_libvirt_sanlock.aug.in'), + 'aug': files('test_libvirt_sanlock.aug.in'), 'conf': qemu_sanlock_conf, 'test_name': 'libvirt_sanlock', 'test_srcdir': meson.current_source_dir(), --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536716; cv=none; d=zohomail.com; s=zohoarc; b=fWFz9zV/NwLGdzSYD4g9C78Qst4rG35+QTUlUYhAo3uFTkmitNKzPTxduVA9/Jt03KkxLukatXL4YsiLxW7OjFFYk9DNymOUAyVolT5wCwTkITXdvlWlYY47X5WgOmWkcpaumlRoP8SNPdwuvzuy2zZl5lxMABm4MW7rc0Nll54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536716; 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=LuTbqkaYlLcvVfpNhne8JZS1O3nuTADpnMlh2mNalOw=; b=b46cLje2VtDix43aySC/9OWBuErsvPPooPqMa1/qMnOhn/4zaYqQBXk/1ybMrVjMl709U83YcZk8D8v8kvIW65nhDSz+2/C2kNxeERbaka44PIleKBwv0hk168FCT90xpNRlRU+UpPAVEZhdWMYap6jJ/0rT+PdivepQh1Ifzg4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536716042722.0656803204191; Tue, 1 Jun 2021 01:38:36 -0700 (PDT) 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-57-nI_BaBfcPdy7yvEhKWn-Tw-1; Tue, 01 Jun 2021 04:38:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C1757BBEE4; Tue, 1 Jun 2021 08:38:25 +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 9EB891E6; Tue, 1 Jun 2021 08:38:25 +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 69E6F44A5A; Tue, 1 Jun 2021 08:38:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518c7Es025944 for ; Tue, 1 Jun 2021 04:38:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 44974E2D4; Tue, 1 Jun 2021 08:38:07 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A1932E2D8 for ; Tue, 1 Jun 2021 08:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536715; 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=LuTbqkaYlLcvVfpNhne8JZS1O3nuTADpnMlh2mNalOw=; b=AXwp4RN3Iomu37f+hhGmpXitOCsgE4hH9ZEXK6hGcsXMTYI0UkIMYX9BUHSY7N+kGjMAbA fvvFnZ9jM0YE809eM8tFzKZvtPSi9I8rckWKkDXhkLjFolVVYpFlEzuiQ4FcLeSiIXcdBa Kv5CYHLWgUx2EBwypHtfTofwk8c4BAs= X-MC-Unique: nI_BaBfcPdy7yvEhKWn-Tw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 03/26] meson: Don't use 'required: true' Date: Tue, 1 Jun 2021 10:37:34 +0200 Message-Id: <20210601083757.10194-4-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It's the default. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 4d76e1f651..2544880732 100644 --- a/meson.build +++ b/meson.build @@ -804,7 +804,7 @@ if host_machine.system() =3D=3D 'freebsd' endif =20 foreach name : required_programs - prog =3D find_program(name, required: true, dirs: libvirt_sbin_path) + prog =3D find_program(name, dirs: libvirt_sbin_path) varname =3D name.underscorify() conf.set_quoted(varname.to_upper(), prog.path()) conf.set_quoted('@0@_PATH'.format(varname.to_upper()), prog.path()) @@ -812,7 +812,7 @@ foreach name : required_programs endforeach =20 foreach item : required_programs_groups - prog =3D find_program(item.get('prog'), required: true, dirs: libvirt_sb= in_path) + prog =3D find_program(item.get('prog'), dirs: libvirt_sbin_path) varname =3D item.get('name').underscorify() conf.set_quoted(varname.to_upper(), prog.path()) set_variable('@0@_prog'.format(varname), prog) @@ -1219,7 +1219,7 @@ if selinux_dep.found() conf.set('WITH_SELINUX', 1) endif =20 -thread_dep =3D dependency('threads', required: true) +thread_dep =3D dependency('threads') pthread_sigmask_code =3D ''' #include #include --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536714; cv=none; d=zohomail.com; s=zohoarc; b=RG/bhaTi4B4TqehgdY7Rj2xwPIc8UDl9W18f/iFf4/JdNtyd4lMxH6hEfU3uhrktpVKgO5G92m6h9YkCMLRYKezTlbws4uwgNAy04WvVsMGGwZptS4EzfP+OHkzkOHEf0jMK/vyt4US3+fGWl5IzQbUM2ImLF7V+L4dhikFNKXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536714; 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=Z+4rrH1fheQqm/bMlrhR8UB7YfGETAc4W5iQ4lCnvRQ=; b=HwXOPQf4vs905WaOVnbgHaJuPr7tlrAw9z+IXyCfy5PDCFg0JX0dZLdyvWgZziiYrtKhJTlevPLUPQUBeFlp4wg28fdxXv20YyJa+ljAXRRN3m8FfE+bN4gdNmp4V0iOvkzZKzWMmYyKtJkj6kviS0Nc0KFf3kmy8z/yrPw5oH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536714148605.4212529104433; Tue, 1 Jun 2021 01:38:34 -0700 (PDT) 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-506-qbI_H2z0OP2CUnlupxIg3w-1; Tue, 01 Jun 2021 04:38:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40DF3107ACFA; Tue, 1 Jun 2021 08:38:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9A665D769; Tue, 1 Jun 2021 08:38:25 +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 B1517180140D; Tue, 1 Jun 2021 08:38:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518c8f8025950 for ; Tue, 1 Jun 2021 04:38:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4AC28E2D8; Tue, 1 Jun 2021 08:38:08 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A639AE2D4 for ; Tue, 1 Jun 2021 08:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536713; 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=Z+4rrH1fheQqm/bMlrhR8UB7YfGETAc4W5iQ4lCnvRQ=; b=QhlzgjC5QjVfFV6ecTki6YvnToTvgzt9LoQE3qG4YJOXgPX5lmnJ6arW4FO93aH+2UEhqg yfwaTPI4MdUbzaXDWMIcd1/IL69q7A9+pDKXk3g+sraDlNDh6jNZAnZq0PvIIKLXDXUmjc K5t8dJcIeiibEbC7GoJOILGBG3+sac8= X-MC-Unique: qbI_H2z0OP2CUnlupxIg3w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 04/26] meson: Drop curl workaround Date: Tue, 1 Jun 2021 10:37:35 +0200 Message-Id: <20210601083757.10194-5-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It appears to no longer be necessary. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meson.build b/meson.build index 2544880732..1360dd325e 100644 --- a/meson.build +++ b/meson.build @@ -904,16 +904,6 @@ endif curl_version =3D '7.19.1' curl_dep =3D dependency('libcurl', version: '>=3D' + curl_version, require= d: get_option('curl')) if curl_dep.found() - # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version - # of that #defines several wrapper macros around underlying - # functions to add type safety for gcc only. However, these macros - # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by - # disabling the wrappers; even if it removes some type-check safety. - curl_dep =3D declare_dependency( - compile_args: [ '-DCURL_DISABLE_TYPECHECK' ], - dependencies: [ curl_dep ], - ) - conf.set('WITH_CURL', 1) endif =20 --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536860; cv=none; d=zohomail.com; s=zohoarc; b=K/ADwlPY8ITBGEpfYKhOREuCtboK4p8wTHMIwPXc7vDi3o/9BCZVY6I3vpDe4TEJ0p19lb24+ujHm+UIlyDAehFOuxZcXbVlnGXke8an9ITImfZZ9w9Kbwsy97nTAyG+as9xgRQUDB4bBLXxdXR7S84BvkoyNP+vCL9fPnAgQw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536860; 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=oF6mn58h2WotpjlsmYXypIgpmc3DdnkptbExQqtxgwc=; b=fBaAthTLcIlGZ0tsO61BJESRJXxt+YzHbw/S38kNn0Tmlles5HJAP57Q8CPnWpPHSgskDqnOfMmueHtHR3ymjI6f2/1rx9o0hivmsNCx5sgA6bjkAY2q3XN38EY9zx86cxWJIzoBgPNQOLCGFRp0AaFT7Hv6FG0eJyx5XasG1wY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536860094713.8118786284545; Tue, 1 Jun 2021 01:41:00 -0700 (PDT) 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-223-Y9qLUYUVOpmWW-bS97dgSA-1; Tue, 01 Jun 2021 04:38:32 -0400 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 D1E4DBBEE6; Tue, 1 Jun 2021 08:38:25 +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 AC1FA100763C; Tue, 1 Jun 2021 08:38:25 +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 701EF44A5C; Tue, 1 Jun 2021 08:38:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518c9NZ025968 for ; Tue, 1 Jun 2021 04:38:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 503AAE2D8; Tue, 1 Jun 2021 08:38:09 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD1BEE2D4 for ; Tue, 1 Jun 2021 08:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536857; 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=oF6mn58h2WotpjlsmYXypIgpmc3DdnkptbExQqtxgwc=; b=RC01Dcw/T63Dwed7D7iAq22jT5ipHre9ucpMwI+OF2/AxEP+NV0pG21Mi7tJ5e1loh34aL i/dkECaCpEhbO8hBXWarIzPYkBWHfQuOr0qY1cqSSQpqDZ1gObM1/q/CQMkuhqgppjn/nx Muo5vtdMekZ9nOAzMlwnKAuW0TqC4mQ= X-MC-Unique: Y9qLUYUVOpmWW-bS97dgSA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 05/26] meson: Drop netinet workaround Date: Tue, 1 Jun 2021 10:37:36 +0200 Message-Id: <20210601083757.10194-6-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It appears to no longer be necessary. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 16 ---------------- src/util/virnetdevbridge.c | 18 ------------------ 2 files changed, 34 deletions(-) diff --git a/meson.build b/meson.build index 1360dd325e..9c494faa5c 100644 --- a/meson.build +++ b/meson.build @@ -622,22 +622,6 @@ endforeach =20 # check for kernel headers required by src/util/virnetdevbridge.c if host_machine.system() =3D=3D 'linux' - # Various kernel versions have headers that are not self-standing, but - # yet are incompatible with the corresponding glibc headers. In order - # to guarantee compilation across a wide range of versions (from RHEL 5 - # to rawhide), we first have to probe whether glibc and kernel can be - # used in tandem; and if not, provide workarounds that ensure that - # ABI-compatible IPv6 types are present for use by the kernel headers. - netinet_workaround_code =3D ''' - #include - #include - - int main(void) { return 0; } - ''' - if not cc.compiles(netinet_workaround_code) - conf.set('NETINET_LINUX_WORKAROUND', 1) - endif - required_headers =3D [ 'linux/param.h', 'linux/sockios.h', diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 4fe84cc162..a9667b48ce 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -37,26 +37,8 @@ # endif # include # include /* HZ */ -# if NETINET_LINUX_WORKAROUND -/* Depending on the version of kernel vs. glibc, there may be a collision - * between and kernel IPv6 structures. The different types - * are ABI compatible, but choke the C type system; work around it by - * using temporary redefinitions. */ -# define in6_addr in6_addr_ -# define sockaddr_in6 sockaddr_in6_ -# define ipv6_mreq ipv6_mreq_ -# define in6addr_any in6addr_any_ -# define in6addr_loopback in6addr_loopback_ -# endif # include # include /* SYSFS_BRIDGE_ATTR */ -# if NETINET_LINUX_WORKAROUND -# undef in6_addr -# undef sockaddr_in6 -# undef ipv6_mreq -# undef in6addr_any -# undef in6addr_loopback -# endif =20 # define JIFFIES_TO_MS(j) (((j)*1000)/HZ) # define MS_TO_JIFFIES(ms) (((ms)*HZ)/1000) --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536719; cv=none; d=zohomail.com; s=zohoarc; b=d57te0H8qFk5IUYSbIchi5bTqiJQNirpBmF3fGqcr7g3b4OUq8qzIS6jpFTz29gE8fCyKV5F1Ct4KA21yyLN/dmxbjhMbigZ7HSttLMyES+IzHTrgWAl4FWISFMnSFKutsfNFNPKtbB0Aci/AHcjMZBrtdpi8DtpY2tPL6isZKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536719; 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=B8Mgn345cQ92IAuZ9LMUR2V6+naTDMqy+h3h6dZLYcg=; b=Vi/1vkbypJ8ZY4vLaOfdzGXjeBCSXDulGcjbUjotcfx+sxdztjDdsO8lIbxCMJh2gAA8JYdgeva2CsCABAp7Ylt4nEZrrqTU0cJbs6l3dTxDqWDtgW6zvLZ77UNWgDb67FajAUQ1OuNFXe5zjvfRgKykAhbSLoVadlVTPQLimnc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536719794304.5730957826147; Tue, 1 Jun 2021 01:38:39 -0700 (PDT) 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-513-4lHE-jrbOEWhW6YYqBvrOQ-1; Tue, 01 Jun 2021 04:38:35 -0400 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 C5D5EBBEE8; Tue, 1 Jun 2021 08:38:28 +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 96EF8100763C; Tue, 1 Jun 2021 08:38:28 +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 50C3644A67; Tue, 1 Jun 2021 08:38:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cAjN025975 for ; Tue, 1 Jun 2021 04:38:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 55CCCE2D4; Tue, 1 Jun 2021 08:38:10 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B17F617A63 for ; Tue, 1 Jun 2021 08:38:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536718; 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=B8Mgn345cQ92IAuZ9LMUR2V6+naTDMqy+h3h6dZLYcg=; b=NGXBsTUQLovO2/dr1E7NKC1hMoM6WH3mOMLh5P9hzHdeUb3K9Q3w1XXM3+aAHvac/POo3b 1ggm/A8QWPSa8vzcaGJMQbQv21pt4pTj/ioGXheIiKYEBtChnNzFhgbhlHUhXwtogD30qS 2Xl5D+vvFX7fb1HknNrF4U+b3nhoHj4= X-MC-Unique: 4lHE-jrbOEWhW6YYqBvrOQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 06/26] meson: Use get_pkgconfig_variable('cflags') Date: Tue, 1 Jun 2021 10:37:37 +0200 Message-Id: <20210601083757.10194-7-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Meson offers a native convenience method that can be used to fetch pkg-config variables from a dependency, so we can use that instead of calling pkg-config manually. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 9c494faa5c..7f6756abca 100644 --- a/meson.build +++ b/meson.build @@ -1309,9 +1309,7 @@ if yajl_dep.found() # # [1] https://github.com/Homebrew/homebrew-core/pull/74516 if host_machine.system() !=3D 'linux' - pkg_config_prog =3D find_program('pkg-config') - rc =3D run_command(pkg_config_prog, '--cflags', 'yajl', check: true) - cflags =3D rc.stdout().strip() + cflags =3D yajl_dep.get_pkgconfig_variable('cflags') if cflags.contains('include/yajl') rc =3D run_command( 'python3', '-c', --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536747; cv=none; d=zohomail.com; s=zohoarc; b=VMqe+058tSbH7q4HxKVil3U3cHQibOdg84MxJ1jg35E6L4iWnhTC6wctqGDwCXBWjlHygO1Rm/VaZRJ6byQ19Cw6bjLY1K+MgULrk5P4BtlCdxKaQpBPxLRekkwjryGZhcC4VyOM2fz/E+0Hfw6IuSEHcX2pdCBjoTpMSmF/1N8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536747; 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=Ru7IqisChwHkZ2bQ6QSw1jfIffIK/NscTgZhpAPhKtg=; b=DoZDpRRRH1aSrRSComvLr5vI3RD132jv7xDY7/u9OOoo6p+1ZJuCLmOzHDc/cyABNhCaumcpAkL/fwllQJy6rsCeCfQ8EjCiBSbfAfNy22dd1d1DsHbh6H2AMwi471bVlZFDY4+FuB5MIgTdAhmo+OlNQuiotH8s8qxdo3cjVks= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 162253674702692.37504282228053; Tue, 1 Jun 2021 01:39:07 -0700 (PDT) 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-167-IpnIsQwtP0KK9PeccSlz0w-1; Tue, 01 Jun 2021 04:38:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8353DBBEF0; Tue, 1 Jun 2021 08:38:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 661A777F17; Tue, 1 Jun 2021 08:38:36 +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 0E1DF1813CAA; Tue, 1 Jun 2021 08:38:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cBvj025985 for ; Tue, 1 Jun 2021 04:38:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5C659E2D8; Tue, 1 Jun 2021 08:38:11 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA07FE2D4 for ; Tue, 1 Jun 2021 08:38:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536746; 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=Ru7IqisChwHkZ2bQ6QSw1jfIffIK/NscTgZhpAPhKtg=; b=Jwf71BhKjbXGHlopuCSlLZpxFFYNEMeIXKysjMpQS+HJmCJjMpTvcb1KBlXIsD7fC35tJv RbtzyHFLIkYwZbciMavYDJoSNez7Rx/7FPLtwxqR5G2pBaSVk7Dfh+dICjCempC92QSNiP hCFTHUAtdTjnoN7Ryph7twG3UbPmgIQ= X-MC-Unique: IpnIsQwtP0KK9PeccSlz0w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 07/26] meson: Use built-in pcap detection Date: Tue, 1 Jun 2021 10:37:38 +0200 Message-Id: <20210601083757.10194-8-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Meson already knows how to look for pcap using pkg-config first, and falling back to pcap-config if that didn't work. https://mesonbuild.com/Dependencies.html#pcap Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/meson.build b/meson.build index 7f6756abca..81f8caae06 100644 --- a/meson.build +++ b/meson.build @@ -978,19 +978,7 @@ endif =20 libpcap_version =3D '1.5.0' if not get_option('libpcap').disabled() - libpcap_dep =3D dependency('libpcap', version: '>=3D' + libpcap_version,= required: false) - - if not libpcap_dep.found() - pcap_config_prog =3D find_program('pcap-config', required: get_option(= 'libpcap')) - if pcap_config_prog.found() - pcap_args =3D run_command(pcap_config_prog, '--cflags').stdout().str= ip().split() - pcap_libs =3D run_command(pcap_config_prog, '--libs').stdout().strip= ().split() - libpcap_dep =3D declare_dependency( - compile_args: pcap_args, - link_args: pcap_libs, - ) - endif - endif + libpcap_dep =3D dependency('pcap', version: '>=3D' + libpcap_version, re= quired: get_option('libpcap')) else libpcap_dep =3D dependency('', required: false) endif --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536728; cv=none; d=zohomail.com; s=zohoarc; b=Cq/tq+UuyIe1mBjaaqlViHxDPYH4fgEgYfRqcLNN3RIMIK19jFrwUobaxTbW8xAJfRZlV+ilyW6/uwI8St4LLdaAzQVwlJWZ2nXzRnvZEFhJn2YUd3DJVmWazjPs1BFKddUP0Dt8AcoeBX6KfJ5sj+ikzT7dr+T3mIK2zVhAzF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536728; 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=ypLD2QHjry5Sd6M5/Hdl+zuEUElxGX/FwrI8PzCvQ9s=; b=iV6V5SqkKlB/h/QkvSi3H1XDB9ccmvSgS9dms8PR9bMz+WhepXcQg9aiJleDKat0ilDuXWiNWdqUR/KRHQlUjeJeh+p9Fk2BLRqzmnTXmZ0GhJuMt8bAOWX7l9XUAPjlZ4KXfqzJGRLPPtQG2vSunvTht7WEOkb2ZgFegrjWtQE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536728975672.1856887389118; Tue, 1 Jun 2021 01:38:48 -0700 (PDT) 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-309-CJ_L5esRNqqCW3_6dU_atQ-1; Tue, 01 Jun 2021 04:38:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92222189944B; Tue, 1 Jun 2021 08:38:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46A71610DF; Tue, 1 Jun 2021 08:38:39 +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 0C61C1818454; Tue, 1 Jun 2021 08:38:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cCj8025995 for ; Tue, 1 Jun 2021 04:38:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6179CE2D4; Tue, 1 Jun 2021 08:38:12 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BF3C41FBCF for ; Tue, 1 Jun 2021 08:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536728; 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=ypLD2QHjry5Sd6M5/Hdl+zuEUElxGX/FwrI8PzCvQ9s=; b=aBeirREMS9cWn8z6V4t8Dc68yZEPbUz5kXpWIBec3gdP/CkjziZE0mhvppjpUzOR2YTVSE 3l2ibQN6lQNC/s76ZkpHkDvqmwQwq/5MCesw3c1M8Nqi6/zPTp6kgFM1UvsWbtOkVNtzd/ yJhnGUSXuKQV5CPt0QXRG1Ol3krhxL8= X-MC-Unique: CJ_L5esRNqqCW3_6dU_atQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 08/26] meson: Make libm a required dependency Date: Tue, 1 Jun 2021 10:37:39 +0200 Message-Id: <20210601083757.10194-9-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We use it unconditionally. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 81f8caae06..922bf93659 100644 --- a/meson.build +++ b/meson.build @@ -1022,7 +1022,7 @@ endif libxml_version =3D '2.9.1' libxml_dep =3D dependency('libxml-2.0', version: '>=3D' + libxml_version) =20 -libm_dep =3D cc.find_library('m', required: false) +libm_dep =3D cc.find_library('m') =20 netcf_version =3D '0.1.8' netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536744; cv=none; d=zohomail.com; s=zohoarc; b=PZ0L8iPkCZm6vvWzu4BNviDyeNYUuh+vhII0WjObchXh4ORKysP9sODjYEEfYe2frL/9RJcU2YVPsXv5MhraxTHR9Tv4xTvLB6NMjksjXWei3JX3HSlH/XuvQgv7X8BtGh1A4wFd/N1ExXhhgId/Rd0EUhLVZEL2kUksQNLMgGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536744; 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=bEiwkWvEKSguYFhPC+6HmyhUE+kDml8PAbwGlqRJA3s=; b=Htz+5fenqGm8TaT6LIktXH7jBNe8EOw1Sj3C9y4DOMFtdv+u2s3UF+0i5jvHz0T/4F0keI1bXpBd4zpIgbA1iPNDX/bcZoVj1vHkNHKD8uxOFHsbsyA0hPQeYJ+8Mo9VtHVBCVzjZ9dYFc3hCDI4f0XdcNvEdGwJTdXapwSG/dA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536744711621.1492484640427; Tue, 1 Jun 2021 01:39:04 -0700 (PDT) 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-490-lfxQAlReOL2EQEwLkwCR0w-1; Tue, 01 Jun 2021 04:38:47 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E4ECDBBEE1; Tue, 1 Jun 2021 08:38:42 +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 B8C402C1A9; Tue, 1 Jun 2021 08:38:42 +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 2159259CD1; Tue, 1 Jun 2021 08:38:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cDLd026000 for ; Tue, 1 Jun 2021 04:38:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 66CFBE2D8; Tue, 1 Jun 2021 08:38:13 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3AAFE2D4 for ; Tue, 1 Jun 2021 08:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536743; 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=bEiwkWvEKSguYFhPC+6HmyhUE+kDml8PAbwGlqRJA3s=; b=OxKYqRZcompcO6mt9+f6mYan2+FtAGjpFc0ZQUG/vGUTxE+c4BuLVXCNEfU16MmYo7oft+ K9GPBPHOc1y4sOP5rF5GIEa36DhpVsvd+vwymHAKqMfSpSQ0gvIzHVkrUTxPwVO7esck7j 4kHiKxex0YCXKAJ8XuA4oHu1V6EuJrI= X-MC-Unique: lfxQAlReOL2EQEwLkwCR0w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 09/26] meson: Drop numactl_version Date: Tue, 1 Jun 2021 10:37:40 +0200 Message-Id: <20210601083757.10194-10-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It's not used. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index 922bf93659..8aaa0ce370 100644 --- a/meson.build +++ b/meson.build @@ -1071,7 +1071,6 @@ else intl_dep =3D dependency('', required: false) endif =20 -numactl_version =3D '2.0.6' numactl_dep =3D cc.find_library('numa', required: get_option('numactl')) if numactl_dep.found() conf.set('WITH_NUMACTL', 1) --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536718; cv=none; d=zohomail.com; s=zohoarc; b=c87FY1ZHw7Zz23EZay4L9cDmuowtTABpvAVUg7WFCqyf19lTm0yKoAKww7KyNjKiKuHYZjl4D4DknzTRn59Wm3mgesNLFEDFGEf2FS4lV4a2REWayedLhJ54ivh8NPceqer3oejWn2VpMY2hbumxapVh7k/VE4imvWN45FSxUIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536718; 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=ZhfSu9YUeFYqeq0xw0Ch8o8oDjpgDx1bA+KWx+HhLRs=; b=UsHRY07F2WplJcPnEQ5bA+KVgxC0gH7UK5VCuNaYfhE7kCsM0wslH7v82Vbp7RIR51No2polk8ZfDIpwWYEXmtv1okYAEDw0IqPK81oPHY8PJopziY1/dOdfCe8e9ylPTxN4ocB9xj3ssOx4Kuet9YGGm5j8R7e3Sn6mSFbGcrc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536718577778.4908066635155; Tue, 1 Jun 2021 01:38:38 -0700 (PDT) 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-285-crLNrLrxNoS9KQwikhqYeg-1; Tue, 01 Jun 2021 04:38:35 -0400 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 253E0801107; Tue, 1 Jun 2021 08:38:29 +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 F2757100763C; Tue, 1 Jun 2021 08:38:28 +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 BB91144A66; Tue, 1 Jun 2021 08:38:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cEgi026011 for ; Tue, 1 Jun 2021 04:38:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E582E2D8; Tue, 1 Jun 2021 08:38:14 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA58BE2D4 for ; Tue, 1 Jun 2021 08:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536717; 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=ZhfSu9YUeFYqeq0xw0Ch8o8oDjpgDx1bA+KWx+HhLRs=; b=hMWMIB+y/b1Udp3LPFql81JmtINJ4eLE31ckSjartKJMhMdj0gLS3zS7i/05svklq9dnP+ Zw2l+eT5UANWXNZsirUCNFK+zgfynGsl7bSvI6+03tjSaTn+B4jDEqIInFNhVO1GZa3P+K 9vd0bYQTFUwHLnYLw5dp2f6IqfenB90= X-MC-Unique: crLNrLrxNoS9KQwikhqYeg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 10/26] meson: Fix vstorage detection Date: Tue, 1 Jun 2021 10:37:41 +0200 Message-Id: <20210601083757.10194-11-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We're supposed to error out if the user has explicitly asked for vstorage support to be enabled and that can't be done, but we've been looking at the wrong option. Fixes: 2127d53f2f90443f3e4919c1082350ee2b3096f1 Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8aaa0ce370..35dbec6522 100644 --- a/meson.build +++ b/meson.build @@ -1838,7 +1838,7 @@ if conf.has('WITH_LIBVIRTD') if not get_option('storage_vstorage').disabled() vstorage_enable =3D true if host_machine.system() !=3D 'linux' - if get_option('storage_fs').enabled() + if get_option('storage_vstorage').enabled() error('Vstorage is supported only on Linux') else vstorage_enable =3D false --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536718; cv=none; d=zohomail.com; s=zohoarc; b=nPsWI3uW6bWvSan0is4s/MoLIN5c5tbpbl6cSMY04qeM95GT0Mf6DZ75TZZWLKviUaCsgaPinSbSAof59ILoQnWZKyDw40SB+ky8IZZEpzLiRRSWv9SbSJ2xVVMTf1YLOPnPR2OCS4S/mEQnz+vVVhHaze11gvMPjm+AwqHETZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536718; 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=pvhI/ESoEyCoNJBLKMwd+Jx8zxGBcNzQ6+ZxO525ktE=; b=hksYvtNhRNWTvFXIBlC82oZ5mQf2hpvBVIvZ6RkRKp1Mstrp+Bw3Q+ddrgEQQG/aXZZe8O38XzkbLaZCdzNAdm2WUvQo6t8QT19r/iW6uC5wMajGK8ImoctIr5srMzlJufi9euJ9MzC7Fsdm0bxW9eZwywfi7UK44yHim0QhogY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536718449743.5999032438918; Tue, 1 Jun 2021 01:38:38 -0700 (PDT) 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-543-3PKehYL1M0Km-80qd2YyGw-1; Tue, 01 Jun 2021 04:38:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD326801B1D; Tue, 1 Jun 2021 08:38:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D7976A045; Tue, 1 Jun 2021 08:38:28 +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 606C5180B651; Tue, 1 Jun 2021 08:38:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cFM9026020 for ; Tue, 1 Jun 2021 04:38:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 744321FBCF; Tue, 1 Jun 2021 08:38:15 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2293E2D4 for ; Tue, 1 Jun 2021 08:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536717; 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=pvhI/ESoEyCoNJBLKMwd+Jx8zxGBcNzQ6+ZxO525ktE=; b=W/tr483LTytmeV7ZBz+Z4wE0Yw0aL4HzFv2DLGV95pVlWCrw7WC5JKNIOBwxntqTbQg8vR GTh7IrWuOOdEZ552BSE7CbvqlbqxtRCLws2bBmqervYzJPACiw3RL9CDvBjrivijhuPN54 jlAyRlzYDOFymmG5CfDm2CgfzMZ2Mxs= X-MC-Unique: 3PKehYL1M0Km-80qd2YyGw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 11/26] meson: Fix sanlock detection Date: Tue, 1 Jun 2021 10:37:42 +0200 Message-Id: <20210601083757.10194-12-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If the user explicitly asked for sanlock support to be enabled, then failure to find the corresponding library should result in an error. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 35dbec6522..328d4d1c5f 100644 --- a/meson.build +++ b/meson.build @@ -1145,7 +1145,7 @@ if readline_dep.found() endif =20 if not get_option('sanlock').disabled() - sanlock_dep =3D dependency('libsanlock_client', required: false) + sanlock_dep =3D dependency('libsanlock_client', required: get_option('sa= nlock')) =20 if sanlock_dep.found() conf.set('WITH_SANLOCK', 1) --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536818; cv=none; d=zohomail.com; s=zohoarc; b=TgYOGGwltCMGn8DIrmgjH7URZH6zSnBfnD8GQorAnTGYrCbp0EmVPTwM9gF4vZpltp5Py9BS5iUgxwn/P3AZeQuBNBd00QwtHu5r6zpvaIGbR79fR3XdExDO2EnI8C5pcbGtq0boxEH5+D42eJZCKi2XXAySkQ0fOWlJoe3jShg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536818; 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=sic3GoQZVEHyMU7K8Ye3zAWKQG9N68V8ad5/Gj5IKvs=; b=FtJ0QJdOjg8h/wq5QAde16QRPEDrE0q4BI8ASNCzdnBuaYUu1QArBQRFECdncSYm5BZUFDqULSPN76H/qgKR11gISOU251hHeftRObPesYEyrRsAEywLgVo9lb27Dh3rB8euRjCrkThrNRwqfpLXM2HlddbLFBbtV8iBdhmRGTw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536818700518.4178248194222; Tue, 1 Jun 2021 01:40:18 -0700 (PDT) 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-26-UjfLaDyrNf-uKReQnPquig-1; Tue, 01 Jun 2021 04:38:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6C551899457; Tue, 1 Jun 2021 08:38:31 +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 9459F5D9D0; Tue, 1 Jun 2021 08:38:31 +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 5700755353; Tue, 1 Jun 2021 08:38:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cG9d026026 for ; Tue, 1 Jun 2021 04:38:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F94717A63; Tue, 1 Jun 2021 08:38:16 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7D8E2ED63 for ; Tue, 1 Jun 2021 08:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536817; 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=sic3GoQZVEHyMU7K8Ye3zAWKQG9N68V8ad5/Gj5IKvs=; b=YCVHc98cLKeIW6OTQZI8on3nHaSyF2anEu1X5z/z9k4hAdgISmMtaNoX6nFVsQ335yovLU 8SSj/L64T5c2cIwFlVaP/jIYYQpKpHQcHbUem87H/BKS5i9WkKnBKPWQGP9d9aOuWkm2Us CoBqAtKpT+tNPOlqJbRZ45o/WVOAQgQ= X-MC-Unique: UjfLaDyrNf-uKReQnPquig-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 12/26] meson: Rewrite polkit check Date: Tue, 1 Jun 2021 10:37:43 +0200 Message-Id: <20210601083757.10194-13-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The new version will report an error if the user asks for polkit support to be enabled on Windows instead of silently ignoring such requests. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 328d4d1c5f..3ee8694886 100644 --- a/meson.build +++ b/meson.build @@ -1085,12 +1085,6 @@ parallels_sdk_dep =3D dependency('parallels-sdk', ve= rsion: '>=3D' + parallels_sdk_ve pciaccess_version =3D '0.10.0' pciaccess_dep =3D dependency('pciaccess', version: '>=3D' + pciaccess_vers= ion, required: get_option('pciaccess')) =20 -if not get_option('polkit').disabled() and host_machine.system() !=3D 'win= dows' - pkcheck_prog =3D find_program('pkcheck', required: false, dirs: libvirt_= sbin_path) -else - pkcheck_prog =3D dependency('', required: false) -endif - rbd_dep =3D cc.find_library('rbd', required: false) rados_dep =3D cc.find_library('rados', required: false) if rbd_dep.found() and not cc.has_function('rbd_get_features', dependencie= s: rbd_dep) @@ -1353,8 +1347,24 @@ elif get_option('firewalld_zone').enabled() error('You must have firewalld support enabled to enable firewalld_zone') endif =20 -if (pkcheck_prog.found() or get_option('polkit').enabled()) - conf.set('WITH_POLKIT', 1) +if not get_option('polkit').disabled() + polkit_enable =3D true + + if get_option('polkit').auto() + pkcheck_prog =3D find_program('pkcheck', required: false, dirs: libvir= t_sbin_path) + polkit_enable =3D pkcheck_prog.found() + endif + + if host_machine.system() =3D=3D 'windows' + polkit_enable =3D false + if get_option('polkit').enabled() + error('polkit support cannot be enabled on Windows') + endif + endif + + if polkit_enable + conf.set('WITH_POLKIT', 1) + endif endif =20 if udev_dep.found() and not pciaccess_dep.found() --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536724; cv=none; d=zohomail.com; s=zohoarc; b=CY62xXhe7zCnAyjGVFV4Tq3GLvsN7fchw7qRCS2/Ohu/u2NMOfCXJOu5Q0CBKE7WlFvse/+kKgkO7P60RMmEGnAE+bG/o2sth9cVh6DtHHuxvW72c8LSYWwJXMdAbS6lBS7A48GW7nvlHsx7W/64Gi18/esf4sAxDV/kAyizDMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536724; 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=bIO7IptcXf6PC+o+3YCWO0Yb9zGRPV8nBckT14qlvsY=; b=izZWjJBrRPCiKVi727LS/0vpp1P2hXSxpkRPVTwU2+BjW3M9o5PcG0iQ2dExUCDNVSzWUS3MzwoVBKc/XACFvw+rFrsrunN9WC1zTsMuqpTTYjsMO2qHQaevSpdAmwF/tWrzS4gytkxP1RrbNMET7VF6QLgpidk4tzWLHfg5eZ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536724637879.4755031402253; Tue, 1 Jun 2021 01:38:44 -0700 (PDT) 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-207-rLVCx_yVNc2FS-tdkWe6Kw-1; Tue, 01 Jun 2021 04:38:40 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D33C1899451; Tue, 1 Jun 2021 08:38:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C77A6A047; Tue, 1 Jun 2021 08:38:34 +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 026951813CA6; Tue, 1 Jun 2021 08:38:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cHJI026049 for ; Tue, 1 Jun 2021 04:38:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 83D4D1FBCF; Tue, 1 Jun 2021 08:38:17 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E260917A63 for ; Tue, 1 Jun 2021 08:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536723; 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=bIO7IptcXf6PC+o+3YCWO0Yb9zGRPV8nBckT14qlvsY=; b=OeVsRt0PCKCDHmAFvdCzEqw1CCaTwieCiFofVlKuDcg0Sqrd/ULY3O1L1WyG/S9fFQUkCJ RGHt39F1vi1BcLG30SCZHE53Jk5+OTLszLDmI08LVXgrovXnW89YectomcsPTOVqloCEMi b+WjbEPsbUgeOJbHpusSw+u+gry49DQ= X-MC-Unique: rLVCx_yVNc2FS-tdkWe6Kw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 13/26] meson: Tweak XDR check Date: Tue, 1 Jun 2021 10:37:44 +0200 Message-Id: <20210601083757.10194-14-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Keep all the platform-specific code in one place. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3ee8694886..14d6ce039f 100644 --- a/meson.build +++ b/meson.build @@ -1266,6 +1266,8 @@ if host_machine.system() =3D=3D 'windows' xdr_dep =3D cc.find_library('portablexdr', required: false) elif host_machine.system() =3D=3D 'linux' xdr_dep =3D dependency('libtirpc', required: false) +elif host_machine.system() in [ 'freebsd', 'darwin' ] + xdr_dep =3D cc.find_library('c', required: false) else xdr_dep =3D declare_dependency() endif @@ -1375,7 +1377,7 @@ endif # build driver options =20 if get_option('driver_remote').enabled() - if not xdr_dep.found() and host_machine.system() not in [ 'freebsd', 'da= rwin' ] + if not xdr_dep.found() error('XDR is required for remote driver') endif conf.set('WITH_REMOTE', 1) --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536727; cv=none; d=zohomail.com; s=zohoarc; b=N7pWQLohTM1QZp0UXH+7kvdYIGw+a8xSgk0mFQCJi0z6RmE9rvpWHI9qSikj2o90TJvki6aaVd0Z+j4DBTlBLkvAaFk9IMoFm+gJAR5kkNO17kOBbpShP5Q3o4ejpO8GhVLIr6hav9/nxwkJl9BnVoUFu4go9kUDSrCwnz6X2Jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536727; 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=2ifu/yc3/h6VmpUduWdVkTXeGzSvEyCL7aaVwJsztiM=; b=ZGH7/knBeUz/DAs2LFTe+CA+CNPdFzuWsAFLmU37p2dm7smViFuxI+sa7t5L6Jw8UO7nMV2+74GTKXsf0L/YlRAJfB2ZzvJYtCGGaLcJwW4sHJHAIwVNN4ICFpsHUke4RsXiA3ydMXbrwSNr/yAogYdX9N3BuGUFWraA8KInq0s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536727335519.6103733306236; Tue, 1 Jun 2021 01:38:47 -0700 (PDT) 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-279-BOitF9eYPDSwipikKugG3w-1; Tue, 01 Jun 2021 04:38:43 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F24A101F7DB; Tue, 1 Jun 2021 08:38:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E66E6C355; Tue, 1 Jun 2021 08:38:37 +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 CD04518155DB; Tue, 1 Jun 2021 08:38:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cIli026060 for ; Tue, 1 Jun 2021 04:38:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 888032C1B9; Tue, 1 Jun 2021 08:38:18 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E680417A63 for ; Tue, 1 Jun 2021 08:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536726; 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=2ifu/yc3/h6VmpUduWdVkTXeGzSvEyCL7aaVwJsztiM=; b=QbjN9zCTlZD+/72nGMQbK/5FGJpsOqRKpOvtUKx52+cB8+ViiQ+RLDzmePYnCCcyvVUGZl Meop7KVwiU4BCUbgKEy/i25LfKAEH/xLV5UTH8eEOns8nukDTcE+JnF6nQ/t+Dy1jm5Gca JzyfguBP+RREM/zd2b7/qpi5GerVVSM= X-MC-Unique: BOitF9eYPDSwipikKugG3w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 14/26] meson: Fix disabling netcf Date: Tue, 1 Jun 2021 10:37:45 +0200 Message-Id: <20210601083757.10194-15-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.11 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If the feature is disabled, the corresponding flags should not show up in the compiler command line. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 14d6ce039f..9b5de6daa1 100644 --- a/meson.build +++ b/meson.build @@ -1025,11 +1025,13 @@ libxml_dep =3D dependency('libxml-2.0', version: '>= =3D' + libxml_version) libm_dep =3D cc.find_library('m') =20 netcf_version =3D '0.1.8' -netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) if not get_option('netcf').disabled() + netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, requi= red: get_option('netcf')) if netcf_dep.found() conf.set('WITH_NETCF', 1) endif +else + netcf_dep =3D dependency('', required: false) endif =20 have_gnu_gettext_tools =3D false --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536728; cv=none; d=zohomail.com; s=zohoarc; b=cnOSwqbmKmbqiqvt2O+cDItxqMyPlDYZVWXvu6ur23MabLWB2DBA5zK91eYIdAoO5u3qBrdRnQEysMd6ziJHusSIezEHamLmE7puAi+9irRAxSZtsStOsln7xfRexKXssDa+UPkp2ktUnwcsWZvRY0yCLN2a2IpirZaBfsV4l/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536728; 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=1aZJvDugQh48SWo3MssInjySTRqLoPHEF3Ywf9fbqqo=; b=e5Cganv3JXmXA97HG9IhTowrXqUCqipKQiQrfingl5kYNtQKLpHbrdR1sRPxEtviNA99nDNWuaS6w6k9D1t+vD0Il1GAy5gWQiqZjihn8MCIT5ZQheO2FhaTBTcBbKU7RGlOrqy1JjU3E5Wc+EYPR47Ax1MNLZnZiD/vbjswws8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536728394118.87476925985823; Tue, 1 Jun 2021 01:38:48 -0700 (PDT) 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-426-2fErogoDPnaG5X2M_K33bQ-1; Tue, 01 Jun 2021 04:38:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30EB2801B12; Tue, 1 Jun 2021 08:38:40 +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 133C06C355; Tue, 1 Jun 2021 08:38:40 +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 CF2F43838E; Tue, 1 Jun 2021 08:38:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cJmB026070 for ; Tue, 1 Jun 2021 04:38:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D311E2D4; Tue, 1 Jun 2021 08:38:19 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EADBE17A63 for ; Tue, 1 Jun 2021 08:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536727; 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=1aZJvDugQh48SWo3MssInjySTRqLoPHEF3Ywf9fbqqo=; b=hPlRYFKn9uTYiiV6+ICIMtmOfuDG8AWxB+eXidh/oUaWeSfYWGa8u2gox+VR/U4DHR8uPU E4FmtvKlpJ3AuA9da3TMzYF3n6p7XA1ecg9MivfD+GQ0ZerHrOEHogDfBW3k3JGHK2/9z8 CyF7nqn8WQJTr1v7Spvo8J1Paul3ks8= X-MC-Unique: 2fErogoDPnaG5X2M_K33bQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 15/26] meson: Rewrite firewalld check Date: Tue, 1 Jun 2021 10:37:46 +0200 Message-Id: <20210601083757.10194-16-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.11 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This makes it possible to explicitly disable firewalld support regardless of the platform that's been targeted. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 9b5de6daa1..faccbd750c 100644 --- a/meson.build +++ b/meson.build @@ -1339,8 +1339,14 @@ if bash_completion_dep.found() endif endif =20 -if host_machine.system() !=3D 'freebsd' - if not get_option('firewalld').disabled() +if not get_option('firewalld').disabled() + firewalld_enable =3D true + + if host_machine.system() =3D=3D 'freebsd' + firewalld_enable =3D false + endif + + if firewalld_enable conf.set('WITH_FIREWALLD', 1) endif endif --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536733; cv=none; d=zohomail.com; s=zohoarc; b=BAkPRuy+/GhD7w9toyBnQopVye/K419LOJvO1gxf5coWJj6NSDle7s4PoSf8UmH7P6jsh5kvbKQsV0UrgPb/l7uCnUo+N2rYO2EqVikzEnSluTO/MuBCym3VtGjIISC4Jb059GbxOOwebHFulydYZKABvBn0jU3dsW4DS3dDd3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536733; 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=nkVWdjahPbQrUJsHGzlaAJvLi8N8fnlFBj/UK3x7w4k=; b=DIbcJ+rDHCCSsU6ZNQkxfEzQml707Rtiw9QzCDnOnmMEtEqcgQmRX/4iqbqEmeo1Z7D/c5pIesMmQGmCnum7WKWw+k/NUeBo7/QQuA8ZPMkiyQLDI+GgYiNOZ2bU4zia8xvg0x1rlTKYQFM5n+zWbJo6JL/5W0U5DqdutZDyZB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536733900999.9547023687059; Tue, 1 Jun 2021 01:38:53 -0700 (PDT) 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-104-ppudgyEVMi6ReA_kHIronw-1; Tue, 01 Jun 2021 04:38:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A0ECBBEED; Tue, 1 Jun 2021 08:38:45 +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 124DCE2D4; Tue, 1 Jun 2021 08:38:45 +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 CE4BB5B41C; Tue, 1 Jun 2021 08:38:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cRii026092 for ; Tue, 1 Jun 2021 04:38:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6304FE2D8; Tue, 1 Jun 2021 08:38:27 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C13C1E2D4 for ; Tue, 1 Jun 2021 08:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536732; 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=nkVWdjahPbQrUJsHGzlaAJvLi8N8fnlFBj/UK3x7w4k=; b=HMZAPqQ8G49ZvTdPV1O2CdB0x6Dve+8lmNEH8H+DjohJyfMfZAErAYhdxl3sRBxi7oMze+ y/oshVt2dToojD4R+T1L+KszfA0xaV2+Lv7ryUSabPdRMySSI292sontci4zJuanI351FV gQCoxOvUcDLlorCcWFdacLsNjMBt+C8= X-MC-Unique: ppudgyEVMi6ReA_kHIronw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 16/26] meson: Fix firewalld check Date: Tue, 1 Jun 2021 10:37:47 +0200 Message-Id: <20210601083757.10194-17-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" firewalld is Linux-only, so it should be disabled by default everywhere else and attempts to explicitly enable firewalld support on non-Linux targets should result in an error. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index faccbd750c..0b2e3e062e 100644 --- a/meson.build +++ b/meson.build @@ -1342,8 +1342,11 @@ endif if not get_option('firewalld').disabled() firewalld_enable =3D true =20 - if host_machine.system() =3D=3D 'freebsd' + if host_machine.system() !=3D 'linux' firewalld_enable =3D false + if get_option('firewalld').enabled() + error('firewalld support can only be enabled on Linux') + endif endif =20 if firewalld_enable --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536927; cv=none; d=zohomail.com; s=zohoarc; b=STnu2GQOImWoLYw7gY4nufEQVroBTg2R06CAc6/Z/N7za27HMLUx6xeFxVJrAXANARkNI+/ZJZSlx3F5Pto3KPrxRpdZncS8Yr4pntsp8eQP/0Q7+ZwCIHN0XqT56cF2HGgf6+Y0RBdzQdxLEMwT44A8vGLAgXiAIvPVF/Q8XVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536927; 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=EpM7GQwc9iL9zb/UfB2s0MEdrTHCY6xxi5syg4U9hQc=; b=UI6+qKG6sNWu8FVP/pyRAwXGdqapUYiiTViX1nsn+QWw74L0YNrsxabXqdpVPwAWuRUvz9IGIBDbaPCBWv8GiCmmJMzRlG/PNIHGMU18v9ghgG45sr5qBUXruQ70nS3WYAUrsaWOt4/oAnoKDiBHFWzLnjBlPbGSe6yDUel0Ad0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536927316135.63568894579964; Tue, 1 Jun 2021 01:42:07 -0700 (PDT) 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-384-g9RiW_G6OD2pPqoAjeOyJQ-1; Tue, 01 Jun 2021 04:38:38 -0400 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 07E801019634; Tue, 1 Jun 2021 08:38:32 +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 D2B5B100763C; Tue, 1 Jun 2021 08:38:31 +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 9D9BE5535B; Tue, 1 Jun 2021 08:38:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cSWG026099 for ; Tue, 1 Jun 2021 04:38:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 690AF2C1B9; Tue, 1 Jun 2021 08:38:28 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5E5FE2D4 for ; Tue, 1 Jun 2021 08:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536926; 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=EpM7GQwc9iL9zb/UfB2s0MEdrTHCY6xxi5syg4U9hQc=; b=ccUHpGfZ7shNmjjl3bSdDnIemikEnNpics5k9sGHco5/F+XnkeRWo6psA0mK9ed23mlWw4 Y2G7J45ygWIFt0BPyJODrmb8H7oYJtC1rkbnZCPLB+g01+1AWL1MZ8bd2eDPKB94mffOnI xUdKa5fdjq5QtEFIwmjwRQ76wmlxQkA= X-MC-Unique: g9RiW_G6OD2pPqoAjeOyJQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 17/26] meson: Rewrite libacl check Date: Tue, 1 Jun 2021 10:37:48 +0200 Message-Id: <20210601083757.10194-18-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" libacl is Linux-only, so we don't need to explicitly check for either the target platform or header availability, and we can simply rely on cc.find_library() instead. The corresponding preprocessor define is renamed to more accurately reflect the nature of the check. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 8 +++----- src/qemu/qemu_namespace.c | 2 +- src/util/virfile.c | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 0b2e3e062e..301cebab5c 100644 --- a/meson.build +++ b/meson.build @@ -844,11 +844,9 @@ endforeach =20 # generic build dependencies =20 -if host_machine.system() =3D=3D 'linux' and cc.has_header('sys/acl.h') - acl_dep =3D cc.find_library('acl', required: false) - conf.set('WITH_SYS_ACL_H', 1) -else - acl_dep =3D dependency('', required: false) +acl_dep =3D cc.find_library('acl', required: false) +if acl_dep.found() + conf.set('WITH_LIBACL', 1) endif =20 apparmor_dep =3D dependency('libapparmor', required: get_option('apparmor'= )) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 6a97863d92..98495e8ef8 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -852,7 +852,7 @@ qemuDomainNamespaceAvailable(qemuDomainNamespace ns G_G= NUC_UNUSED) =20 switch (ns) { case QEMU_DOMAIN_NS_MOUNT: -# if !defined(WITH_SYS_ACL_H) || !defined(WITH_SELINUX) +# if !defined(WITH_LIBACL) || !defined(WITH_SELINUX) /* We can't create the exact copy of paths if either of * these is not available. */ return false; diff --git a/src/util/virfile.c b/src/util/virfile.c index 03a7725dd3..cd63eceb16 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -56,7 +56,7 @@ #if WITH_SYS_SYSCALL_H # include #endif -#if WITH_SYS_ACL_H +#if WITH_LIBACL # include #endif #include @@ -3752,7 +3752,7 @@ virFileMoveMount(const char *src G_GNUC_UNUSED, #endif /* !defined(__linux__) || !defined(WITH_SYS_MOUNT_H) */ =20 =20 -#if defined(WITH_SYS_ACL_H) +#if defined(WITH_LIBACL) int virFileGetACLs(const char *file, void **acl) @@ -3782,7 +3782,7 @@ virFileFreeACLs(void **acl) *acl =3D NULL; } =20 -#else /* !defined(WITH_SYS_ACL_H) */ +#else /* !defined(WITH_LIBACL) */ =20 int virFileGetACLs(const char *file G_GNUC_UNUSED, @@ -3808,7 +3808,7 @@ virFileFreeACLs(void **acl) *acl =3D NULL; } =20 -#endif /* !defined(WITH_SYS_ACL_H) */ +#endif /* !defined(WITH_LIBACL) */ =20 int virFileCopyACLs(const char *src, --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536812; cv=none; d=zohomail.com; s=zohoarc; b=hMJnpPzMoC+ANEsL04xhOCgz+IDlAuQNOjrNcyTG5KY5jlq9NN4JvtC5fTnMVlrsi40K8oEXgCOXO4yIWdwqWg7BPrPMhEfahlt0fhSARQdvmlXMnIQuAXA60SnxMoGJBh0EnuB2b0FIlB/w1MfZ7V2E55rlV6HkbybuW5SBts8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536812; 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=PwvPGZh6P8fAWhq9Lh4xxRluuzy3o8QHMY3UrvPTpgc=; b=XzQpNWgXZYaGuovnPgkCmQy+2b8YQGOCxwqQE4Fxrc7sP3Uwd3L47qxL0rW22dZJAMOV5a+7ict1eVlVB2JtxU0kRsTSgScGRcjQOZrkpKIGHVPwxpEnZl5WM+tVNI+lww6+n1ET2h7YShvAcgA2+d0wi1UnDWECqC/th9yW5ew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536812718589.1394923180745; Tue, 1 Jun 2021 01:40:12 -0700 (PDT) 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-107-gjTqLJcpPeW287T4_wrwDw-1; Tue, 01 Jun 2021 04:38:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AFADC8042B7; Tue, 1 Jun 2021 08:38:34 +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 8B7EE1E6; Tue, 1 Jun 2021 08:38:34 +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 521903FB4A; Tue, 1 Jun 2021 08:38:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cTH9026111 for ; Tue, 1 Jun 2021 04:38:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E406E2D8; Tue, 1 Jun 2021 08:38:29 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB40BE2D4 for ; Tue, 1 Jun 2021 08:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536811; 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=PwvPGZh6P8fAWhq9Lh4xxRluuzy3o8QHMY3UrvPTpgc=; b=PeX6xvWaQjg15UuKHmO76ioNUci+6QuYxp3K/xvS2uuYZhsNXcjsTqsXjxOZdVPWNxNwb6 h6CJmpBjyMLsznWvHJ60T7uL8GeKnlV0SqvA0lZYy3t2Bzn/A4u9B51NSmUbWSmxMRWJ9S CxxfZpFWadPbtv9qdmteC7yslyUpuyU= X-MC-Unique: gjTqLJcpPeW287T4_wrwDw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 18/26] meson: Use dependency() when possible Date: Tue, 1 Jun 2021 10:37:49 +0200 Message-Id: <20210601083757.10194-19-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This is the preferred way to figure out whether a library is available, and for the most part we can just adopt it right away; in a few cases, unfortunately, we're stuck with using cc.find_library() until further down the road, when all our target platforms ship with pkg-config enabled versions of the various libraries. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 301cebab5c..a9f87473db 100644 --- a/meson.build +++ b/meson.build @@ -844,6 +844,7 @@ endforeach =20 # generic build dependencies =20 +# FIXME rewrite to use dependency() acl_dep =3D cc.find_library('acl', required: false) if acl_dep.found() conf.set('WITH_LIBACL', 1) @@ -859,12 +860,13 @@ if apparmor_dep.found() conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') endif =20 +# FIXME rewrite to use dependency() once we can use 2.4.48 attr_dep =3D cc.find_library('attr', required: get_option('attr')) if attr_dep.found() conf.set('WITH_LIBATTR', 1) endif =20 -audit_dep =3D cc.find_library('audit', required: get_option('audit')) +audit_dep =3D dependency('audit', required: get_option('audit')) if audit_dep.found() conf.set('WITH_AUDIT', 1) endif @@ -878,7 +880,7 @@ if blkid_dep.found() conf.set('WITH_BLKID', 1) endif =20 -capng_dep =3D cc.find_library('cap-ng', required: get_option('capng')) +capng_dep =3D dependency('libcap-ng', required: get_option('capng')) if capng_dep.found() conf.set('WITH_CAPNG', 1) endif @@ -1071,6 +1073,7 @@ else intl_dep =3D dependency('', required: false) endif =20 +# FIXME rewrite to use dependency() once we can use 2.0.14 numactl_dep =3D cc.find_library('numa', required: get_option('numactl')) if numactl_dep.found() conf.set('WITH_NUMACTL', 1) @@ -1160,7 +1163,7 @@ else sasl_dep =3D dependency('', required: false) endif =20 -selinux_dep =3D cc.find_library('selinux', required: get_option('selinux')) +selinux_dep =3D dependency('libselinux', required: get_option('selinux')) if selinux_dep.found() selinux_mount =3D get_option('selinux_mount') if selinux_mount =3D=3D '' @@ -1269,7 +1272,7 @@ elif host_machine.system() =3D=3D 'linux' elif host_machine.system() in [ 'freebsd', 'darwin' ] xdr_dep =3D cc.find_library('c', required: false) else - xdr_dep =3D declare_dependency() + xdr_dep =3D dependency('', required: false) endif =20 yajl_version =3D '2.0.3' @@ -1469,16 +1472,16 @@ if not get_option('driver_libxl').disabled() and co= nf.has('WITH_LIBVIRTD') if cc.has_header('libxlutil.h') conf.set('WITH_LIBXLUTIL_H', 1) endif - xl_util_dep =3D cc.find_library('xlutil') + xl_util_dep =3D dependency('xlutil') =20 - xen_store_dep =3D cc.find_library('xenstore') + xen_store_dep =3D dependency('xenstore') =20 # xtl_* infrastructure is in libxentoollog since Xen 4.7 previously # it was in libxenctrl. if libxl_dep.version().version_compare('>=3D4.7.0') - xtl_link_dep =3D cc.find_library('xentoollog') + xtl_link_dep =3D dependency('xentoollog') else - xtl_link_dep =3D cc.find_library('xenctrl') + xtl_link_dep =3D dependency('xenctrl') endif =20 if libxl_dep.version().version_compare('>=3D4.13.0') --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536736; cv=none; d=zohomail.com; s=zohoarc; b=hZBO1Sba1O3IbL0ezKNnR/OLfy5RLi6zA04/H9sG/niX9KqXng7DRZtHzh9YVg1zJZ98hxbOH9fsyFnPv0/YHUH5quWA49TIfeI37uiqlZu+ftK4dYKAQA2VMmoamD2Ne+td8oEM3QEAmFRoCtrfNUiQMklLMdTNGH7ABwtsiP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536736; 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=GexvpNsaPSLULOisd4pstP1vFSfuABwRvr/myUh1jMs=; b=YizCJkg5bvPcViTEj9iUNIWhkO8TchJogYx4rnxvDPa8MFeNShDCW6x86cjJrCUYEBEMeq1ODWkKTBjsXQciV/H4EAt73Y6Ql8kL4ZY+kX8sN5QH61f223ZdTZ52ua6cCBVt6pFRCCp0i2erFlaF6KhY+FqCR4WAK0cuzlMG7ZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536736303129.31534731073646; Tue, 1 Jun 2021 01:38:56 -0700 (PDT) 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-558-kjTTRzeMN3KHDuAaNJe4FQ-1; Tue, 01 Jun 2021 04:38:52 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 121D91020C38; Tue, 1 Jun 2021 08:38:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E672377F12; Tue, 1 Jun 2021 08:38:47 +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 A59EE181845F; Tue, 1 Jun 2021 08:38:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cUg9026126 for ; Tue, 1 Jun 2021 04:38:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 731DCE2D8; Tue, 1 Jun 2021 08:38:30 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0648E2D4 for ; Tue, 1 Jun 2021 08:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536734; 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=GexvpNsaPSLULOisd4pstP1vFSfuABwRvr/myUh1jMs=; b=g6ObhvsM4rNNE0CZO2fBn7Hf/xi3kBQY883j/P1gWE8e6sFqmlPppGCzYyoXUOAw7std77 ijA3K+HJtdCJBWwlnLmCjjlnyARgk750VS/BlIqrfTH6ZzjdUCcAaVyAnisbM4l9y1P45D YcbgKduIzgmOThCYYeJy//5QwjhUPiU= X-MC-Unique: kjTTRzeMN3KHDuAaNJe4FQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 19/26] meson: Rewrite apparmor_profiles check Date: Tue, 1 Jun 2021 10:37:50 +0200 Message-Id: <20210601083757.10194-20-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Attempting to enable apparmor_profiles when apparmor support is not enabled should result in an error. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index a9f87473db..55bb724a52 100644 --- a/meson.build +++ b/meson.build @@ -852,14 +852,18 @@ endif =20 apparmor_dep =3D dependency('libapparmor', required: get_option('apparmor'= )) if apparmor_dep.found() - if get_option('apparmor_profiles') - conf.set('WITH_APPARMOR_PROFILES', 1) - endif conf.set('WITH_APPARMOR', 1) conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d') conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') endif =20 +if get_option('apparmor_profiles') + if not conf.has('WITH_APPARMOR') + error('Cannot enable apparmor_profiles without apparmor') + endif + conf.set('WITH_APPARMOR_PROFILES', 1) +endif + # FIXME rewrite to use dependency() once we can use 2.4.48 attr_dep =3D cc.find_library('attr', required: get_option('attr')) if attr_dep.found() --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536731; cv=none; d=zohomail.com; s=zohoarc; b=XTf/evG3TK4T2vu5/IdDlexeIwu2Z77092J2PYYVgrLkYoxX9xlg70UtcdqJtx3jgPlyUEk1QsBTL+Hbamos2RQtT/lDgdoMnLdkJNjk5Ck4eDtFQ9/SP+X/TbbX05Fo3GxqzfFfJl28tkmDhEmHf+LM56sy+N0DwerFh0Vn6xY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536731; 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=TMqsv0w2endhMJradOEd74O9SfkRxcwxFmnfsmzkV1w=; b=iLmOaimPF5ng3W/pd8PzHC+5MyHALOFynXWlawwu831cIdBfEWoASmrreUelEYXpo8/lCDhCeS65ATh0g0v2AHnScClt1QrhOFag3tRyOQB6MbHtFjocvIJNPK30hbV0CIS+4osp7gYvzjqmUpuJHpcO+14Foe0dCT7hiZGGt+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536731890969.6586694432278; Tue, 1 Jun 2021 01:38:51 -0700 (PDT) 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-170-_V1-r2x4NiOz975neibZXQ-1; Tue, 01 Jun 2021 04:38:49 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE76C8015F5; Tue, 1 Jun 2021 08:38:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA41D2B4DE; Tue, 1 Jun 2021 08:38:43 +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 84A251818459; Tue, 1 Jun 2021 08:38:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cV1Z026147 for ; Tue, 1 Jun 2021 04:38:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7831617A63; Tue, 1 Jun 2021 08:38:31 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D5419E2D4 for ; Tue, 1 Jun 2021 08:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536730; 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=TMqsv0w2endhMJradOEd74O9SfkRxcwxFmnfsmzkV1w=; b=YmdMHuRwDV6mUwmAmP66ABcfLZ9SLUxAMok85tUIpqiwLybePpAOQ2vmnDfT7vSq+2DNCF X8VaBP3Z0uYEQa9R3HKXrIJg+PTScdmBWOrzNFqQIFSdjzE9ijogM86iEm4y9sIIJ6yq1o FD58v/AuMm30D9Qloc/AMVU+cNz+ivg= X-MC-Unique: _V1-r2x4NiOz975neibZXQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 20/26] meson: Turn apparmor_profiles into a feature Date: Tue, 1 Jun 2021 10:37:51 +0200 Message-Id: <20210601083757.10194-21-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Similar knobs, such as firewalld_zone and sysctl_config, are already features, so convert this one as well to comply with expectations. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- libvirt.spec.in | 2 +- meson.build | 14 +++++++++++--- meson_options.txt | 2 +- mingw-libvirt.spec.in | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index cc04efe081..529c29214d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1128,7 +1128,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) -Dselinux=3Denabled \ %{?arg_selinux_mount} \ -Dapparmor=3Ddisabled \ - -Dapparmor_profiles=3Dfalse \ + -Dapparmor_profiles=3Ddisabled \ -Dsecdriver_apparmor=3Ddisabled \ -Dudev=3Denabled \ -Dyajl=3Denabled \ diff --git a/meson.build b/meson.build index 55bb724a52..be6765a034 100644 --- a/meson.build +++ b/meson.build @@ -857,11 +857,19 @@ if apparmor_dep.found() conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') endif =20 -if get_option('apparmor_profiles') +if not get_option('apparmor_profiles').disabled() + apparmor_profiles_enable =3D true + if not conf.has('WITH_APPARMOR') - error('Cannot enable apparmor_profiles without apparmor') + apparmor_profiles_enable =3D false + if get_option('apparmor_profiles').enabled() + error('Cannot enable apparmor_profiles without apparmor') + endif + endif + + if apparmor_profiles_enable + conf.set('WITH_APPARMOR_PROFILES', 1) endif - conf.set('WITH_APPARMOR_PROFILES', 1) endif =20 # FIXME rewrite to use dependency() once we can use 2.4.48 diff --git a/meson_options.txt b/meson_options.txt index 2606648b64..f4f40fe9b5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -69,7 +69,7 @@ option('driver_vmware', type: 'feature', value: 'auto', d= escription: 'VMware dri option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozz= o driver') =20 option('secdriver_apparmor', type: 'feature', value: 'auto', description: = 'use AppArmor security driver') -option('apparmor_profiles', type: 'boolean', value: false, description: 'i= nstall apparmor profiles') +option('apparmor_profiles', type: 'feature', value: 'disabled', descriptio= n: 'install apparmor profiles') option('secdriver_selinux', type: 'feature', value: 'auto', description: '= use SELinux security driver') =20 =20 diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 87223e205c..bcc2bd93e3 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -108,7 +108,7 @@ exit 1 -Dcurl=3Denabled \ -Ddocs=3Denabled \ -Dapparmor=3Ddisabled \ - -Dapparmor_profiles=3Dfalse \ + -Dapparmor_profiles=3Ddisabled \ -Dattr=3Ddisabled \ -Daudit=3Ddisabled \ -Dbash_completion=3Ddisabled \ --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536875; cv=none; d=zohomail.com; s=zohoarc; b=ly+JAN/JWc2m28+JBkiludwASeWKsPGygq/erZIDVtLUlKISpKRtXkhCrugBHa93cG4sdJCKjemMzyrq6hIKOyfcSIYXfiQzGZBfccRmW7qMQpawCtCTL5bzJZdUWY6ikyoEaeYDoP6ri0fi9bmrpD4Uo5NqODZZFohuM3eCb9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536875; 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=uNjt4PtsClTQ6a+Vvq5CtwV5Hql50/ZyJVTCUPhdlCk=; b=GsFD9Z89wpl53giwO7/HlAGRI+sJ+roapq7mcytjx8CUJOYg0CO80DmUiFmj82uj37JWS6XPYVUy3faDCPcn1AfbQDk3DoEA9iTb2QEtJ3cxgGqc4s3sN6zvjfR/SCIQxrgDv+01ZIR2uZRVxfMFGmXhI1BRIklox5ui+rdTlRc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536875905541.5657384860726; Tue, 1 Jun 2021 01:41:15 -0700 (PDT) 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-574-WA35T86NPhW9skVst_JzcA-1; Tue, 01 Jun 2021 04:38:55 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2570E107ACED; Tue, 1 Jun 2021 08:38:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01D425C230; Tue, 1 Jun 2021 08:38:51 +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 BFD9518184A4; Tue, 1 Jun 2021 08:38:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cWh7026174 for ; Tue, 1 Jun 2021 04:38:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7B3C5E2D8; Tue, 1 Jun 2021 08:38:32 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA3CD163CD for ; Tue, 1 Jun 2021 08:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536874; 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=uNjt4PtsClTQ6a+Vvq5CtwV5Hql50/ZyJVTCUPhdlCk=; b=jJb/P1UmBi1S8O8CbjcwWr4DEEzBB3Niq/jrkBKBelDhGNV9HmZorSRPtxnhCYMHfZ74JH /dxvd3K31hmWxn+cjkJL1EjSaIhTjrHbvyds7YRYdnAF6wgneDGAg81nETXDayG7sLVzN/ YkUI6OQ02OsSn+1c5tEq0xk9/sOoHRg= X-MC-Unique: WA35T86NPhW9skVst_JzcA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 21/26] meson: Switch to autodetection for apparmor_profiles Date: Tue, 1 Jun 2021 10:37:52 +0200 Message-Id: <20210601083757.10194-22-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Match the behavior of most other features. This will result in a change in behavior, because profiles will now be installed whenever AppArmor support is enabled; on the other hand, this is probably the behavior users expected in the first place. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index f4f40fe9b5..df921c9243 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -69,7 +69,7 @@ option('driver_vmware', type: 'feature', value: 'auto', d= escription: 'VMware dri option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozz= o driver') =20 option('secdriver_apparmor', type: 'feature', value: 'auto', description: = 'use AppArmor security driver') -option('apparmor_profiles', type: 'feature', value: 'disabled', descriptio= n: 'install apparmor profiles') +option('apparmor_profiles', type: 'feature', value: 'auto', description: '= install apparmor profiles') option('secdriver_selinux', type: 'feature', value: 'auto', description: '= use SELinux security driver') =20 =20 --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536806; cv=none; d=zohomail.com; s=zohoarc; b=j2eAxGz0llKT5HcGsKd6X3G1mMIt2+czJylXykKBW6GMZx2pROKhAdQF5IazLPyaPIjk4B32JgkyzRcmdl0a6EbrZqmGe0+xcRF4uwiexcdG9DMrlVbhBAhmTF7/e+otfj9l4SR2go7m4az+1dzZWKoMsbkRLFuVYt2byzfHQ+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536806; 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=I5emgZLAs/Vm5l5rPgGRCn2ZquCDsi0v+Vbfn9ctwEM=; b=Cl56QbjdYz6HcnZMlN3urUMalc4m8GMIYir90M6SDcTvSnkHsUIAUZO6M/rVGbspUKAdQKEUt/BByCCKZu0FxNElVsNrv6IeUzOSVOguKCO/W/9qgmSQaBDD3sZHQHZkKXid6oIABmAgDpvrmiDqohCyyKVyMQFXFo/xJoEAXX0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536806564506.4747352268205; Tue, 1 Jun 2021 01:40:06 -0700 (PDT) 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-144-RpjpQqGUO72uH4zk76cBog-1; Tue, 01 Jun 2021 04:38:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B7BA51020C42; Tue, 1 Jun 2021 08:38:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 979EA5D9D0; Tue, 1 Jun 2021 08:38:46 +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 60EDA181845D; Tue, 1 Jun 2021 08:38:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cX3o026187 for ; Tue, 1 Jun 2021 04:38:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8057D163CD; Tue, 1 Jun 2021 08:38:33 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE51CE2D8 for ; Tue, 1 Jun 2021 08:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536805; 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=I5emgZLAs/Vm5l5rPgGRCn2ZquCDsi0v+Vbfn9ctwEM=; b=bg69XRxqkbmqwXF+2ouf5PeHQnapMMzSkU2wdy3FlxNBUatUSnl/TnOi6bwIogeBdgoI5E AQC+YGMQf7VbSDV4Hm2RO94Cn2uuDhwvRj7mMJu2SZyoL3TFcvZzAWUA+YvdbAHNBDQh0b lmnTKXlg/xxRpyQiA0FzXR1uxdh75hY= X-MC-Unique: RpjpQqGUO72uH4zk76cBog-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 22/26] meson: Switch to autodetection for driver_remote Date: Tue, 1 Jun 2021 10:37:53 +0200 Message-Id: <20210601083757.10194-23-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Match the behavior of most other features. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 14 +++++++++++--- meson_options.txt | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index be6765a034..53c9a038d0 100644 --- a/meson.build +++ b/meson.build @@ -1400,11 +1400,19 @@ endif =20 # build driver options =20 -if get_option('driver_remote').enabled() +if not get_option('driver_remote').disabled() + use_remote =3D true + if not xdr_dep.found() - error('XDR is required for remote driver') + use_remote =3D false + if get_option('driver_remote').enabled() + error('XDR is required for remote driver') + endif + endif + + if use_remote + conf.set('WITH_REMOTE', 1) endif - conf.set('WITH_REMOTE', 1) endif =20 remote_default_mode =3D get_option('remote_default_mode').to_upper() diff --git a/meson_options.txt b/meson_options.txt index df921c9243..fd23469431 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -59,7 +59,7 @@ option('driver_qemu', type: 'feature', value: 'auto', des= cription: 'QEMU/KVM dri option('qemu_user', type: 'string', value: '', description: 'username to r= un QEMU system instance as') option('qemu_group', type: 'string', value: '', description: 'groupname to= run QEMU system instance as') option('qemu_moddir', type: 'string', value: '', description: 'set the dir= ectory where QEMU modules are located') -option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') +option('driver_remote', type: 'feature', value: 'auto', description: 'remo= te driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') option('driver_secrets', type: 'feature', value: 'auto', description: 'loc= al secrets management driver') option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622536728; cv=none; d=zohomail.com; s=zohoarc; b=nD6IbxCwtBJ2G8jmzAEByjcPoP0p4A7PmgRyciIP0S1rs7daBtj//LSEtPVyvNJ6HRGLG/NPD4M07h6g4KQSpH687Zqe5pzR9o3vu3lwAmxlI851oU23PygiXwB9weFFjFUAd3s/gNF6SznSKW63P9jEY+jeJLqUTUAB59f/5Ok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536728; 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=HCCPu6avg16B8+Kh751/sJsjV473goBo7K014gg0urw=; b=k9HxJ1/SBafYG3/h3NULQ/ax+KUvXPBs1x2pdFUEOTr//xG6nsjB4/U3YquxZuxeqa1d7QtfzRlSXPQ1dIUaaZdCyvcpOnidf3TaMvHyEGHnT5+y+FNSJI/TzpqhCBVBSqDSTafEhbghGYiQa15evlT3/sveANIdUwCGs0Z6ChY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622536728909575.4603643319155; Tue, 1 Jun 2021 01:38:48 -0700 (PDT) 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-359-38WBYgIHMdmZb4PijjSIPg-1; Tue, 01 Jun 2021 04:38:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 850A71899452; Tue, 1 Jun 2021 08:38: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 5F016705A0; Tue, 1 Jun 2021 08:38: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 27A0B57DE6; Tue, 1 Jun 2021 08:38:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518cbtO026236 for ; Tue, 1 Jun 2021 04:38:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98B91E2D4; Tue, 1 Jun 2021 08:38:37 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01C63E2D8 for ; Tue, 1 Jun 2021 08:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536727; 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=HCCPu6avg16B8+Kh751/sJsjV473goBo7K014gg0urw=; b=gO95OyDaBhKzkU+WJ7wGVGFvlxV9e/qArt+bSJbhg4KZ6NjQ7bbHt4LQCkieBoTLpkMaUi WQBOzHewVhtDTTJ7uWdbjgpTAc8NyOMVSmiONNnO00YI+27RaMD/az6G31v9O5HX2Bbap7 LGU/vh21scsKRA0nuWaGdUKe9HChzAk= X-MC-Unique: 38WBYgIHMdmZb4PijjSIPg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 23/26] meson: Switch to autodetection for driver_test Date: Tue, 1 Jun 2021 10:37:54 +0200 Message-Id: <20210601083757.10194-24-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Match the behavior of most other features. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 2 +- meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 53c9a038d0..1a2503488a 100644 --- a/meson.build +++ b/meson.build @@ -1704,7 +1704,7 @@ if not get_option('driver_secrets').disabled() and co= nf.has('WITH_LIBVIRTD') conf.set('WITH_SECRETS', 1) endif =20 -if get_option('driver_test').enabled() +if not get_option('driver_test').disabled() conf.set('WITH_TEST', 1) endif =20 diff --git a/meson_options.txt b/meson_options.txt index fd23469431..e2877d5a92 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -62,7 +62,7 @@ option('qemu_moddir', type: 'string', value: '', descript= ion: 'set the directory option('driver_remote', type: 'feature', value: 'auto', description: 'remo= te driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') option('driver_secrets', type: 'feature', value: 'auto', description: 'loc= al secrets management driver') -option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') +option('driver_test', type: 'feature', value: 'auto', description: 'test d= river') option('driver_vbox', type: 'feature', value: 'auto', description: 'Virtua= lBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') option('driver_vmware', type: 'feature', value: 'auto', description: 'VMwa= re driver') --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536735; cv=none; d=zohomail.com; s=zohoarc; b=WofgUj9ESy9Gr8DTuzMCzXQPICBfXE81Aaede9Vqr64hcwOsFSPwsmSiHcjZU4aGiTYnIT6q4fAC01F/v3gAlutQIN9Ym8KPP0OHp4GpcyJLzRnsSeahTKPnaCupeXz1+4E3aMjGS9JWbVapO9ldFNBF2IqULb48EZ1HFii9ZJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536735; 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=GHpQGwXYmTectggBqLCnkTq4wAcvDMX5/RDi/Rpbe4Q=; b=P0x8iPozyqOtVJF+caQLewwCDSRrsKz1kBelNvrmGPh9hXd5csEYRDehacGuNXzxhA414+QcyA4Fy5Uye6qHI9hAaVXO5eJAYr2jlKg58DMmX/Vm9rB1EdyXvRwy5nM1GnSiRshrqscwFjxcRBbOB1go9I6cB/+YX4w6obbKayw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536735847695.2062071235139; Tue, 1 Jun 2021 01:38:55 -0700 (PDT) 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-588-X4fQ2hw3NuSlYqMurz-UjQ-1; Tue, 01 Jun 2021 04:38:47 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4A351899457; Tue, 1 Jun 2021 08:38:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B012D5C230; Tue, 1 Jun 2021 08:38:42 +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 23ACB1818457; Tue, 1 Jun 2021 08:38:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518ccT0026252 for ; Tue, 1 Jun 2021 04:38:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9CA46163CD; Tue, 1 Jun 2021 08:38:38 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0654EE2D4 for ; Tue, 1 Jun 2021 08:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536733; 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=GHpQGwXYmTectggBqLCnkTq4wAcvDMX5/RDi/Rpbe4Q=; b=LqkyjjPnDXh4lPS/vJaglAegin4ylfoO+enP4dF603ykJ70U+89FBdr4tWwnwSQqEpPvhJ moa+eKb5NXI6fvYdH0RAYF3R1acyqtM1nmMRvSID0PwAxGecvduGJi4NJc88N+69Miituo mGPbGmkj9oad8J+czKvlS+8OIjkayDM= X-MC-Unique: X4fQ2hw3NuSlYqMurz-UjQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 24/26] meson: Style tweaks Date: Tue, 1 Jun 2021 10:37:55 +0200 Message-Id: <20210601083757.10194-25-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These checks look different than most similar ones for no particular reason. This commit is better viewed with 'git show -w'. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 1a2503488a..1d9c878fd0 100644 --- a/meson.build +++ b/meson.build @@ -991,12 +991,12 @@ endif libpcap_version =3D '1.5.0' if not get_option('libpcap').disabled() libpcap_dep =3D dependency('pcap', version: '>=3D' + libpcap_version, re= quired: get_option('libpcap')) + if libpcap_dep.found() + conf.set('WITH_LIBPCAP', 1) + endif else libpcap_dep =3D dependency('', required: false) endif -if libpcap_dep.found() - conf.set('WITH_LIBPCAP', 1) -endif =20 libssh_version =3D '0.7' if get_option('driver_remote').enabled() @@ -1139,19 +1139,19 @@ if not get_option('readline').disabled() endif endif endif + if readline_dep.found() + # We need this to avoid compilation issues with modern compilers. + # See 9ea3424a178 for a more detailed explanation + readline_dep =3D declare_dependency( + compile_args: [ '-D_FUNCTION_DEF' ], + dependencies: [ readline_dep ], + ) + + conf.set('WITH_READLINE', 1) + endif else readline_dep =3D dependency('', required: false) endif -if readline_dep.found() - # We need this to avoid compilation issues with modern compilers. - # See 9ea3424a178 for a more detailed explanation - readline_dep =3D declare_dependency( - compile_args: [ '-D_FUNCTION_DEF' ], - dependencies: [ readline_dep ], - ) - - conf.set('WITH_READLINE', 1) -endif =20 if not get_option('sanlock').disabled() sanlock_dep =3D dependency('libsanlock_client', required: get_option('sa= nlock')) @@ -1882,10 +1882,9 @@ if conf.has('WITH_LIBVIRTD') if not get_option('storage_vstorage').disabled() vstorage_enable =3D true if host_machine.system() !=3D 'linux' + vstorage_enable =3D false if get_option('storage_vstorage').enabled() error('Vstorage is supported only on Linux') - else - vstorage_enable =3D false endif endif =20 --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536867; cv=none; d=zohomail.com; s=zohoarc; b=QSkaA0FKvT6FXMpihWnkFEfILgHw1XKc3zINzE4O1ZGLApbmzYsqfHxP+xY/bv3vAF8Gliav/3Zp+i4bCtzjIdq+JVEArDnfrwrRbdTQRfqK4/6VGMphOWmnaYOrzGGQ4OCzy6EbsfPpv23OHjYiSGua2D+nDg3w3JhRj3NrM0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536867; 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=6aV8CnPnH0mM57uD+F3LEtXUI7GXFqBa5Qah8VhQGTs=; b=N776d5Em0xEmh6J0YL+E81DSCK9kkwDVSpNarpE2sr2Z+waRwzJtJavwPhFs7Z9J5GyNX9i9jpLWwWsIPtTaTwap54Cq1Pxw/1oJZT6h/aogCmQZ2e/tADLwoFGTsoc46chqDkWwQ6CKpAukY9mOkc5mYCDyQMRalMjlWq1GrPc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536867247171.33235322914095; Tue, 1 Jun 2021 01:41:07 -0700 (PDT) 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-536-SxAUCIrYMu-2DYKI0TboJQ-1; Tue, 01 Jun 2021 04:38:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C08861020C37; Tue, 1 Jun 2021 08:38:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E5335C230; Tue, 1 Jun 2021 08:38:49 +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 3C8D71818486; Tue, 1 Jun 2021 08:38:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518chx6026265 for ; Tue, 1 Jun 2021 04:38:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 506C1E2D4; Tue, 1 Jun 2021 08:38:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF3A41FBCF for ; Tue, 1 Jun 2021 08:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536866; 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=6aV8CnPnH0mM57uD+F3LEtXUI7GXFqBa5Qah8VhQGTs=; b=TBlIDFltokCYt6/Oem+vuV0HKe397dqx95/i8/pZdhpPmPgyDbkQop35KnKK0IrUeNvB1A qRBJoglg+YEctS5uT57huu6P4A6CThqjrZtZTuoQKrcqpr6raz5pzrUcVl44ehP9pBUDoi JK6bAoAZNwjgn5qCSerqecoqIaUSFeM= X-MC-Unique: SxAUCIrYMu-2DYKI0TboJQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 25/26] meson: Reorganize summary Date: Tue, 1 Jun 2021 10:37:56 +0200 Message-Id: <20210601083757.10194-26-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Different types of drivers are more accurately sorted into separate categories, the "Windows" section has been absorbed into a more generic "Target" section which also contains other information about the OS configuration, and some other smaller tweaks have been applied. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 90 ++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/meson.build b/meson.build index 1d9c878fd0..a5f6ed6f9f 100644 --- a/meson.build +++ b/meson.build @@ -2208,7 +2208,7 @@ endforeach =20 # print configuration summary =20 -driver_summary =3D { +hypervisordriver_summary =3D { 'QEMU': conf.has('WITH_QEMU'), 'OpenVZ': conf.has('WITH_OPENVZ'), 'VMware': conf.has('WITH_VMWARE'), @@ -2219,13 +2219,8 @@ driver_summary =3D { 'Hyper-V': conf.has('WITH_HYPERV'), 'vz': conf.has('WITH_VZ'), 'Bhyve': conf.has('WITH_BHYVE'), - 'Test': conf.has('WITH_TEST'), - 'Remote': conf.has('WITH_REMOTE'), - 'Network': conf.has('WITH_NETWORK'), - 'Libvirtd': conf.has('WITH_LIBVIRTD'), - 'Interface': conf.has('WITH_INTERFACE'), } -summary(driver_summary, section: 'Drivers', bool_yn: true) +summary(hypervisordriver_summary, section: 'Hypervisor drivers', bool_yn: = true) =20 storagedriver_summary =3D { 'Dir': conf.has('WITH_STORAGE_DIR'), @@ -2243,18 +2238,21 @@ storagedriver_summary =3D { 'ZFS': conf.has('WITH_STORAGE_ZFS'), 'Virtuozzo storage': conf.has('WITH_STORAGE_VSTORAGE'), } -summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) +summary(storagedriver_summary, section: 'Storage drivers', bool_yn: true) =20 secdriver_summary =3D { 'SELinux': conf.has('WITH_SECDRIVER_SELINUX'), 'AppArmor': conf.has('WITH_SECDRIVER_APPARMOR'), } -summary(secdriver_summary, section: 'Security Drivers', bool_yn: true) +summary(secdriver_summary, section: 'Security drivers', bool_yn: true) =20 -drivermod_summary =3D { - 'driver_modules': driver_modules_flags.length() > 0, +otherdriver_summary =3D { + 'Test': conf.has('WITH_TEST'), + 'Remote': conf.has('WITH_REMOTE'), + 'Network': conf.has('WITH_NETWORK'), + 'Interface': conf.has('WITH_INTERFACE'), } -summary(drivermod_summary, section: 'Driver Loadable Modules', bool_yn: tr= ue) +summary(otherdriver_summary, section: 'Other drivers', bool_yn: true) =20 libs_summary =3D { 'acl': acl_dep.found(), @@ -2296,54 +2294,60 @@ libs_summary =3D { } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 -win_summary =3D { - 'MinGW': host_machine.system() =3D=3D 'windows', - 'windres': host_machine.system() =3D=3D 'windows', +feature_summary =3D { + 'DTrace': conf.has('WITH_DTRACE_PROBES'), + 'Libvirtd': conf.has('WITH_LIBVIRTD'), + 'driver_modules': driver_modules_flags.length() > 0, + 'firewalld': conf.has('WITH_FIREWALLD'), + 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), + 'nss': conf.has('WITH_NSS'), + 'numad': conf.has('WITH_NUMAD'), + 'pm_utils': conf.has('WITH_PM_UTILS'), + 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), + 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), + 'wireshark_dissector': wireshark_dep.found(), } -summary(win_summary, section: 'Windows', bool_yn: true) +summary(feature_summary, section: 'Other features', bool_yn: true) =20 test_summary =3D { + 'Enabled': build_tests, 'Expensive': use_expensive_tests, 'Coverage': coverage_flags.length() > 0, } summary(test_summary, section: 'Test suite', bool_yn: true) =20 -if conf.has('DEFAULT_LOADER_NVRAM') - loader_res =3D '@0@ !!! Using this configure option is strongly discoura= ged !!!'.format(conf.get_unquoted('DEFAULT_LOADER_NVRAM')) -else - loader_res =3D '' -endif -misc_summary =3D { +docs_summary =3D { + 'Enabled': gen_docs, +} +summary(docs_summary, section: 'Documentation', bool_yn: true) + +build_summary =3D { 'Warning Flags': supported_cc_flags, - 'docs': gen_docs, - 'tests': build_tests, - 'DTrace': conf.has('WITH_DTRACE_PROBES'), - 'firewalld': conf.has('WITH_FIREWALLD'), - 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), - 'nss': conf.has('WITH_NSS'), - 'numad': conf.has('WITH_NUMAD'), - 'Init script': init_script, - 'Char device locks': chrdev_lock_files, - 'Loader/NVRAM': loader_res, - 'pm_utils': conf.has('WITH_PM_UTILS'), - 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), - 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), - 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), } -summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') +summary(build_summary, section: 'Build', bool_yn: true, list_sep: ' ') =20 -devtools_summary =3D { - 'wireshark_dissector': wireshark_dep.found(), +target_summary =3D { + 'OS': host_machine.system(), + 'Init script': init_script, + 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), + 'Char device locks': chrdev_lock_files, } -summary(devtools_summary, section: 'Developer Tools', bool_yn: true) =20 +if conf.has('DEFAULT_LOADER_NVRAM') + loader_nvram =3D conf.get_unquoted('DEFAULT_LOADER_NVRAM') + loader_nvram_warn =3D ' !!! configuring loader/NVRAM is strongly discour= aged !!!' + target_summary +=3D { + 'Loader/NVRAM': '@0@@1@'.format(loader_nvram, loader_nvram_warn), + } +endif if conf.has('WITH_QEMU') qemu_warn =3D '' if qemu_user =3D=3D 'root' qemu_warn =3D ' !!! running QEMU as root is strongly discouraged !!!' endif - priv_summary =3D { - 'QEMU': '@0@:@1@@2@'.format(qemu_user, qemu_group, qemu_warn), + target_summary +=3D { + 'QEMU processes run as': '@0@:@1@@2@'.format(qemu_user, qemu_group, qe= mu_warn), } - summary(priv_summary, section: 'Privileges') endif + +summary(target_summary, section: 'Target', bool_yn: true) --=20 2.31.1 From nobody Tue May 21 09:21:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536807; cv=none; d=zohomail.com; s=zohoarc; b=Ojbyj34f8VD7ditMV1BXpxJ7Qy53084MkhazIBndEUCR4x6o7VSQGuio2NeJzZ1pgSATqgfuSgbK292EoqVX6stuX8DHr7gZq5z6/Kf/a2ILMXcazyBoZQNwCweU7VFFKNtRDoQpkJFigk+/AInNymaZmxz2iUnhUQaeOlGS/Ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536807; 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=rBxB1VQ2FLBmNYV2+SHkQec/12sqt37lNLnWSo09tkQ=; b=cH9kl3whTIjv6db7AWSD/lrPW/Q/20RvGm1/dB++M8F08YSlKthn2HervhRaK+i8vjkuo8j+7Ma27nfYry1JWdNkVsm1a1FVLKHpToS8SYyayzjHflrL967/8B4P4wUMtbwmXdFxo7bCuIcnXsMoKjc8LYbi6CfaqvLAQK5mAzM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536807110546.1624141422468; Tue, 1 Jun 2021 01:40:07 -0700 (PDT) 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-412-w0ONPBdiP8iV3slvr9v5Ow-1; Tue, 01 Jun 2021 04:38:59 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3FA608042C5; Tue, 1 Jun 2021 08:38:54 +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 14C2262464; Tue, 1 Jun 2021 08:38:54 +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 D6D5B5BBEC; Tue, 1 Jun 2021 08:38:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518ciMw026291 for ; Tue, 1 Jun 2021 04:38:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 54F32E2D4; Tue, 1 Jun 2021 08:38:44 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B270D1FBCF for ; Tue, 1 Jun 2021 08:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536806; 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=rBxB1VQ2FLBmNYV2+SHkQec/12sqt37lNLnWSo09tkQ=; b=JJrcJx9aFraZUFfxtJiEJZS9zvQ3EOfXWzgdH9Ct5fqVClybajZV2YI6MrxLrbc5Bnasg+ h0G2qt05YcI7zaOZ8x6JGdEc64Q0IZrjCyW9545J4mQx9WSqa1Y+WP/rfLt1JIT1zNoAI8 1Tu4BMe0lRYxxIbTSMI1l8//L1qrakw= X-MC-Unique: w0ONPBdiP8iV3slvr9v5Ow-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 26/26] meson: Don't include warning flags in summary Date: Tue, 1 Jun 2021 10:37:57 +0200 Message-Id: <20210601083757.10194-27-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The list takes up half a screen on my machine and it doesn't seem useful enough for that to be warranted, especially when it results in other, arguably more relevant parts of the summary being pushed off-screen. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meson.build b/meson.build index a5f6ed6f9f..28c953067c 100644 --- a/meson.build +++ b/meson.build @@ -2321,11 +2321,6 @@ docs_summary =3D { } summary(docs_summary, section: 'Documentation', bool_yn: true) =20 -build_summary =3D { - 'Warning Flags': supported_cc_flags, -} -summary(build_summary, section: 'Build', bool_yn: true, list_sep: ' ') - target_summary =3D { 'OS': host_machine.system(), 'Init script': init_script, --=20 2.31.1