From nobody Mon May 6 18:28:53 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=1611302535; cv=none; d=zohomail.com; s=zohoarc; b=ZT6BIgZx7JazR1UU0UrGoaDj4ynvcBngJn7ActO70BhA6AHtEVHhZ6yP1Cd9sRaI0u4czdI7GIQ9s1z/IQXjMS2wpxUqJbUaKdlFS7uHooUmqaj5ToUx6y8cjZyghu3TUBUFjXGdZ/649vkVXb8WaVnIMdudPWve8MxXiB649ys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611302535; 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=gwMT4wME/e/rhFrD2/8KhDAW81JFvka49SbxIktzCuY=; b=jjss53tdds9OLQfIEXcjj2TawMnkVDDhT5bpXqN1NAgibB2dNYWMGqNrOXLdHTUnB/bwiMUzw17F0zbEjyv/3XswiaKgwQzoqjeYe0NUHtpnLxo/Oxl8ebsurgnEa2rHRLfwVYYO7QTvtnjc65SdZcR1EciStn8Yd4F1tjCUnnE= 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 1611302535724221.06393412841112; Fri, 22 Jan 2021 00:02:15 -0800 (PST) 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-387-UzaVO_ZYMZChGIvFvxBJ6g-1; Fri, 22 Jan 2021 03:02:12 -0500 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 A4BB01800D42; Fri, 22 Jan 2021 08:02:06 +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 4CB6A6F7E4; Fri, 22 Jan 2021 08:02:05 +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 7AB37180954D; Fri, 22 Jan 2021 08:02:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10M8218Q010755 for ; Fri, 22 Jan 2021 03:02:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id BE72571CBB; Fri, 22 Jan 2021 08:02:01 +0000 (UTC) Received: from tilapia.redhat.com (ovpn-113-127.rdu2.redhat.com [10.10.113.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EF3571CB0 for ; Fri, 22 Jan 2021 08:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611302534; 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=gwMT4wME/e/rhFrD2/8KhDAW81JFvka49SbxIktzCuY=; b=FnU85LXHLzNEMW9rE3SQjWLgONbZK/TEfq7Zg2Yafrdt1YoLLZgR7b3dmxkmRXac9/RD+X BaaBrjog+quNaBv4joqP6qJgG+80aRjVWJQ2fCs2egkxQkLDAwpGDNyFa5tKiJBsGpX56L uIS1lGYJmpuu2jaU/k2vxKiWjh+DMDE= X-MC-Unique: UzaVO_ZYMZChGIvFvxBJ6g-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 1/3] build: support explicitly disabling netcf Date: Fri, 22 Jan 2021 03:01:55 -0500 Message-Id: <20210122080157.669326-2-laine@redhat.com> In-Reply-To: <20210122080157.669326-1-laine@redhat.com> References: <20210122080157.669326-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" placing "-Dnetcf=3Ddisabled" on the meson commandline was ignored, meaning that even with that option the build would get WITH_NETCF if the netcf-devel package was found - the only way to disable it was to uninstall netcf-devel. This patch adds the small bit of logic to check the netcf meson commandline option (in addition to whether netcf-devel is installed) before defining WITH_NETCF. Signed-off-by: Laine Stump --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index d8a63baac9..bfdffb16d2 100644 --- a/meson.build +++ b/meson.build @@ -1155,8 +1155,10 @@ libm_dep =3D cc.find_library('m', required : false) =20 netcf_version =3D '0.1.8' netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) -if netcf_dep.found() - conf.set('WITH_NETCF', 1) +if not get_option('netcf').disabled() + if netcf_dep.found() + conf.set('WITH_NETCF', 1) + endif endif =20 have_gnu_gettext_tools =3D false @@ -1550,7 +1552,7 @@ elif get_option('driver_hyperv').enabled() error('openwsman is required for the Hyper-V driver') endif =20 -if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIR= TD') and (udev_dep.found() or netcf_dep.found()) +if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIR= TD') and (udev_dep.found() or conf.has('WITH_NETCF')) conf.set('WITH_INTERFACE', 1) elif get_option('driver_interface').enabled() error('Requested the Interface driver without netcf or udev and libvirtd= support') @@ -2355,7 +2357,7 @@ libs_summary =3D { 'libssh': libssh_dep.found(), 'libssh2': libssh2_dep.found(), 'libutil': libutil_dep.found(), - 'netcf': netcf_dep.found(), + 'netcf': conf.has('WITH_NETCF'), 'NLS': have_gnu_gettext_tools, 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), --=20 2.29.2 From nobody Mon May 6 18:28:53 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=1611302550; cv=none; d=zohomail.com; s=zohoarc; b=YI0A7ad2g8Nq6iq3I4zOnWNRuTrAuE9E/YEbabXKy8TLk8I+UYPTBZhiEnzprA8ErbyFPFKRmOa4ddfzy/BaHsXZR1saLKibwZCtsyaxaKao7EqyOf1a/iTvYBhXslxZt6+iOruUpSe7tj5f/42bLwMJM7/WXrP7kasa3GpraWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611302550; 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=LyEQcYNS0LkXWu/lDrN8ByCv732iS9sZZQne9eggcEQ=; b=DYgkheOGqHoRN5WLjYldbF0Fh04fK/OfU5n2lA0yFFTdeb35BQjFXZAhXSWJrLzXItZVmTysGIf+5UXF6yGkbZoDyAbzd0IQSzI8nt1+iV7EoMnof2yj5pQjeAY48zQQdQN+ceSfOSS+8N+KhfE4SU9ET0xh2o8WM/t8A9mLgrI= 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 1611302550459830.5917749942512; Fri, 22 Jan 2021 00:02:30 -0800 (PST) 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-389-Cr1mwlziOdigyhT_2RP6YQ-1; Fri, 22 Jan 2021 03:02:25 -0500 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 3C6E8180A096; Fri, 22 Jan 2021 08:02:20 +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 1683F54564; Fri, 22 Jan 2021 08:02:20 +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 D2ED246F42; Fri, 22 Jan 2021 08:02:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10M8226e010762 for ; Fri, 22 Jan 2021 03:02:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 340714C47C; Fri, 22 Jan 2021 08:02:02 +0000 (UTC) Received: from tilapia.redhat.com (ovpn-113-127.rdu2.redhat.com [10.10.113.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6D7871CB0 for ; Fri, 22 Jan 2021 08:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611302548; 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=LyEQcYNS0LkXWu/lDrN8ByCv732iS9sZZQne9eggcEQ=; b=Xk3dkxnpos8jRhDYwj+puZcxjzHCy/OcQiyaBqKuu6CRi1MBU0rlr+GDPem5HGahafqpWc WLXvNiEPBKIz6nORC+8w9UDr6E0gko5xGEZ3125um+rQ0ubVkAWM+/5bgA0Uy5keLE0Ddd b2ht3N2XQzviYwC4wMe/w7VND4GZj9s= X-MC-Unique: Cr1mwlziOdigyhT_2RP6YQ-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 2/3] build: make netcf=disabled the default Date: Fri, 22 Jan 2021 03:01:56 -0500 Message-Id: <20210122080157.669326-3-laine@redhat.com> In-Reply-To: <20210122080157.669326-1-laine@redhat.com> References: <20210122080157.669326-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Even after the previous patch, in order to build without netcf you would need to add "-Dnetcf=3Ddisabled" to the meson commandline (or uninstall netcf-devel). This patch makes -Dnetcf=3Ddisabled the default. (Without this change, a lot of people would just blindly continue building with netcf enabled.) Signed-off-by: Laine Stump --- meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index bfdffb16d2..4cddb95bad 100644 --- a/meson.build +++ b/meson.build @@ -1155,10 +1155,11 @@ libm_dep =3D cc.find_library('m', required : false) =20 netcf_version =3D '0.1.8' netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) -if not get_option('netcf').disabled() - if netcf_dep.found() - conf.set('WITH_NETCF', 1) +if get_option('netcf').enabled() + if not netcf_dep.found() + error('You must install the netcf development package to build with ne= tcf') endif + conf.set('WITH_NETCF', 1) endif =20 have_gnu_gettext_tools =3D false --=20 2.29.2 From nobody Mon May 6 18:28:53 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=1611302553; cv=none; d=zohomail.com; s=zohoarc; b=Fuu6aXIFaZySDR7wY2DfVdJWJnv4UcZmdaDSrS1+X0fUPHpM14TU+0j7GqlRqpA6bsDAw8tnjOSfE71RIB0AVKROe/M9r/VQS2BtOua0T+r/KQulasoSZa9bB1coaFTYM6xHVBU3PPlwdYH25+fBlZye8r/GrHh5CJr0yp8wCkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611302553; 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=56F9nZCM0T8ZdEC8ru7nNqW0P48Xgdj7p62kfD+wxGA=; b=fe1Ek9OnAlWtWbmRCC731kXcC3jxVF1nDEpmN6EiGUcJnqHDaKENvYTjSiXZHlRi0wqzvs1eRyZSH+qFmXYNjDjYOcLA/8FTkVNJZgkNq448TxQ0EWtjsImcLyXQXw4mBxNBufU6zFEPtP6zuV8A4i7+SeQZauKxNJ3+zEz/nJM= 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 16113025532401017.3071871393189; Fri, 22 Jan 2021 00:02:33 -0800 (PST) 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-279-fdXsuZsGPjqgJq12_EHrCw-1; Fri, 22 Jan 2021 03:02:28 -0500 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 E7B6E806662; Fri, 22 Jan 2021 08: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 C6F5360855; Fri, 22 Jan 2021 08:02:22 +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 8FF3946F45; Fri, 22 Jan 2021 08:02:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10M8227s010769 for ; Fri, 22 Jan 2021 03:02:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id A027371CB0; Fri, 22 Jan 2021 08:02:02 +0000 (UTC) Received: from tilapia.redhat.com (ovpn-113-127.rdu2.redhat.com [10.10.113.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BC9A4C47C for ; Fri, 22 Jan 2021 08:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611302552; 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=56F9nZCM0T8ZdEC8ru7nNqW0P48Xgdj7p62kfD+wxGA=; b=C3rNZOg59tCj89Dv3BPmJ7vn12WTXPJhAgBhqOs8bK2Zh2OkZYPkpO0AjIA3NLtPXwloiF rX6t3w0AnbnxlnxUkVJzBF6BBWhpmFkR3C3yPoOuYCdvzEWS/0XeIbGbWS4xfU2S5xTpS9 any7Oa96lJpXgMIhvOKpJ5kpATLytq0= X-MC-Unique: fdXsuZsGPjqgJq12_EHrCw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 3/3] rpm: disable netcf for the interface driver on RHEL/Fedora/CentOS Date: Fri, 22 Jan 2021 03:01:57 -0500 Message-Id: <20210122080157.669326-4-laine@redhat.com> In-Reply-To: <20210122080157.669326-1-laine@redhat.com> References: <20210122080157.669326-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Since libvirt.spec explicitly adds -Dnetcf=3Denabled to the meson commandline, just setting the default in the meson.build file won't have any effect for rpm builds. This patch changes the meson commandline in the spec file to -Dnetcf=3Ddisabled and removes the associated BuildRequires: and Requires: (I debated whether or not to do that conditionally only for (fedora > 33 || rhel > 8) but haven't done that for now (still may if it's considered important; for Fedora probably not important (since we never rebase after release), for RHEL we might want to preserve current behavior for RHEL8 even through a rebase though) Signed-off-by: Laine Stump --- libvirt.spec.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b5892987cf..ec82839e10 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -359,7 +359,6 @@ BuildRequires: fuse-devel >=3D 2.8.6 BuildRequires: libssh2-devel >=3D 1.3.0 %endif =20 -BuildRequires: netcf-devel >=3D 0.2.2 %if %{with_esx} BuildRequires: libcurl-devel %endif @@ -528,13 +527,10 @@ capabilities. Summary: Interface driver plugin for the libvirtd daemon Requires: libvirt-daemon =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} -Requires: netcf-libs >=3D 0.2.2 =20 %description daemon-driver-interface The interface driver plugin for the libvirtd daemon, providing -an implementation of the network interface APIs using the -netcf library - +an implementation of the network interface APIs using udev. =20 %package daemon-driver-secret Summary: Secret driver plugin for the libvirtd daemon @@ -1170,7 +1166,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) %{?arg_numad} \ -Dcapng=3Denabled \ %{?arg_fuse} \ - -Dnetcf=3Denabled \ + -Dnetcf=3Ddisabled \ -Dselinux=3Denabled \ %{?arg_selinux_mount} \ -Dapparmor=3Ddisabled \ --=20 2.29.2