From nobody Tue May 14 20:11:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1698029497; cv=none; d=zohomail.com; s=zohoarc; b=ggrk/owopQVSoH9bp4D0bZTsTL2gpHicxtpRdz8GzilukNw8LYuUSVcQlEA0r3swCHXw6+ryDGMkEZgaN9blwMVw787vsOqcHg/T5LVH8xNiw86pFk29ev9JDEMllY4EpzGsm87hY2uLUuXsMG34ynkUrTvoE88xJtjVkd8xqg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698029497; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Oz4jnUosdNeDRcYsxgSNI/AcX3whiw3KU/uJ2lGuo34=; b=arrFFV0567mSd8rbQWRC7yVzjYBX+8AWIpSf0U0IzNsEIy6PHRnl8LLg2i49oXt949a5HyzoGeJSw/EOj8k54jUcWhduM9HJwStpwGBz60V100TxEnN0tTCqu4vlqwJ8y/NXN6apqBQ5aR4a3jJ9pWWezsS0lDkvASGOr0STWww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1698029497168445.31250331393494; Sun, 22 Oct 2023 19:51:37 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-249-zqGmLKT2Pl6M48epggDI8g-1; Sun, 22 Oct 2023 22:51:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BED9988B770; Mon, 23 Oct 2023 02:51:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1464340C6F79; Mon, 23 Oct 2023 02:51:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DA4A91946588; Mon, 23 Oct 2023 02:51:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 886221946587 for ; Mon, 23 Oct 2023 02:51:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3794B492BFE; Mon, 23 Oct 2023 02:51:27 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.22.8.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EE32492BFB; Mon, 23 Oct 2023 02:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698029496; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Oz4jnUosdNeDRcYsxgSNI/AcX3whiw3KU/uJ2lGuo34=; b=AOeORi5zDF/DoPONXmlh28kHCneramARTB1CXs+P9/uX5rMUqrzj4F2R9g62QH3OGO8s0B Qu6Cb4W2ss78KcZE9RKdh1rVCIgM8v+SBkpNHH6/Iy58rb9PfUzjPucouU9pORFEs+6unq HYhe05xgI1HmlWShcOkfsyzHaZERhj4= X-MC-Unique: zqGmLKT2Pl6M48epggDI8g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH] specfile: use correct option for nbdkit in mingw build Date: Sun, 22 Oct 2023 22:48:33 -0400 Message-ID: <20231023025126.84647-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathon Jongsma , Andrea Bolognani Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1698029497430100001 Content-Type: text/plain; charset="utf-8"; x-default="true" commit v9.8.0-40-g7cbd8c4230 changed the name of the option that enables/disables nbdkit support in the build from "libnbd" to "nbdkit", but one use of "-Dlibnbd=3Ddisabled" was missed in libvirt.specfile.in - the meson commandline for mingw, causing the build to fail. This patch changes that line to "-Dnbdkit=3Ddisabled", thus unbreaking the rpm build. Signed-off-by: Laine Stump --- This patch does fix a build-breaker, but I didn't want to push it in case my comment was incorrect (I won't pretend that I've paid attention to nbdkit) libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index fe54c45c5c..262c59eb5b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1356,7 +1356,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dglusterfs=3Ddisabled \ -Dhost_validate=3Ddisabled \ -Dlibiscsi=3Ddisabled \ - -Dlibnbd=3Ddisabled \ + -Dnbdkit=3Ddisabled \ -Dlibnl=3Ddisabled \ -Dlibpcap=3Ddisabled \ -Dlibssh2=3Ddisabled \ --=20 2.41.0