From nobody Sat May 4 06:54:59 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=1601923243; cv=none; d=zohomail.com; s=zohoarc; b=PUU50AMNLLeL2oFlX6B3HisgidK98+vAukOBPQc1yt47tf+p/vHH2OMaxmNl82JTcOX54DBbrcxUGEdDW1b71OgGTKwpffi7EcEH9GalCLnqTtnoQV/Ja2GIe82J1AdgdYffc0xVzTcXM3rcDFB7n3ifk33cT+dPECvJ21JXnyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923243; 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=Vd+HMGQ9BKM+TB/CztOuQ87T6OXG7LLvGRfXwGeiEgM=; b=JKZkL4jfkuiiHCW8SFUzwsdFHS5T7bJk8TzYge559kQ407+vd4eXSkLEh8gKqn4vdQhBX6gwW0OxACT2ncAJzFhCpKW1WGa8eIOgd//fNDAGOkIoysVFIeiPZde9Own5N+OpoMSPVobHkFwSR3v3UGBTJoQtztlwPlaFeHGiZ9s= 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 1601923243752520.6696419145052; Mon, 5 Oct 2020 11:40:43 -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-100-_W4j_RtKPoKoLDsbqubMWg-1; Mon, 05 Oct 2020 14:40: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 9FBA8803654; Mon, 5 Oct 2020 18:40: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 4197673673; Mon, 5 Oct 2020 18:40:33 +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 DEB8344A41; Mon, 5 Oct 2020 18:40:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095IeTDs022616 for ; Mon, 5 Oct 2020 14:40:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id B2D1573673; Mon, 5 Oct 2020 18:40:29 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 081A973666 for ; Mon, 5 Oct 2020 18:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923242; 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=Vd+HMGQ9BKM+TB/CztOuQ87T6OXG7LLvGRfXwGeiEgM=; b=DwtzoOy1rM3CresKrGNiKtEBV5n/93YkSOVkuRpdnLC2rmC0cAHJesf3SDvRUCaHQoNak0 g/z7LU5Jp3o0s8nrdtqZVMQyyJiw516wsPaXONWqXtuUxR6wDlHEuLkSrPbEIo8LkepLfY nGx7cWax5L/55aTr81BxBxjoNYI/7V8= X-MC-Unique: _W4j_RtKPoKoLDsbqubMWg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/9] spec: Simplify setting features off by default Date: Mon, 5 Oct 2020 20:40:16 +0200 Message-Id: <20201005184024.266109-2-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" The right-hand side of these expressions will always evaluate to zero. Stop obfuscating this fact. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d13aae5cf5..815ab246e9 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 May 4 06:54:59 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=1601923257; cv=none; d=zohomail.com; s=zohoarc; b=ni2AqdHgbDLT20XQD0KQTZzalSTxI5YVo26ZaoaG0YgrWur9dTZgP2dLvayWRyQM8szrweVo1NYKqW5mwi9w2Tv4X53AZCzOaW0pCTNlzVZXXc2epotCV39k0BKspeIwBddxCOvKVqPMnuQPEskx9EDdSZZKEap3WSaOBkWCt3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923257; 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=zONjwe40r10B/s5eLX6FOTYmNYrW4/uHkstjsq6Zzlg=; b=E2lXeI1zkxTMHEJlraxoYtsnr0I3d44GO2WVE68wkZcs4nu3sao6zFoA5T12mIptola7hISCMsI+nl4OwP704kKUZdgOzIIQl8YUsm2ycStUJzI4w9Qgco56RKv47Iq3Nkdz0+I2UhaEwWVm72mE3sOV1MH9HYZQs4dmejrcVMQ= 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 1601923257089293.0891892945906; Mon, 5 Oct 2020 11:40:57 -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-147-6fJ7IIzzOfC-J9_NK1-dRg-1; Mon, 05 Oct 2020 14:40:50 -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 0344F801AE2; Mon, 5 Oct 2020 18:40:45 +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 D35B860C11; Mon, 5 Oct 2020 18:40:44 +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 9F6791826D2E; Mon, 5 Oct 2020 18:40:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095IeVlV022630 for ; Mon, 5 Oct 2020 14:40:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 22CB173673; Mon, 5 Oct 2020 18:40:31 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F36973666 for ; Mon, 5 Oct 2020 18:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923253; 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=zONjwe40r10B/s5eLX6FOTYmNYrW4/uHkstjsq6Zzlg=; b=MB9W2Q62psMzht57eA62K6sQ/7XZwRvZdz2AagokCifzTHKCln8gt8xQPiBfwTe/gQgymf MuCWoJJtrxpb/IjjFhdzQMQkbHbRkT1CVRRwfIa7UnqNsZ1RG4hLcybd4RG+pW3wJTg8GL EzoLROskMvO/SqtWSIhwHnWK+r86lbs= X-MC-Unique: 6fJ7IIzzOfC-J9_NK1-dRg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/9] spec: firewalld is always enabled Date: Mon, 5 Oct 2020 20:40:17 +0200 Message-Id: <20201005184024.266109-3-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 815ab246e9..4572044d2d 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 @@ -1088,12 +1085,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 @@ -1169,7 +1160,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 May 4 06:54:59 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=1601923300; cv=none; d=zohomail.com; s=zohoarc; b=nyLJ6hBObpTlgjs3HmH4V0d9WAP6oyWLxig/R6XKlGTSpDbiMsfmshyFVQJmDtEkJL9t7kPIFtTz4U/ioJl8lmmGO8sNW2m2rFsprXyJh5SNNsvGJxNbk5mKDGrMyhCeGMm9n/+SCYJuUW9ygRhPaq3qyqbctqKkiJmCyeAZHN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923300; 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=L+Qh3kmaIQ1bVUK45I1jZ5aor8GvgtFQ+9pdMKlqvJo=; b=O8mXX8YfK2s2bPwBOD94/dBQt3BtuDjShuj35saFC/+TgSW2D2Y57Xd/AmHN+Sb5A2FLkfflbUwI/7hZqwkYsVtCGQKqegXoYMYoLfGx+LGOXsDd7KdDq6XHICK+6zvEx30kSW+uON3bXL+bmBH2ximxCXYZB69Kgq1/Cbsh3q4= 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 1601923300347687.327876192846; Mon, 5 Oct 2020 11:41:40 -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-561-yf4HpNaFOFG8vbhJf3TA1w-1; Mon, 05 Oct 2020 14:40:53 -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 2241B64145; Mon, 5 Oct 2020 18:40:48 +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 F36EA5D9CD; Mon, 5 Oct 2020 18:40: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 C020544A67; Mon, 5 Oct 2020 18:40:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095IeWN2022640 for ; Mon, 5 Oct 2020 14:40:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 969E573673; Mon, 5 Oct 2020 18:40:32 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF19373666 for ; Mon, 5 Oct 2020 18:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923299; 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=L+Qh3kmaIQ1bVUK45I1jZ5aor8GvgtFQ+9pdMKlqvJo=; b=VOI67q7Lo4+wF6058oU1iaFq3bIWv3OrPo5vad9YMWqr3TfhV9SZPVm6pCVrGfT0RwNTaG h0aunogOvGizDomQZFot5RCTo+pezYtE1ybsnyWcDpKF0RCn0JvYY74fdwf35AQTTw8q15 qoQGsW8z0LgWfX9ie6sUyor2ESAZ7V8= X-MC-Unique: yf4HpNaFOFG8vbhJf3TA1w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/9] spec: bash completion actually defaults to on Date: Mon, 5 Oct 2020 20:40:18 +0200 Message-Id: <20201005184024.266109-4-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" Remove the red herring. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4572044d2d..9e4c5d2b81 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 May 4 06:54:59 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=1601923330; cv=none; d=zohomail.com; s=zohoarc; b=Wh8z588Obh8Zyg58tacCaNyoLVdf/kZEQcdvlRIabRuhhOWPGFAo3t2LjDs4vmC38+U2ms0PUdFjwc32jqGP3+rLVuf3UmTT8J489xKFGTC1LSciyCCH3lWo1ZIGXQunaJEcrtFgzbvBcy13J97iMsmUgUL4SE3Ye+753XApQ1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923330; 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=BC4hWN//0vnKlKIKti5YAmwCv0JM+BZMLERtNNQozEY=; b=lyhhYeN8vqCDZtrlJWA8I5u+v0BtSLktUo/qqXlhnM3xaq7viswW6A8rKNFMWa0bOp7HvBVsOMrEKNwNIYCvuOVbKo+JIMPlNbLdLAUi0d1NeYunCAKQlIxR2mue9B2PbYW1+PrZeafAeI/kXvTMdRXiG3lF0fDVPG1KJHK6b3c= 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 1601923330973726.4452806990147; Mon, 5 Oct 2020 11:42: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-306-zzwwn7xqNcCqjMDz3_CTUg-1; Mon, 05 Oct 2020 14:40:52 -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 2E3CE6414A; Mon, 5 Oct 2020 18:40:47 +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 0C35560BFA; Mon, 5 Oct 2020 18:40: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 C655F1826D32; Mon, 5 Oct 2020 18:40:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095IeX9g022652 for ; Mon, 5 Oct 2020 14:40:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E32773687; Mon, 5 Oct 2020 18:40:33 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 050E473666 for ; Mon, 5 Oct 2020 18:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923329; 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=BC4hWN//0vnKlKIKti5YAmwCv0JM+BZMLERtNNQozEY=; b=Vjy1fbizRSmyZ/KS52kmPeyX3/5SKks2ukxZ/odrC6W2nQTJzPfCEzzaAzkomxtO/kMdz6 WVdhNhRIfV//v0ubXvBEnEtwsDSDpaXYIdjGkSizrqSDNYi4qbiVuJdEsJ/NP6p0L/k4nv /Yvh8CPbamghG6Qo1TNT7BDEKcYmia8= X-MC-Unique: zzwwn7xqNcCqjMDz3_CTUg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 4/9] spec: Move with_numactl definition Date: Mon, 5 Oct 2020 20:40:19 +0200 Message-Id: <20201005184024.266109-5-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 9e4c5d2b81..65df7dc79f 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 May 4 06:54:59 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=1601923264; cv=none; d=zohomail.com; s=zohoarc; b=C/+Q28VLtob/IXqk8oMrkeFLL8zJrk3d9CbD0e3TxVbzcEb0NJTsgznDsOmwAHnhQkbwwS9sNfUX7uDWDSHH1MsCJvJNix6ZKc8Dep/TYZ8+EoicVdygTANEEqyAu0rWQWHqrmWrg5+bfk3XMYjKc72EAR7JRImt4IXkwVKepCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923264; 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=M+AVhsdVCqa3AzwxU4Q5XTQXlgZFxvaxoyNsu/LtVQU=; b=DWCbX7JLLxS3/0VyOKeh7iG9zd4bQ5PU3Q0gY7QGNnGI8daMPwgttUm/1suFNvBO49wJiY32u8M17aFp+HO4P3IDtC0Y5+Q9VfdExezOy2XZcWn5jGB2j4pBryIuF6ISZs/azi+3xSYCLjK2H3PaXsc9qKgXSQJMSnryc7mbCZE= 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 1601923264313485.1306262606097; Mon, 5 Oct 2020 11:41: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-100-lMAjevB_PnCFY_v_66whmA-1; Mon, 05 Oct 2020 14:41:00 -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 5CEB7108E1AD; Mon, 5 Oct 2020 18:40:53 +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 3DE557EB77; Mon, 5 Oct 2020 18:40:53 +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 0C81E44A77; Mon, 5 Oct 2020 18:40:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095IeYwG022663 for ; Mon, 5 Oct 2020 14:40:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id D4F2D73673; Mon, 5 Oct 2020 18:40:34 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0D000805D5 for ; Mon, 5 Oct 2020 18:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923263; 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=M+AVhsdVCqa3AzwxU4Q5XTQXlgZFxvaxoyNsu/LtVQU=; b=Zq73fYMKxbWJ6Wy9zlhjQcgzWcrtlLUuf5RFSHRRJSa3KMae/UD5IwTQ5K0m0ejTSXZrIF 7CgpVuOTZAlTOUc7vP1x0pGcG4c3/iZw7Ri3mTJ0clbbDvTlABOfVYPTTtatO9OeZ0jLTm BEjeePPsUWEDIYW+f3KeCMA+qzA6WrI= X-MC-Unique: lMAjevB_PnCFY_v_66whmA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 5/9] spec: Introduce with_dmidecode Date: Mon, 5 Oct 2020 20:40:20 +0200 Message-Id: <20201005184024.266109-6-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 65df7dc79f..2401404008 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 @@ -434,7 +439,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 May 4 06:54:59 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=1601923261; cv=none; d=zohomail.com; s=zohoarc; b=E6+Ok2JwjG0vqdODsBxYjNcAk0o5M6jhxzlNg74fITWAbgVDFhfioWp+8ng75YlcE00IArxj8mkF0pUbSRslHojhpV7nIfIk6TwnD4icaq7Sh8a/Q5TphVOQJ3RHYNP1VZzB152Lb6td4OrokcId53Q+dbJ+g8zz+FdT5imiTkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923261; 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=8yqyDhVsQWtUYQvydDBcB1gXYEXptpyqTBGGpZa8Pgc=; b=EMwySXX0grKbZYMEsmKWa6Wadm4nujbdEwANG90v1V4CNBZpGpwKGM2xUIMNIFhQNI/+86j/aVxhocfOA7VvV7NrZjjSVrQqnI5SrImMVXbsjW29odgfsyTTP9oYRqJdUPoS2Tb8IAppnfWGnsLnsest41VKrpcgufQArNGYqPs= 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 1601923261410931.7706637958652; Mon, 5 Oct 2020 11:41:01 -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-445-cZDk0SRdPTSVDG2qp78RUg-1; Mon, 05 Oct 2020 14:40:56 -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 CDFD3191F54A; Mon, 5 Oct 2020 18:40:49 +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 AC64D55778; Mon, 5 Oct 2020 18:40: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 7A6DA44A6E; Mon, 5 Oct 2020 18:40:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095IeaJF022671 for ; Mon, 5 Oct 2020 14:40:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 427B873666; Mon, 5 Oct 2020 18:40:36 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53D2481C41 for ; Mon, 5 Oct 2020 18:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923260; 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=8yqyDhVsQWtUYQvydDBcB1gXYEXptpyqTBGGpZa8Pgc=; b=ZjfX6jdygeX3HW0hJWK2ZdlSXfts9CsS7LwYQbID+zJZ+g8PaFrP7EiPcGtR1FYCxKHvnE PqzpjHvKqdounFTwTrhuH2ld4vgJdSCfc9mPseljqGweTyJB1jRtHJ6QxeLtDVedC5/yGc Yh1/Fg+PRSEyejjttN7Nl0XAdnJvgiU= X-MC-Unique: cZDk0SRdPTSVDG2qp78RUg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 6/9] spec: Move _vpath_builddir definition Date: Mon, 5 Oct 2020 20:40:21 +0200 Message-Id: <20201005184024.266109-7-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 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 2401404008..d8f689e651 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 May 4 06:54:59 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=1601923269; cv=none; d=zohomail.com; s=zohoarc; b=g/YZiVBeePeHmNi7oS8u8jqEeGxb0RBVQB9SBCbW45EFpBhOeRg2P5JhKTzlTXcNLx7Yl+EHl2nph8cAfpYCqCvdo5NeYgPFGxaaOnEhgmehK71sviUAzAUWzyOWF8J2m237VL5OWkpfR1lkjVrEr/37LQ6+xwE59xJKXEtWZGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923269; 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=sBQnCLp0xHzKlfnLwH35ASpW7bMOf+aViNUerpPRJxw=; b=Go7K3Ami/wHrPl2PFHpBqOmVYJS/u/2GFPzdq2Ph7rOMaK8Vs4WMp++Kz004gU1oujyhzqQqP/FGVk4k5ANGFxse/DaAoil2qJRa2UGqPisKu7vXClugGH/Zpj0R0P6BrtF/pKTVDd6ZKEO9Y24MGvhYQrtr6tKMnq+1jYsw9Es= 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 1601923269652823.751287353944; Mon, 5 Oct 2020 11:41: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-20-fu1jW0-4M3-xLtqmv4wuZA-1; Mon, 05 Oct 2020 14:41:06 -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 F2193108E1A6; Mon, 5 Oct 2020 18:40:55 +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 CB9C55C225; Mon, 5 Oct 2020 18:40:55 +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 975481826D3B; Mon, 5 Oct 2020 18:40:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095Iebak022692 for ; Mon, 5 Oct 2020 14:40:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85CCE73673; Mon, 5 Oct 2020 18:40:37 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BCDFD73666 for ; Mon, 5 Oct 2020 18:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923268; 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=sBQnCLp0xHzKlfnLwH35ASpW7bMOf+aViNUerpPRJxw=; b=PKiYToViAaEharYhNkVKqiKcD7KjGn1VPft6Sv8tAJV73c4WoaeQDOmUOkC5caKOF1rqP7 HvVgJyNuAvsBEkuPFyUMJ5iGjgfBlINL8yvDTF3dhMZkK9iHA17OLnO6zlELfKMzoOYwhB JEvZgI3nvGm4EBN3iab17ahpqouwEmE= X-MC-Unique: fu1jW0-4M3-xLtqmv4wuZA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 7/9] spec: Drop s390 architecture from conditionals Date: Mon, 5 Oct 2020 20:40:22 +0200 Message-Id: <20201005184024.266109-8-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 d8f689e651..e036307d30 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 May 4 06:54:59 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=1601923294; cv=none; d=zohomail.com; s=zohoarc; b=a8zzZdCK1POGe92L/Ek3XF9/0EACNVfGbU7UohM3hojmlKWCbX8TI71d6dTwGPExa4AIoLzJdMzAfrFXf1Lya2Il+Hah5vPDJjMz1y5HqNAP1psUXxvhNrR4V94tPN+Z79A/Qw7VLVb/n9hxiixGUJirLMANieqquudHf5NSC+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923294; 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=vsjLq1ps0HUh7Aj5ICSldEb+tnX5jK1WsZ4+4j92yOs=; b=U3YCV5kSfbuCgHSsm5JjoVt+Ub/GR66BM8r9W9hBV7WOttrGbaP10/R2GrdlPEfk1kPvS/mSBq1ffhaWtPJ8dCyHFFYh+qGVaO2suXY/nrXcTuZFEol6aNh5VHCgb9HN0JH7nYwj/f9ITd51c27ohJxiZeSvve2hX3KrxBehoxk= 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 1601923294208310.6860451192322; Mon, 5 Oct 2020 11:41: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-225-vgobFBWEOFqvw-j1PA8kHA-1; Mon, 05 Oct 2020 14:41:00 -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 67E32191F548; Mon, 5 Oct 2020 18:40:52 +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 474D61002EF9; Mon, 5 Oct 2020 18:40:52 +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 0F47A44A75; Mon, 5 Oct 2020 18:40:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095Ied3M022702 for ; Mon, 5 Oct 2020 14:40:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0943F73666; Mon, 5 Oct 2020 18:40:39 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A01073687 for ; Mon, 5 Oct 2020 18:40:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923293; 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=vsjLq1ps0HUh7Aj5ICSldEb+tnX5jK1WsZ4+4j92yOs=; b=W9L/QVYGsed+RGAezbfmKCr2KPrZ6vZDoNbf7TJma1hUUGkQqax6mXWY8AGVoV6V1GevKS j4oG3I5NMoXjBkdRVDXJCi0kHjGUpAvjwOMfCM/6QfBvvr9j1aWXlRQBB6z4NQ1jeRh03f cmZSPmSlCLKxVdPAgexdNTyzZuuhSxE= X-MC-Unique: vgobFBWEOFqvw-j1PA8kHA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 8/9] spec: Refactor qemu_kvm_arches definition Date: Mon, 5 Oct 2020 20:40:23 +0200 Message-Id: <20201005184024.266109-9-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e036307d30..b62b17ee80 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -17,31 +17,31 @@ %define _vpath_builddir %{_target_platform} %endif =20 +%if 0%{?fedora} + %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aar= ch64 +%else + %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 May 4 06:54:59 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=1601923273; cv=none; d=zohomail.com; s=zohoarc; b=Pp+OlAbLVo27R5XbmVXkCIm1Irby+std7CjpJvqs3m2ahsQwyJ1hEIKsrqgb4/S9tSCI53/GtqZ9hieinOxsPDL1gLfKkywDPr0thyNXFYV2Nw0lgobPRBdIxiTTHHA9SvCZT3al9xRZGZzccPTjexkSWgYjC9xCXoGAdvs2k24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601923273; 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=4XA5QWwM1vckRTMzEwfUd2b7hBcVNHys3MR2fRQK3NI=; b=MgXhdkpDG9u+Zq/HiB7vhdl9rTc8Jl8hFiVHS/jq2IiG/pwcvnR44AcXiYhrJY+B5W7HD/MSdZygqNGy7uf/BLeXLwxeM3CPtF7Qj21f6uFwqIeddYlKWOBiMFC6WtauybtPZbJIerY0xSt/Su2XiQlIuWUoKcd/lUBkELTpLQs= 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 1601923273642659.5790937149927; Mon, 5 Oct 2020 11:41:13 -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-381-o1WDRG35N-CqNWJzyFwQtQ-1; Mon, 05 Oct 2020 14:41:09 -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 4447C108E1A2; Mon, 5 Oct 2020 18:41: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 257CD7BE44; Mon, 5 Oct 2020 18:41:00 +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 E4E5F44A7C; Mon, 5 Oct 2020 18:40:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095Ieef5022710 for ; Mon, 5 Oct 2020 14:40:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E2D673666; Mon, 5 Oct 2020 18:40:40 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DB4A73687 for ; Mon, 5 Oct 2020 18:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601923272; 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=4XA5QWwM1vckRTMzEwfUd2b7hBcVNHys3MR2fRQK3NI=; b=bmIeOXwp4jZQPSzufjSbNZCLX9qEjrUdCgz5Iyp5y9I6Ex6DW6fevGve6B0qYf/YxQePqD bcjw3DzTsc50YoCIxBZsXWgLcDcSJ33yqv4/xag5C91O3PINzEemJF+Ita3OgbMGbqA0qs 1kN1QLJAHwe/YSb4NZSSzTWyr6w0ymE= X-MC-Unique: o1WDRG35N-CqNWJzyFwQtQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 9/9] spec: Introduce arches_* Date: Mon, 5 Oct 2020 20:40:24 +0200 Message-Id: <20201005184024.266109-10-abologna@redhat.com> In-Reply-To: <20201005184024.266109-1-abologna@redhat.com> References: <20201005184024.266109-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 --- libvirt.spec.in | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b62b17ee80..32bc51b33c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -17,10 +17,22 @@ %define _vpath_builddir %{_target_platform} %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} +%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 + %if 0%{?fedora} - %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aar= ch64 + %define arches_qemu_kvm %{arches_x86} %{power64} s390x %{arm} aarc= h64 %else - %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x + %define arches_qemu_kvm x86_64 %{power64} aarch64 s390x %endif =20 # The hypervisor drivers that run in libvirtd @@ -29,7 +41,7 @@ %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 @@ -61,7 +73,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 @@ -98,28 +110,20 @@ =20 # Finally set the OS / architecture specific special cases =20 -# Xen is available only on i386 x86_64 -%ifnarch %{ix86} x86_64 +# 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 @@ -155,7 +159,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 @@ -179,12 +183,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