From nobody Sat Dec 21 16:19:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1727164059990688.4364560093683; Tue, 24 Sep 2024 00:47:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CAB4D13DD; Tue, 24 Sep 2024 03:47:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E13601754; Tue, 24 Sep 2024 03:47:10 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CC29513AA; Tue, 24 Sep 2024 03:47:06 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5D99713AB for ; Tue, 24 Sep 2024 03:47:06 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-391-hirf04gCOEGlFCccj-RLuQ-1; Tue, 24 Sep 2024 03:47:04 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E7837190307A for ; Tue, 24 Sep 2024 07:47:03 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 389DB195608A for ; Tue, 24 Sep 2024 07:47:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727164025; h=from:from: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; bh=q6d3hABkUHK+8YmmI/ORNLPsOWHfTnVSGbRK/TOfXLY=; b=QM+IapTYoIqOH7vlQ7ukOydxZs6Mkd8vlOqyGvNVtzSptKiCFnhWICqNEf6h6C023U6SEK qaQEARdo78UDZzNqkcT55cPzfIzNyviL1CvgG5hdDVB5ZFKfG59lzFJnui7wfts1c9lVie vmqJuK13bpbMcOFCTwj8VkEMS5p4/+w= X-MC-Unique: hirf04gCOEGlFCccj-RLuQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 1/2] meson: Restore alphabetical order of reported libraries Date: Tue, 24 Sep 2024 09:46:58 +0200 Message-ID: <1bd8718615ad54d9159eab2aaefb786b5f7b3f60.1727163994.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: E2KNIBENG4IWVVFDFNNZK6R7S7F2YI2M X-Message-ID-Hash: E2KNIBENG4IWVVFDFNNZK6R7S7F2YI2M X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727164062033116600 Content-Type: text/plain; charset="utf-8"; x-default="true" One of previous commits introduced json-c library and reports it in the summary at the end. However, we like the list to be sorted alphabetically which is not the case. Signed-off-by: Michal Privoznik Reviewed-by: Pavel Hrdina --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 477dbc29d8..0ce9132320 100644 --- a/meson.build +++ b/meson.build @@ -2306,8 +2306,8 @@ libs_summary =3D { 'dlopen': dlopen_dep.found(), 'fuse': fuse_dep.found(), 'glusterfs': glusterfs_dep.found(), - 'libbsd': libbsd_dep.found(), 'json-c': json_c_dep.found(), + 'libbsd': libbsd_dep.found(), 'libiscsi': libiscsi_dep.found(), 'libkvm': libkvm_dep.found(), 'libnbd': libnbd_dep.found(), --=20 2.45.2 From nobody Sat Dec 21 16:19:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1727164079538375.53249378585474; Tue, 24 Sep 2024 00:47:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6E35D1421; Tue, 24 Sep 2024 03:47:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6E96A1501; Tue, 24 Sep 2024 03:47:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E636113AD; Tue, 24 Sep 2024 03:47:07 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6C8B513AA for ; Tue, 24 Sep 2024 03:47:07 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-449-T_7CReo_OOKEJ7kuWeGGOg-1; Tue, 24 Sep 2024 03:47:05 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0DD3119B9A82 for ; Tue, 24 Sep 2024 07:47:05 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5C0C9195608A for ; Tue, 24 Sep 2024 07:47:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727164027; h=from:from: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; bh=GnIkiyDI5pYS2e2LIAYEPw/zJHEp+d6tQrlhMwxsNPE=; b=fLf3b8C2ly+7epIlhdwHNWO4+qlhObR/2ISryydjQykC4EWun/zjXJ/cjpsNqSCT4WtuOG GqHbpAkpYoIEiqbp3hhMUkJflSMq43ptZ/dxFSA746vgCyABq9ioDsJvWPcPu/HG/tC0qc 5q2vGDTpUi3bUU79RBkdlrr8IRg/MWk= X-MC-Unique: T_7CReo_OOKEJ7kuWeGGOg-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/2] meson: Sort values reported in summary() Date: Tue, 24 Sep 2024 09:46:59 +0200 Message-ID: <681c83304212fa40ebccd2bbe8487f83e2c1e946.1727163994.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KDTMC4SWI777YBU6DTYVDCBUJGBIMWCX X-Message-ID-Hash: KDTMC4SWI777YBU6DTYVDCBUJGBIMWCX X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727164080112116600 Content-Type: text/plain; charset="utf-8"; x-default="true" So far the only sorted summary() is list of detected libraries. Other sections like hypervisor, storage, security drivers and misc are in random order. Sort them alphabetically. Signed-off-by: Michal Privoznik Reviewed-by: Pavel Hrdina --- meson.build | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/meson.build b/meson.build index 0ce9132320..cfdccd1d05 100644 --- a/meson.build +++ b/meson.build @@ -2246,45 +2246,45 @@ run_command('chmod', 'a+x', meson.current_build_dir= () / 'run', check: true) # print configuration summary =20 driver_summary =3D { - 'QEMU': conf.has('WITH_QEMU'), - 'OpenVZ': conf.has('WITH_OPENVZ'), - 'VMware': conf.has('WITH_VMWARE'), - 'VBox': conf.has('WITH_VBOX'), - 'libxl': conf.has('WITH_LIBXL'), - 'LXC': conf.has('WITH_LXC'), + 'Bhyve': conf.has('WITH_BHYVE'), 'Cloud-Hypervisor': conf.has('WITH_CH'), 'ESX': conf.has('WITH_ESX'), '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'), + 'Libvirtd': conf.has('WITH_LIBVIRTD'), + 'libxl': conf.has('WITH_LIBXL'), + 'LXC': conf.has('WITH_LXC'), + 'Network': conf.has('WITH_NETWORK'), + 'OpenVZ': conf.has('WITH_OPENVZ'), + 'QEMU': conf.has('WITH_QEMU'), + 'Remote': conf.has('WITH_REMOTE'), + 'Test': conf.has('WITH_TEST'), + 'VBox': conf.has('WITH_VBOX'), + 'VMware': conf.has('WITH_VMWARE'), + 'vz': conf.has('WITH_VZ'), } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 storagedriver_summary =3D { 'Dir': conf.has('WITH_STORAGE_DIR'), + 'Disk': conf.has('WITH_STORAGE_DISK'), 'FS': conf.has('WITH_STORAGE_FS'), - 'NetFS': conf.has('WITH_STORAGE_FS'), - 'LVM': conf.has('WITH_STORAGE_LVM'), + 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), - 'SCSI': conf.has('WITH_STORAGE_SCSI'), + 'LVM': conf.has('WITH_STORAGE_LVM'), 'mpath': conf.has('WITH_STORAGE_MPATH'), - 'Disk': conf.has('WITH_STORAGE_DISK'), + 'NetFS': conf.has('WITH_STORAGE_FS'), 'RBD': conf.has('WITH_STORAGE_RBD'), - 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), - 'ZFS': conf.has('WITH_STORAGE_ZFS'), + 'SCSI': conf.has('WITH_STORAGE_SCSI'), 'Virtuozzo storage': conf.has('WITH_STORAGE_VSTORAGE'), + 'ZFS': conf.has('WITH_STORAGE_ZFS'), } 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'), + 'SELinux': conf.has('WITH_SECDRIVER_SELINUX'), } summary(secdriver_summary, section: 'Security Drivers', bool_yn: true) =20 @@ -2352,25 +2352,25 @@ else loader_res =3D '' endif misc_summary =3D { - 'Warning Flags': supported_cc_flags, + 'Char device locks': chrdev_lock_files, 'docs': gen_docs, - 'tests': tests_enabled, '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'), - 'nbdkit': conf.has('WITH_NBDKIT'), 'Init script': init_script, - 'Char device locks': chrdev_lock_files, 'Loader/NVRAM': loader_res, + 'nbdkit': conf.has('WITH_NBDKIT'), + 'nss': conf.has('WITH_NSS'), + 'numad': conf.has('WITH_NUMAD'), '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'), 'SSH proxy': conf.has('WITH_SSH_PROXY'), 'sysctl config': conf.has('WITH_SYSCTL'), + 'tests': tests_enabled, + 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), 'userfaultfd sysctl': conf.has('WITH_USERFAULTFD_SYSCTL'), + 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), + 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), + 'Warning Flags': supported_cc_flags, } if conf.has('WITH_NETWORK') misc_summary +=3D { --=20 2.45.2