From nobody Fri May 17 09:01:51 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 1704448753544650.5127621576604; Fri, 5 Jan 2024 01:59:13 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7069B191C; Fri, 5 Jan 2024 04:59:12 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2C0D61722; Fri, 5 Jan 2024 04:57:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6D7391722; Fri, 5 Jan 2024 04:57:50 -0500 (EST) 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 CFFE7181C for ; Fri, 5 Jan 2024 04:57:49 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-353-JX9KlFepM7OeJGJomTc5DQ-1; Fri, 05 Jan 2024 04:57:48 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D71FD85A588 for ; Fri, 5 Jan 2024 09:57:47 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45081492BF0 for ; Fri, 5 Jan 2024 09:57:47 +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.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: JX9KlFepM7OeJGJomTc5DQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH] libvirt.spec: Fix nbdkit selection logic on mingw and old rhel Date: Fri, 5 Jan 2024 10:57:46 +0100 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: GN546KAL6VKJKKEBYFVRH3DP6DTFBDFV X-Message-ID-Hash: GN546KAL6VKJKKEBYFVRH3DP6DTFBDFV X-MailFrom: pkrempa@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: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1704448755415100001 rhel-8 lacks 'pidfd_open()' support and thus nbdkit can't be enabled there. mingw builds explicitly disable nbdkit support, but use '--auto-features=3Denabled' thus omitting setting of 'nbdkit_config_default' results in meson thinking we want to enable it: ../meson.build:1018:2: ERROR: Problem encountered: nbdkit_config_default = requires nbdkit to be enabled Disable it explicitly. The meson logic might need to be fixed eventually when switching it on by default. Fixes: 9eabf14afbd429af1be195723fdeab5ccdd0b2cd Signed-off-by: Peter Krempa Reviewed-by: Andrea Bolognani --- libvirt.spec.in | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2f2d713732..8413e3c19a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -179,13 +179,19 @@ # default if the OS ships a SELinux policy that allows libvirt to launch i= t. # Right now that's not the case anywhere, but things should be fine by the= time # Fedora 40 is released. -# -# TODO: add RHEL 9 once a minor release that contains the necessary SELinux -# bits exists (we only support the most recent minor release) %if %{with_qemu} - %define with_nbdkit 0%{!?_without_nbdkit:1} - %if 0%{?fedora} >=3D 40 - %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_def= ault:1} + # rhel-8 lacks pidfd_open + %if 0%{?fedora} || 0%{?rhel} >=3D 9 + %define with_nbdkit 0%{!?_without_nbdkit:1} + + # setting 'with_nbdkit_config_default' must be done only when comp= iling + # in nbdkit support + # + # TODO: add RHEL 9 once a minor release that contains the necessar= y SELinux + # bits exists (we only support the most recent minor release) + %if 0%{?fedora} >=3D 40 + %define with_nbdkit_config_default 0%{!?_without_nbdkit_config= _default:1} + %endif %endif %endif @@ -1397,6 +1403,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dhost_validate=3Ddisabled \ -Dlibiscsi=3Ddisabled \ -Dnbdkit=3Ddisabled \ + -Dnbdkit_config_default=3Ddisabled \ -Dlibnl=3Ddisabled \ -Dlibpcap=3Ddisabled \ -Dlibssh2=3Ddisabled \ --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org