From nobody Sun Feb 8 23:05:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1594894206; cv=none; d=zohomail.com; s=zohoarc; b=hMIDuhPaBZyNfDnfeiVqvOXckSWDaweRa+WnFB4LGnhwABn4y2uaTXfr8LoipNjN8HQrqcHT5VGMV0vZEV/JtHIu2A5s+yWn+GOgMuUueAx5wF6Yv1txuiTnNY70yhnHutzstIHfGuUrVtZQ2W347oNyAdjKgh836CaRLaDUmak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894206; 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=w6HB7Wz3cB8Ymfj82RgLhuYs1Syh5zlXeq298fo1fYM=; b=cfVFyctjvpd3F9XFdERwTVFiZ2dv3VsXHI4HZw65S93thUV3a+VsQ6Fa5zI//01WouE+jY0Qe+lOpGOJ836FTAad/dKULoVk9YdTvX3FSJ2MjQm56XjKqHtyTInp1AnejFh8Mpi3Mu5tQ5G6JoYw/0u7FYAoY7vl3x0KbPowTjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894206027468.964936513112; Thu, 16 Jul 2020 03:10:06 -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-249-aSTESBLwPeGvUxlXqtn9vg-1; Thu, 16 Jul 2020 06:09:59 -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 149FA108D; Thu, 16 Jul 2020 10:09:54 +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 EB43572ADE; Thu, 16 Jul 2020 10:09: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 BE8E3A36E5; Thu, 16 Jul 2020 10:09:53 +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 06GA5pcZ018733 for ; Thu, 16 Jul 2020 06:05:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id B974A2B6DC; Thu, 16 Jul 2020 10:05:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33DBF2B6DB for ; Thu, 16 Jul 2020 10:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894204; 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=w6HB7Wz3cB8Ymfj82RgLhuYs1Syh5zlXeq298fo1fYM=; b=b1WfebDHq/mUayke0Fh4Ccf7mbCSpcubEVBRi3o1FuKBMlU8Z4LvkjgfxnEFotUvNR5Kt/ vCJW4qG57Pg3lvayD5VJ8QcUOjVKAG+04PuPUI5o81zwtasi6jVCN19v+B3iGgFSCMFc1g GUDyeT52S7xIvtur0b9WIVLEazUaRjI= X-MC-Unique: aSTESBLwPeGvUxlXqtn9vg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 234/351] meson: src/network: install firewalld zone file Date: Thu, 16 Jul 2020 11:57:50 +0200 Message-Id: <83f52d172dd30d31a6beb7e0a98d9fe20758001d.1594891445.git.phrdina@redhat.com> In-Reply-To: References: 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.15 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" Signed-off-by: Pavel Hrdina --- src/Makefile.am | 7 ++----- src/network/Makefile.inc.am | 22 ---------------------- src/network/meson.build | 8 ++++++++ 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 63705b36b6f..7305a069f07 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,6 @@ =20 DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D -INSTALL_DATA_DIRS =3D INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D SYM_FILES =3D @@ -196,8 +195,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)= /scripts/gensystemtap.py =20 endif WITH_DTRACE_PROBES =20 -install-data-local: $(INSTALL_DATA_LOCAL) \ - $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) +install-data-local: $(INSTALL_DATA_LOCAL) =20 -uninstall-local: $(UNINSTALL_LOCAL) \ - $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) +uninstall-local: $(UNINSTALL_LOCAL) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index c19b1f99529..c13a6831cc0 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -3,25 +3,3 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) - -if WITH_NETWORK -INSTALL_DATA_DIRS +=3D network - -install-data-network: -if WITH_FIREWALLD_ZONE - $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones" - $(INSTALL_DATA) $(srcdir)/network/libvirt.zone \ - $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml -endif WITH_FIREWALLD_ZONE - -uninstall-data-network: -if WITH_FIREWALLD_ZONE - rm -f $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml -endif WITH_FIREWALLD_ZONE - -endif WITH_NETWORK - -.PHONY: \ - install-data-network \ - uninstall-data-network \ - $(NULL) diff --git a/src/network/meson.build b/src/network/meson.build index 2ca7d268c6e..948dad39432 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -115,4 +115,12 @@ if conf.has('WITH_NETWORK') confdir / 'qemu' / 'networks' / 'autostart', '../default.xml', 'default.xml', ) + + if conf.has('WITH_FIREWALLD_ZONE') + install_data( + 'libvirt.zone', + install_dir: prefix / 'lib' / 'firewalld' / 'zones', + rename: [ 'libvirt.xml' ], + ) + endif endif --=20 2.26.2