[libvirt PATCH 15/28] build: add nft to the list of binaries we attempt to locate

[Daniel P. Berrangé]

On Sun, Apr 30, 2023 at 11:19:30PM -0400, Laine Stump wrote:
> and include it in BuildRequires and Requires of the rpm specfile to
> make sure it's available when doing official distro builds.
> 
> Signed-off-by: Laine Stump <laine at redhat.com>
> ---
>  libvirt.spec.in | 2 ++
>  meson.build     | 1 +
>  2 files changed, 3 insertions(+)

This new dep will need libvirt.yml in libvirt-ci.git to be updated
and the dockerfiles then re-generated.

> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index ba73efb0b7..7b73b38af8 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -302,6 +302,7 @@ BuildRequires: libnl3-devel
>  BuildRequires: libselinux-devel
>  BuildRequires: iptables
>  BuildRequires: ebtables
> +BuildRequires: nftables
>  BuildRequires: module-init-tools
>  BuildRequires: cyrus-sasl-devel
>  BuildRequires: polkit >= 0.112
> @@ -541,6 +542,7 @@ Requires: libvirt-daemon-common = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  Requires: dnsmasq >= 2.41
>  Requires: iptables
> +Requires: nftables
>  
>  %description daemon-driver-network
>  The network driver plugin for the libvirtd daemon, providing
> diff --git a/meson.build b/meson.build
> index 9a18767fbb..2d94acc226 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -801,6 +801,7 @@ optional_programs = [
>    'mdevctl',
>    'mm-ctl',
>    'modprobe',
> +  'nft',
>    'ovs-vsctl',
>    'passt',
>    'pdwtags',
> -- 
> 2.39.2
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|