From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235585; cv=none; d=zohomail.com; s=zohoarc; b=fHMUHCaCTqEGuB6W8w4pZX+RLcWWEFl4cPx4pcbe1HB4MEwQRNzmpHIF1wOAvxkPnhlH5YxDVkMdPG04i7FNeP/wCBxxaM+H2fkxV216EdEYHxRouvK31G4I6HaBk8QjlOyN8xJw/ogD9OdJIx+EQygVb2c7bQTUFk8O2cxKGmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235585; 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=yXqIwOb5OESw9OI+5qKUYstJVfEBtaJFmu6vJ8F3PKA=; b=fJA1oPz2ks0+XRvupKgHgJwVlSTozqPV6+tDNxnaXcoMuME/Al1LdR6dlrMGy3eNFaa0NF9JEyR2SpJeH46I5KO/+1lm2aUxDFJelRAXQ1PT9MTNCLBqi5nifZH5qmNnvtdSfM2DSLlVvXXpj8Sfd+YyJcW8yOlFEj94MSkgtqg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235585013193.62658342489476; Fri, 9 Oct 2020 02:26:25 -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-296-XqFX5RiUPXyFJ4rROivChQ-1; Fri, 09 Oct 2020 05:26:21 -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 878A41029D24; Fri, 9 Oct 2020 09:26:16 +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 63D095C1C7; Fri, 9 Oct 2020 09:26:16 +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 067468C7D4; Fri, 9 Oct 2020 09:26:16 +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 0999Psi1009238 for ; Fri, 9 Oct 2020 05:25:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 75CAF21E95; Fri, 9 Oct 2020 09:25:54 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE83B196FE for ; Fri, 9 Oct 2020 09:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235583; 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=yXqIwOb5OESw9OI+5qKUYstJVfEBtaJFmu6vJ8F3PKA=; b=iN1Sm6C73zfB5bcIjsv2im6B/uaHL5g2YgtmpHp/6+3W6amehcgfKdoI+quBniLewrNaCf 9itjtETyr3HsrssUuQ3Hg8+wT8LPfFr5YEgVMz9pcXAm7fKWBntOUwp6we+wQW84DPRhrw JGE5tNVNRi32fEJ9fH4JX37js5UPWKI= X-MC-Unique: XqFX5RiUPXyFJ4rROivChQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/9] spec: Simplify setting features off by default Date: Fri, 9 Oct 2020 11:25:38 +0200 Message-Id: <20201009092546.15546-2-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" The right-hand side of these expressions will always evaluate to zero. Stop obfuscating this fact. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 80563ce6ef..36a2cac2b2 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -85,15 +85,15 @@ %endif =20 # A few optional bits off by default, we enable later -%define with_fuse 0%{!?_without_fuse:0} -%define with_sanlock 0%{!?_without_sanlock:0} -%define with_numad 0%{!?_without_numad:0} -%define with_firewalld 0%{!?_without_firewalld:0} -%define with_firewalld_zone 0%{!?_without_firewalld_zone:0} -%define with_libssh2 0%{!?_without_libssh2:0} -%define with_wireshark 0%{!?_without_wireshark:0} -%define with_libssh 0%{!?_without_libssh:0} -%define with_bash_completion 0%{!?_without_bash_completion:0} +%define with_fuse 0 +%define with_sanlock 0 +%define with_numad 0 +%define with_firewalld 0 +%define with_firewalld_zone 0 +%define with_libssh2 0 +%define with_wireshark 0 +%define with_libssh 0 +%define with_bash_completion 0 =20 # Finally set the OS / architecture specific special cases =20 --=20 2.26.2 From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235570; cv=none; d=zohomail.com; s=zohoarc; b=PgxqfxPkoRfSl2logSS1GPVMFu72vKPlSTHwk0KQv+tDBWgTrGcwHWw4hys++nti6BtAWUf0EQAf5PrnU+hLiJhZxiPNJeDdaFVS/GzLEo3t+TxxU9t1e1W1EXQV1vIJ8X3zwA5dCTk8r690jdVooVQr9ngxfDpS0TpFwzRf1HE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235570; 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=v8FolKmhrptWAt6axdMB7j3/nMi0CsfPlsDiEeTNtfs=; b=hKcFpVLc739FY/g+0f3C4Da9bfCUbnXmZE97C57LGkpeCrvN60GUUBxgdjeg2AkK9s5XUslXGp080dTOu4Spi9tuFe1jcRF/vgVOt3zob7hhpHulx3Oklk/PtmxSrTmyjRuZwvP4L5OW5nkD50x9+WTI2FQ6XzgYxxGoddd2B0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235570587966.681101183226; Fri, 9 Oct 2020 02:26:10 -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-n_OOjJ-GPwSSP-vtoT7lZQ-1; Fri, 09 Oct 2020 05:26:07 -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 08489190A3E1; Fri, 9 Oct 2020 09:26:01 +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 BD1AB5D9E8; Fri, 9 Oct 2020 09:25:59 +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 9A1AD18408A1; Fri, 9 Oct 2020 09:25:57 +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 0999Ptiq009284 for ; Fri, 9 Oct 2020 05:25:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 810032632F; Fri, 9 Oct 2020 09:25:55 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB5E82632B for ; Fri, 9 Oct 2020 09:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235569; 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=v8FolKmhrptWAt6axdMB7j3/nMi0CsfPlsDiEeTNtfs=; b=bEJF+IBXNLqxaCkvjUJR1mR+Lc7IrJddFtK1vFKul9KP6RtOL88r96zLmjxp7saaHFhPQ0 GSYJsCTiIw8aoq2lN1DvRQOXLRSAw40I0c4vyjd2bX994Dd5ik9By4jvQYSDTmcJ/g9H/+ ltvLrKAWkS3lXur3UYLXXHRz6holYKs= X-MC-Unique: n_OOjJ-GPwSSP-vtoT7lZQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/9] spec: firewalld is always enabled Date: Fri, 9 Oct 2020 11:25:39 +0200 Message-Id: <20201009092546.15546-3-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" Knowing this, we can remove some code. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 36a2cac2b2..508b4c8dcc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -88,7 +88,6 @@ %define with_fuse 0 %define with_sanlock 0 %define with_numad 0 -%define with_firewalld 0 %define with_firewalld_zone 0 %define with_libssh2 0 %define with_wireshark 0 @@ -138,8 +137,6 @@ %endif %endif =20 -%define with_firewalld 1 - %if 0%{?fedora} || 0%{?rhel} > 7 %define with_firewalld_zone 0%{!?_without_firewalld_zone:1} %endif @@ -1089,12 +1086,6 @@ exit 1 %define arg_sanlock -Dsanlock=3Ddisabled %endif =20 -%if %{with_firewalld} - %define arg_firewalld -Dfirewalld=3Denabled -%else - %define arg_firewalld -Dfirewalld=3Ddisabled -%endif - %if %{with_firewalld_zone} %define arg_firewalld_zone -Dfirewalld_zone=3Denabled %else @@ -1170,7 +1161,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) -Dlibpcap=3Denabled \ -Daudit=3Denabled \ -Ddtrace=3Denabled \ - %{?arg_firewalld} \ + -Dfirewalld=3Denabled \ %{?arg_firewalld_zone} \ %{?arg_wireshark} \ -Dpm_utils=3Ddisabled \ --=20 2.26.2 From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235569; cv=none; d=zohomail.com; s=zohoarc; b=PVZnYIkp3ACIvmHcw3QGBlrl9FgkFcdcjUmeBWxhXec3AMvMEdFvtPYX/3lIKvMFke2Mjx7jZUI0c+1zugEEzCU6r5URxSp5cG9O44F0ohi2wbUK7PyjeXiThs2eIM1UlkiRS1oYyQSCaFC7a4yv8fPoK3FvOQ3wYQM/Dh1kRxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235569; 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=ofT76bE0KgvTMzJl1v6UTfpbz1/Qf/RcK7MdPVzalY4=; b=Xbtj2Vk+Yhomzbsxt8NF1kDpRCIZ+/BG4/8EeQKMd0u48iU5mjbAywY4rIT2Ls9dLaZAyUH2Dv+SAMNm6Xw5c4SUNKpjZP+cPlMPjY29CYspAmbVz8+StDRyiYABuWDCLZMROXYOWD72l6Fl3pMzzooORNMdyO++4qasAizLXOY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235569739370.64497720920167; Fri, 9 Oct 2020 02:26:09 -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--IlKRQF6PnCEdeja_Mdyew-1; Fri, 09 Oct 2020 05:26:06 -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 24E80805F06; Fri, 9 Oct 2020 09:26:00 +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 C29C36EF64; Fri, 9 Oct 2020 09:25:59 +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 16C0B8C7CC; Fri, 9 Oct 2020 09:25:58 +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 0999PuSX009311 for ; Fri, 9 Oct 2020 05:25:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id C6B1C2632B; Fri, 9 Oct 2020 09:25:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE4E52633B for ; Fri, 9 Oct 2020 09:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235568; 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=ofT76bE0KgvTMzJl1v6UTfpbz1/Qf/RcK7MdPVzalY4=; b=gkGKdMJYLEsrzSYEvJN8diUhXaZHqvpJss7tDb5NxHzkg9re6v7WuwxaWaPHkVt7QhJviX ehvkDsB2n2u+J9qMHOyoqzKuZ7++yqTxtwcxQktwy31fm0GxFA0cPCOlV9zKLwp6OBi2F7 ZzBx0MDFfPXzu6wqsjwpmjt1ljvzMn8= X-MC-Unique: -IlKRQF6PnCEdeja_Mdyew-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/9] spec: bash completion actually defaults to on Date: Fri, 9 Oct 2020 11:25:40 +0200 Message-Id: <20201009092546.15546-4-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" Remove the red herring. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 508b4c8dcc..66f0560a5c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -84,6 +84,9 @@ %define with_storage_iscsi_direct 0 %endif =20 +# Other optional features +%define with_bash_completion 0%{!?_without_bash_completion:1} + # A few optional bits off by default, we enable later %define with_fuse 0 %define with_sanlock 0 @@ -92,7 +95,6 @@ %define with_libssh2 0 %define with_wireshark 0 %define with_libssh 0 -%define with_bash_completion 0 =20 # Finally set the OS / architecture specific special cases =20 @@ -174,8 +176,6 @@ %define with_libssh 0%{!?_without_libssh:1} %endif =20 -%define with_bash_completion 0%{!?_without_bash_completion:1} - %if %{with_qemu} || %{with_lxc} # numad is used to manage the CPU and memory placement dynamically, # it's not available on many non-x86 architectures. --=20 2.26.2 From nobody Sat Apr 20 04:40:28 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=1602235586; cv=none; d=zohomail.com; s=zohoarc; b=AZU5q9xZJSVjmabypaXF5S9ysyHlPyQtDNYhBrVTOoWs4qAlnMCnsTrpMoWQ81FatmQZitRrMVDLSvrZXGiUc0pJaZkkiHJBlHdnQV/sSEjpZTsj/9XkbG4oNR2fzZbccyds+W40BrVtdxVsZJJ5RCkn7KFFoLh7NlJBjO78QKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235586; 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=SLpOx88icA5i+ej5wkbvB+9RkbcmpXIQeQoDwsDRQyQ=; b=VU7r2VQMMR5TjyA6Mq1xtLShxPm4euKKlJgNCGM+bJbqNkknLlcRY74Ynh7jZTOk3a+XovN7rz0IVBqIm+NhWOSJNjN9L8UVeRCDcCRp6Mp9TkbO5oTCOw9hMThD5MTJ+fv46cdfH5npLFzX1yvvFK0YRZfuxCJcnUPH0WZVzXc= 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 160223558636114.005977790251222; Fri, 9 Oct 2020 02:26:26 -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-397-Qzb2Ljh2OvG5GGtc90KhYg-1; Fri, 09 Oct 2020 05:26:22 -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 84038190A3E3; Fri, 9 Oct 2020 09:26:16 +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 6325060BFA; Fri, 9 Oct 2020 09:26:16 +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 07DE318408AD; Fri, 9 Oct 2020 09:26:16 +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 0999PwpB009359 for ; Fri, 9 Oct 2020 05:25:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5252721E95; Fri, 9 Oct 2020 09:25:58 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6374D196FE for ; Fri, 9 Oct 2020 09:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235585; 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=SLpOx88icA5i+ej5wkbvB+9RkbcmpXIQeQoDwsDRQyQ=; b=azi7ZGYJMPj1IKDPSTPtnZ1PrhLp20xuXYyEDXShDsG5cnEma0oXGGKYGCZyN/pvw0IjRU Uxe+SAiax2/54LDg4hkFFX9K+0BwwH5sli2Mt5LaAhzkDNMw0SKk0InfJQSV0JkJ2CO0od 0sjCo54aYFvqvgZ1Ky6l8PheO2acrOE= X-MC-Unique: Qzb2Ljh2OvG5GGtc90KhYg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/9] spec: Move with_numactl definition Date: Fri, 9 Oct 2020 11:25:41 +0200 Message-Id: <20201009092546.15546-5-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" Keep it close to similar ones. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 66f0560a5c..d9fa27a5fe 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -68,8 +68,6 @@ %endif %endif =20 -%define with_numactl 0%{!?_without_numactl:1} - # F25+ has zfs-fuse %if 0%{?fedora} %define with_storage_zfs 0%{!?_without_storage_zfs:1} @@ -86,6 +84,7 @@ =20 # Other optional features %define with_bash_completion 0%{!?_without_bash_completion:1} +%define with_numactl 0%{!?_without_numactl:1} =20 # A few optional bits off by default, we enable later %define with_fuse 0 --=20 2.26.2 From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235590; cv=none; d=zohomail.com; s=zohoarc; b=gziMyw9EeR6q6rlEbusxd4cQLj9JJF2uASgbMERFH7zz/c46i6Up3L8n2g2vcM2wZrMTU9Jmzf+jxxeFAfHiiiBneLYjsZ2Tf/qmGAGzzWCeHmWgLHhpFqc+igjQNZqocXGtDQfGqoaCsWfjMEW0WIg24spp6BkXze2tzoNTxwU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235590; 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=337LU8lkID/BM/B9ISXP4YEA1rWDP5LDPsm4dK6SY7c=; b=DfMpyJFTJaYDYEl3myLApW4tk527M4QQ0NaC61KyQb1K63B6X+OTprfpaULHY9asEdCWC8JZ2IvH7Izsm+c65tUiJ3wN7IspmyN8LzMLNROafrOl5hNxYYfGpad0FsjgD8fPq7/BnPS84dOFYJb5z3eXoagq9akOJR5DfVopACo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235590658720.406668225282; Fri, 9 Oct 2020 02:26:30 -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-534-Jvhw6iZQMam8Dg9XxfkFDA-1; Fri, 09 Oct 2020 05:26:27 -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 1265B8799F0; Fri, 9 Oct 2020 09:26:19 +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 E1AD826335; Fri, 9 Oct 2020 09:26:18 +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 AF94D8C7D5; Fri, 9 Oct 2020 09:26:18 +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 0999PxNP009380 for ; Fri, 9 Oct 2020 05:25:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id D755A196FE; Fri, 9 Oct 2020 09:25:59 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6FD32632B for ; Fri, 9 Oct 2020 09:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235589; 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=337LU8lkID/BM/B9ISXP4YEA1rWDP5LDPsm4dK6SY7c=; b=FzLRZKUtFKiNBsiihHIZzw5q+IGDObfJMChYm1cXG/E8d/GoRM5Mcg0NLOYMuRUr3SR7jr X/FqSM4AK8wq2+52BrBuB8Vf9CzTz0NVl7mIiK8D6iClJlfcHxiZ4uN1dBAACmav87xob0 Wkdy5ASWJp2S6J9bQ5UCmxWjwMWUKGU= X-MC-Unique: Jvhw6iZQMam8Dg9XxfkFDA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 5/9] spec: Introduce with_dmidecode Date: Fri, 9 Oct 2020 11:25:42 +0200 Message-Id: <20201009092546.15546-6-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" To keep things maintainable, we want to have architecture handling all in one spot instead of sprinkling %ifarch conditionals all over the place. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d9fa27a5fe..ae6381fe3e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -94,6 +94,7 @@ %define with_libssh2 0 %define with_wireshark 0 %define with_libssh 0 +%define with_dmidecode 0 =20 # Finally set the OS / architecture specific special cases =20 @@ -183,6 +184,10 @@ %endif %endif =20 +%ifarch %{ix86} x86_64 + %define with_dmidecode 0%{!?_without_dmidecode:1} +%endif + # Force QEMU to run as non-root %define qemu_user qemu %define qemu_group qemu @@ -435,7 +440,7 @@ Requires: iproute-tc %endif =20 Requires: polkit >=3D 0.112 -%ifarch %{ix86} x86_64 +%if %{with_dmidecode} # For virConnectGetSysinfo Requires: dmidecode %endif --=20 2.26.2 From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235659; cv=none; d=zohomail.com; s=zohoarc; b=H0z4orC/XcsjI+QCebmGSuRk5qNpVA4oLxseB++SMEUnuMClek+4aiy29qmDI2Wlcq4PGeFupRK8SvICX30ccnNRelYElzSwNzPpqiPCcb5S8e7726XHNwnC9wNv4wFn3UKrzbc7z5XqwkY9AccCnt1CIPXd+7rZhZ/2sVPh4FU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235659; 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=+uG9G/QnwzXHrF7NAB2+Fgu2dOFP5XKtK2s70hVXy0o=; b=hT37kvHQVo2Ih8zInAsBh48iCnJjniM5ZJ1g/4ISPivmud1wz3lsVXPJ11qTkR6tvHawSp4chGKMWqIAjlK+COKe/AgJ1cD1cEzYa3FVNGN7stnvAEBOclpG0BMC2DsBZITzAcH33S3O4beV2QFPXBK4YWVNF0AyW9Cq1Hbdv2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235659221491.0247977235522; Fri, 9 Oct 2020 02:27: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-533-vk6DAeqhNH226ox3w7tPkw-1; Fri, 09 Oct 2020 05:26:30 -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 C5A8B425F0; Fri, 9 Oct 2020 09:26:21 +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 A60747665A; Fri, 9 Oct 2020 09:26:21 +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 70A158C7D9; Fri, 9 Oct 2020 09:26:21 +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 0999Q1P5009404 for ; Fri, 9 Oct 2020 05:26:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D38D21E95; Fri, 9 Oct 2020 09:26:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CE7C196FE for ; Fri, 9 Oct 2020 09:26:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235658; 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=+uG9G/QnwzXHrF7NAB2+Fgu2dOFP5XKtK2s70hVXy0o=; b=eUqxs1cHhW4bXC1renqdGqMzwT2jWuoxsn77UyJWbYgXRSUr7NNg8vIHjtYVPh87cYK+ra gmkMHi95o406dEn4LKamy5UzrRuTCM106q4Sahx7tjmLerLcFlslVnIu45mPAct8Yckr0E pX0CArAhbAXDfgGhiKsh0Gu0azOmOrI= X-MC-Unique: vk6DAeqhNH226ox3w7tPkw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 6/9] spec: Move _vpath_builddir definition Date: Fri, 9 Oct 2020 11:25:43 +0200 Message-Id: <20201009092546.15546-7-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" It belongs before package-specific feature flags are defined. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index ae6381fe3e..dd2247d712 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -12,6 +12,11 @@ %define supported_platform 0 %endif =20 +# On RHEL 7 and older macro _vpath_builddir is not defined. +%if 0%{?rhel} && 0%{?rhel} <=3D 7 + %define _vpath_builddir %{_target_platform} +%endif + # The hypervisor drivers that run in libvirtd %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} @@ -31,11 +36,6 @@ %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x %endif =20 -# On RHEL 7 and older macro _vpath_builddir is not defined. -%if 0%{?rhel} && 0%{?rhel} <=3D 7 - %define _vpath_builddir %{_target_platform} -%endif - %ifarch %{qemu_kvm_arches} %define with_qemu_kvm %{with_qemu} %else --=20 2.26.2 From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235624; cv=none; d=zohomail.com; s=zohoarc; b=ZQQffT5/iRkSqm1wbOVN+hdyZFD/9e8Va6nLGU0Snbz0jE9eJLmNgJ4XNhwSfitUFfbsTZ2c+LBxOb31TCKcNdzMxEtXqRYsXrSgdxnEZRRjcmqPUFSJYciaBxi4YWOviyt59IKuFv2O43c7x7c2y/xFKwDI8QPDthxBgf9dJtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235624; 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=4bYtQQGTXB0qFkDglpwxEoi7HG0LXfD9Mkn2L0YHaBA=; b=iJEoqEP0GzU7yvOWM4Df5sRgRXSYqCVaZGdq58iVTWvIKCtbqpPvsjb44pqR5xSqYk95zu6A+TjUe15t1/eBY8ySem4psPNNxpUhDNZ/m7Mo/OsXCQooj7pJ5m1LJWaelp21mRWqMMTrqgiYpmiYt+eBpv2nQCiJXfie9b8pONY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235624583110.571358793424; Fri, 9 Oct 2020 02:27: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-296-wkT-U-c_McycbWYatLLQjg-1; Fri, 09 Oct 2020 05:26:21 -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 8979B64086; Fri, 9 Oct 2020 09:26:16 +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 68FA77665B; Fri, 9 Oct 2020 09:26:16 +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 0DE5A18408AE; Fri, 9 Oct 2020 09:26:16 +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 0999Q21M009419 for ; Fri, 9 Oct 2020 05:26:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id B70F3196FE; Fri, 9 Oct 2020 09:26:02 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E02482632B for ; Fri, 9 Oct 2020 09:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235623; 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=4bYtQQGTXB0qFkDglpwxEoi7HG0LXfD9Mkn2L0YHaBA=; b=Xg8OWOKMenD+i5UWtwHmDAInjONyMrM3MvgfbXYEq6UZVwkX/Q5V3BM5RuSP0rkJ8rMcwz oTZiZsCKss/ict5tZSFfOVxald5eQPR/2j0uI/huyB+n4K964zkUjyMR27t47VlFAu8XPG 6kJfQCSSzptwSSMRn7Mpn8x0vL1aJNA= X-MC-Unique: wkT-U-c_McycbWYatLLQjg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 7/9] spec: Drop s390 architecture from conditionals Date: Fri, 9 Oct 2020 11:25:44 +0200 Message-Id: <20201009092546.15546-8-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" Neither Fedora nor RHEL build packages on this architecture. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa Reviewed-by: Thomas Huth --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index dd2247d712..7ab62ebd63 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -109,12 +109,12 @@ %endif =20 # Numactl is not available on many non-x86 archs -%ifarch s390 s390x %{arm} riscv64 +%ifarch s390x %{arm} riscv64 %define with_numactl 0 %endif =20 # zfs-fuse is not available on some architectures -%ifarch s390 s390x aarch64 riscv64 +%ifarch s390x aarch64 riscv64 %define with_storage_zfs 0 %endif =20 @@ -179,7 +179,7 @@ %if %{with_qemu} || %{with_lxc} # numad is used to manage the CPU and memory placement dynamically, # it's not available on many non-x86 architectures. - %ifnarch s390 s390x %{arm} riscv64 + %ifnarch s390x %{arm} riscv64 %define with_numad 0%{!?_without_numad:1} %endif %endif --=20 2.26.2 From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235624; cv=none; d=zohomail.com; s=zohoarc; b=W6drEVIFKxfA9lgSbwg3pjieMNtttwQVaWPCc1P3EZtMgDJH67pes1poZ8AwHVQWpXEm84Dn6T5QDztjxzbt/kAtenctggPmwjrBtjRVlLgtWCeG6HGGRgOTAEurQSnjBKb2lTgG60H0Xrv3ArAKLzyUfg65tTKejk9/NSQ9jiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235624; 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=M86UzaRKNLBEkpH6kHn5Fv4hLmPaGkVX9k5ey8TPwpg=; b=dQ7Fkujr5vVZrGFBHrdtREPvKN5LqrWoLwxS8/XF6WnxstnNOsT1fYGtBg3vW+zsoKOPBjUQip/U3up82Gc6dc7icfv/QkcNgmZO9u1pZtuDmXLmBoQ7wTgIOElQyDXf1CaN/OeERAw72DSAjnPfzduKCSXTIG65LFTPYNbJbiY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235624295252.8145376480918; Fri, 9 Oct 2020 02:27: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-318-BQI6Bk_OOhmRmyZk0ujHUA-1; Fri, 09 Oct 2020 05:26:24 -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 20971805F00; Fri, 9 Oct 2020 09:26:19 +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 F39896EF6E; Fri, 9 Oct 2020 09:26:18 +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 C16A118408C2; Fri, 9 Oct 2020 09:26:18 +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 0999Q4fp009453 for ; Fri, 9 Oct 2020 05:26:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 44675196FE; Fri, 9 Oct 2020 09:26:04 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 55A222632B for ; Fri, 9 Oct 2020 09:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235623; 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=M86UzaRKNLBEkpH6kHn5Fv4hLmPaGkVX9k5ey8TPwpg=; b=V/FnFrdO4njMUg1AwtjKgN19gjVSBZvZvEaxNW3uJsmHpwJqlJDqhhbgpk/X6uEcIdNXbR CGcUcDe5a5M36OGWh70gPfnPs7UGscvQ2wJdT9GoCqUrdLXUbF2NM2HLm+daX1muzp25GH YTB4YSLhXH0hnZiOAebH/oyr4iNW8fI= X-MC-Unique: BQI6Bk_OOhmRmyZk0ujHUA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 8/9] spec: Refactor qemu_kvm_arches definition Date: Fri, 9 Oct 2020 11:25:45 +0200 Message-Id: <20201009092546.15546-9-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" There's no need to set a default for it if we're going to override it immediately afterwards anyway, and setting with_qemu_tcg at the same time only makes things more confusing. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7ab62ebd63..a0cd5ce5af 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -17,31 +17,30 @@ %define _vpath_builddir %{_target_platform} %endif =20 +%define qemu_kvm_arches %{ix86} x86_64 %{power64} %{arm} aarch64 s= 390x +%if 0%{?rhel} + %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x +%endif + # The hypervisor drivers that run in libvirtd %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} %define with_libxl 0%{!?_without_libxl:1} %define with_vbox 0%{!?_without_vbox:1} =20 -%define with_qemu_tcg %{with_qemu} - -%define qemu_kvm_arches %{ix86} x86_64 - -%if 0%{?fedora} - %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aarch64 -%endif - -%if 0%{?rhel} - %define with_qemu_tcg 0 - %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x -%endif - %ifarch %{qemu_kvm_arches} %define with_qemu_kvm %{with_qemu} %else %define with_qemu_kvm 0 %endif =20 +%define with_qemu_tcg %{with_qemu} + +# RHEL disables TCG on all architectures +%if 0%{?rhel} + %define with_qemu_tcg 0 +%endif + %if ! %{with_qemu_tcg} && ! %{with_qemu_kvm} %define with_qemu 0 %endif --=20 2.26.2 From nobody Sat Apr 20 04:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602235632; cv=none; d=zohomail.com; s=zohoarc; b=i2r0Rw+8Th51V/54ckCtjpbQNunoVunk1EXrhCpvcdZ73cnKEWkxcC332kExEmB6gJgC1+F/IJ40PSGsKtp93L/dAH1yPBAIjZLokds8/Y0bjVhADGOKDAAMPjS+cGrw9XCkCav+4K2TzX5yYkxw7vbOEJPIm0KQvdQIja85atk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602235632; 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=4bc/Ul5Gx0iOevvC5tMepmJ9qoi1MV4+bOEDbpCbtw4=; b=OaKaErI/z1Q3zrQu/wfLKsk6pKGuXdOdk/LfUpE8uXr+fgC+7EAmkYs0mdRL5qrs5YkVh+OiViXylQNgyHb1iakyMcn0lc53do1qDo/j62TUWIJ5RFWrKm6VCkB5fphDjLZpdScuiG+3Zj2CVb4idpstwBYLbhYeAqWzAuUWplw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602235632766571.2945521722976; Fri, 9 Oct 2020 02:27: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-539-zd5z2JSnN3CN_g8IxnuPOA-1; Fri, 09 Oct 2020 05:26:31 -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 E05A51029D30; Fri, 9 Oct 2020 09:26:21 +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 BF7EB5D9F1; Fri, 9 Oct 2020 09:26:21 +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 8C8568C7D7; Fri, 9 Oct 2020 09:26:21 +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 0999Q5GH009482 for ; Fri, 9 Oct 2020 05:26:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 93C7C196FE; Fri, 9 Oct 2020 09:26:05 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D890921E95 for ; Fri, 9 Oct 2020 09:26:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602235631; 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=4bc/Ul5Gx0iOevvC5tMepmJ9qoi1MV4+bOEDbpCbtw4=; b=bbXFK1ikPieAydcPYexqenIOMBIFMxQwgWvS3hlo30GT4wDsdiW/l2O0lcM+HbJ6Dm1vxS Qb3LS8QY9NOtBIYO91o00WF5erlT8rzKVS9FZyQYJh2gc75z+wfKxenJtwiOQsuTW9hGp4 UYada/jN/oZw0kY4oPK76r4OYX72sg4= X-MC-Unique: zd5z2JSnN3CN_g8IxnuPOA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 9/9] spec: Introduce arches_* Date: Fri, 9 Oct 2020 11:25:46 +0200 Message-Id: <20201009092546.15546-10-abologna@redhat.com> In-Reply-To: <20201009092546.15546-1-abologna@redhat.com> References: <20201009092546.15546-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" With this commit, all architecture lists that we base feature enablement decisions on are defined within a few lines of each other, increasing maintainability. Additionally, generic architecture lists that appear in the conditions for multiple features are defined, so that repetition is reduced. Note that a few checks (numactl, zfs, ceph) have been changed from %ifarch to %ifnarch for consistency: while doing so, the corresponding list of architectures has also been replaced with the complement of the original one to ensure the overall behavior would be preserved. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a0cd5ce5af..cbcf7dcc60 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -17,18 +17,30 @@ %define _vpath_builddir %{_target_platform} %endif =20 -%define qemu_kvm_arches %{ix86} x86_64 %{power64} %{arm} aarch64 s= 390x +%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s= 390x %if 0%{?rhel} - %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x + %define arches_qemu_kvm x86_64 %{power64} aarch64 s390x %endif =20 +%define arches_64bit x86_64 %{power64} aarch64 s390x riscv64 +%define arches_x86 %{ix86} x86_64 + +%define arches_systemtap_64bit %{arches_64bit} +%define arches_dmidecode %{arches_x86} +%define arches_xen %{arches_x86} aarch64 +%define arches_vbox %{arches_x86} +%define arches_ceph %{arches_64bit} +%define arches_zfs %{arches_x86} %{power64} %{arm} +%define arches_numactl %{arches_x86} %{power64} aarch64 +%define arches_numad %{arches_x86} %{power64} aarch64 + # The hypervisor drivers that run in libvirtd %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} %define with_libxl 0%{!?_without_libxl:1} %define with_vbox 0%{!?_without_vbox:1} =20 -%ifarch %{qemu_kvm_arches} +%ifarch %{arches_qemu_kvm} %define with_qemu_kvm %{with_qemu} %else %define with_qemu_kvm 0 @@ -60,7 +72,7 @@ %endif =20 %define with_storage_gluster 0%{!?_without_storage_gluster:1} -%ifnarch %{qemu_kvm_arches} +%ifnarch %{arches_qemu_kvm} # gluster is only built where qemu driver is enabled on RHEL 8 %if 0%{?rhel} >=3D 8 %define with_storage_gluster 0 @@ -97,28 +109,20 @@ =20 # Finally set the OS / architecture specific special cases =20 -# Xen is available only on some architectures -%ifnarch %{ix86} x86_64 aarch64 +# Architecture-dependent features +%ifnarch %{arches_xen} %define with_libxl 0 %endif - -# vbox is available only on i386 x86_64 -%ifnarch %{ix86} x86_64 +%ifnarch %{arches_vbox} %define with_vbox 0 %endif - -# Numactl is not available on many non-x86 archs -%ifarch s390x %{arm} riscv64 +%ifnarch %{arches_numactl} %define with_numactl 0 %endif - -# zfs-fuse is not available on some architectures -%ifarch s390x aarch64 riscv64 +%ifnarch %{arches_zfs} %define with_storage_zfs 0 %endif - -# Ceph dropped support for 32-bit hosts -%ifarch %{arm} %{ix86} +%ifnarch %{arches_ceph} %define with_storage_rbd 0 %endif =20 @@ -154,7 +158,7 @@ %define with_sanlock 0%{!?_without_sanlock:1} %endif %if 0%{?rhel} - %ifarch %{qemu_kvm_arches} + %ifarch %{arches_qemu_kvm} %define with_sanlock 0%{!?_without_sanlock:1} %endif %endif @@ -178,12 +182,12 @@ %if %{with_qemu} || %{with_lxc} # numad is used to manage the CPU and memory placement dynamically, # it's not available on many non-x86 architectures. - %ifnarch s390x %{arm} riscv64 + %ifnarch %{arches_numad} %define with_numad 0%{!?_without_numad:1} %endif %endif =20 -%ifarch %{ix86} x86_64 +%ifarch %{arches_dmidecode} %define with_dmidecode 0%{!?_without_dmidecode:1} %endif =20 @@ -1256,7 +1260,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/= test_libvirtd_libxl.aug # Copied into libvirt-docs subpackage eventually mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs =20 -%ifarch %{power64} s390x x86_64 aarch64 riscv64 +%ifarch %{arches_systemtap_64bit} mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp =20 --=20 2.26.2