From nobody Sun Feb 8 10:30:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894125; cv=none; d=zohomail.com; s=zohoarc; b=CGGUz8OpYncwsG7dEBA0XKy5k52QiIaKHaAoEwVd7LDmuORNW2+SW7Xlm41aMy9wc7atL3+Vbn2e3sg8r24Pft0h2+WOuMfbs79aqVRULfn/tgQgmQFrrXxj2kIx0seIoG00qhJbh8t4nw2mO/ghHtPdfogbvqqApOygm8rSfRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894125; 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=pQCWgwAm2yrorMjfy9s3I7FjgkujvOsGWkPl3UxmDdU=; b=HkyXX9piwJqqtvLfc28Rav8ohmT+BZfoBY2/f87gJzwYTf+hVfP4OVpzQ527/rRL+N5kQmE6TKIW+cLFCmgrRWWxA56O+Z4slSybSavhGvREIhnez82Anqy0DPmlRFFp3Ymg3kcrglSpZpknRL8QpP1b6UhIUGPJc4R0tkyi/Rk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894125606447.3389338230879; Thu, 16 Jul 2020 03:08:45 -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-424-uhEDOZ7hNeSVcUjU9bKwrw-1; Thu, 16 Jul 2020 06:08:40 -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 082F61888AB6; Thu, 16 Jul 2020 10:08:32 +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 D81B260E3E; Thu, 16 Jul 2020 10:08:31 +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 A4ABA180223F; Thu, 16 Jul 2020 10:08:31 +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 06GA5qL7018748 for ; Thu, 16 Jul 2020 06:05:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id A28152B6DC; Thu, 16 Jul 2020 10:05:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D6692B6DB 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=1594894123; 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=pQCWgwAm2yrorMjfy9s3I7FjgkujvOsGWkPl3UxmDdU=; b=Ai0Z7VHr/NlKf4i/1HsJIQ27x71nXUOX2siH2gjqusP351CFf9lQthT6SKIFk822IBNbfW 1yNIf9Hrkd6r+efciQvYxKfxzDm1rbmK7Na/4XTPr7BMG48xlrZMLpt9/KuEFsBAUiEYOH TWOSkZQlnSaiH+VrHh9+6nGJ5APT5ks= X-MC-Unique: uhEDOZ7hNeSVcUjU9bKwrw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 235/351] meson: src/nwfilter: install nwfilter XML files Date: Thu, 16 Jul 2020 11:57:51 +0200 Message-Id: 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.12 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/nwfilter/Makefile.inc.am | 9 --------- src/nwfilter/meson.build | 2 ++ src/nwfilter/xml/meson.build | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/nwfilter/xml/meson.build diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 4df4756adf7..4d34d7f3ad1 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,14 +1,5 @@ # vim: filetype=3Dautomake =20 -NWFILTER_XML_FILES =3D $(wildcard $(srcdir)/nwfilter/xml/*.xml) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) - -if WITH_NWFILTER - -nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter -nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) - -endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index a832c2ddaeb..a05f0ce8fcf 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -65,4 +65,6 @@ if conf.has('WITH_NWFILTER') 'name': 'virtnwfilterd', 'file': files('virtnwfilterd.sysconf'), } + + subdir('xml') endif diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build new file mode 100644 index 00000000000..95af75bb15e --- /dev/null +++ b/src/nwfilter/xml/meson.build @@ -0,0 +1,22 @@ +nwfilter_xml_files =3D [ + 'allow-arp.xml', + 'allow-dhcp-server.xml', + 'allow-dhcp.xml', + 'allow-incoming-ipv4.xml', + 'allow-ipv4.xml', + 'clean-traffic-gateway.xml', + 'clean-traffic.xml', + 'no-arp-ip-spoofing.xml', + 'no-arp-mac-spoofing.xml', + 'no-arp-spoofing.xml', + 'no-ip-multicast.xml', + 'no-ip-spoofing.xml', + 'no-mac-broadcast.xml', + 'no-mac-spoofing.xml', + 'no-other-l2-traffic.xml', + 'no-other-rarp-traffic.xml', + 'qemu-announce-self-rarp.xml', + 'qemu-announce-self.xml', +] + +install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nw= filter') --=20 2.26.2