From nobody Sun Feb 8 19:13:04 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=1594894743; cv=none; d=zohomail.com; s=zohoarc; b=QcT2QRpvZ/9TJtPRiCCVn4ozTjI+YRkFi7614Lop61njI+aaCO/BBuZLbBOMYa3yci0LlV/ZbepGnOJt5yT4umw387a7rggTQm5nR49ZT49HaVTQAEnnFViBxizh9lfOavejyhrxdpVRrMeqza7gz8oyeduIUMZ5gTXiiGjzGpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894743; 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=nXptoE0hVRi5qSnTFMcS8D7g8VKmCoASbw6LWc7EiSQ=; b=W6mZzVfMQbYdUHHsIhViahe6oeA9V6zKECpU06ZJV6W7bseWDdTJqSFuggLJGBQ1dD6zI7AU4QIPz04fZeM1h6SxYdknU1DYwrIWlMJxxRN++c0oEoVLXJeqdbjwaRh0JblcfJflVWxi2SbHOdhbqCaWl6I6GQ5ssFwQ3HQZi1Y= 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 1594894743641455.6535299121001; Thu, 16 Jul 2020 03:19:03 -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-366-PJ0Mygw4OSSivUN3kHUjQw-1; Thu, 16 Jul 2020 06:02:54 -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 15AC2804492; Thu, 16 Jul 2020 10:02:22 +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 E67321053B01; Thu, 16 Jul 2020 10:02: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 B4FD796232; Thu, 16 Jul 2020 10:02: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 06GA1Ivj015843 for ; Thu, 16 Jul 2020 06:01:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 291EC2E040; Thu, 16 Jul 2020 10:01:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9874A2E04F for ; Thu, 16 Jul 2020 10:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894742; 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=nXptoE0hVRi5qSnTFMcS8D7g8VKmCoASbw6LWc7EiSQ=; b=PUVS0JpY7yTfvpToXBnqrLrzqefL+eilO9td9qgqvB+R71J9UDlXsC2TV1b+vLEnw36M/I U4u66wJP4vXxbwbwSUhlZdS3bP3DXBQACCFFv6jGDdKOnq+djJ8Gv5o+9AtN6xedB8UtcG 6f8MGOMY5eH0WUsD2lMAptAH4qpd3ZE= X-MC-Unique: PJ0Mygw4OSSivUN3kHUjQw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 046/351] meson: add firewalld_zone build option Date: Thu, 16 Jul 2020 11:54:42 +0200 Message-Id: <849ef67827c11f067aa6afc292a1f462ef0cc1f8.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.84 on 10.5.11.22 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 --- configure.ac | 3 --- m4/virt-firewalld-zone.m4 | 45 --------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 m4/virt-firewalld-zone.m4 diff --git a/configure.ac b/configure.ac index 825d14c6384..086505d95f6 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_FIREWALLD_ZONE LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL @@ -136,7 +135,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER @@ -453,7 +451,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER diff --git a/m4/virt-firewalld-zone.m4 b/m4/virt-firewalld-zone.m4 deleted file mode 100644 index b67d1a0b2fb..00000000000 --- a/m4/virt-firewalld-zone.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl firewalld_zone check - whether or not to install the firewall "libvirt= " zone -dnl -dnl Copyright (C) 2019 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_FIREWALLD_ZONE], [ - LIBVIRT_ARG_WITH([FIREWALLD_ZONE], [Whether to install firewalld libvirt= zone], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FIREWALLD_ZONE], [ - AC_REQUIRE([LIBVIRT_CHECK_FIREWALLD]) - AC_MSG_CHECKING([for whether to install firewalld libvirt zone]) - - if test "x$with_firewalld_zone" =3D "xcheck" ; then - with_firewalld_zone=3D$with_firewalld - fi - - if test "x$with_firewalld_zone" =3D "xyes" ; then - if test "x$with_firewalld" !=3D "xyes" ; then - AC_MSG_ERROR([You must have firewalld support enabled to enable fire= walld-zone]) - fi - AC_DEFINE_UNQUOTED([WITH_FIREWALLD_ZONE], [1], [whether firewalld libv= irt zone is installed]) - fi - - AM_CONDITIONAL([WITH_FIREWALLD_ZONE], [test "x$with_firewalld_zone" !=3D= "xno"]) - AC_MSG_RESULT($with_firewalld_zone) -]) - -AC_DEFUN([LIBVIRT_RESULT_FIREWALLD_ZONE], [ - LIBVIRT_RESULT([firewalld-zone], [$with_firewalld_zone]) -]) diff --git a/meson.build b/meson.build index 385a959e88b..573a414b846 100644 --- a/meson.build +++ b/meson.build @@ -1130,6 +1130,12 @@ if host_machine.system() !=3D 'freebsd' endif endif =20 +if not get_option('firewalld_zone').disabled() and conf.has('WITH_FIREWALL= D') + conf.set('WITH_FIREWALLD_ZONE', 1) +elif get_option('firewalld_zone').enabled() + error('You must have firewalld support enabled to enable firewalld_zone') +endif + =20 # define top include directory =20 @@ -1161,6 +1167,7 @@ libs_summary =3D { 'dbus': dbus_dep.found(), 'dlopen': dlopen_dep.found(), 'firewalld': conf.has('WITH_FIREWALLD'), + 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index d9e614131cd..75417751dd6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -19,4 +19,5 @@ option('capng', type: 'feature', value: 'auto', descripti= on: 'cap-ng support') option('curl', type: 'feature', value: 'auto', description: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 suppor= t') option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') +option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2