[dpdk-stable] [PATCH 20.11] build: fix drivers selection without Python

[dpdk-stable] [PATCH 20.11] build: fix drivers selection without Python

[David Marchand]

[ upstream commit 627c5b41bb14a1afbd1489b0fc4b8224532a823d ]

The list of disabled drivers is built by calling list-dir-globs.py.

But if no Python interpreter is installed, no error is reported
and no driver is disabled.

Example on a minimal FreeBSD VM:

  dpdk@freebsd:~/dpdk $ meson setup build -Ddisable_drivers=net/*
  ...
  Message:
  ===============
  Drivers Enabled
  ===============

  common:
  	cpt, iavf, octeontx, octeontx2, sfc_efx, qat,
  bus:
  	ifpga, pci, vdev,
  mempool:
  	bucket, octeontx, octeontx2, ring, stack,
  net:
  	ark, atlantic, bond, bnxt, cxgbe, e1000, ena, enic,
  	failsafe, fm10k, i40e, hinic, iavf, ice, igc, ixgbe,
  	liquidio, null, octeontx, octeontx2, pcap, qede, ring, sfc,
  	thunderx, txgbe, virtio, vmxnet3,
  ...

  dpdk@freebsd:~/dpdk $ cd drivers/
  dpdk@freebsd:~/dpdk/drivers $ ~/dpdk/buildtools/list-dir-globs.py net/*
  env: python3: No such file or directory

Rely on meson internal interpreter.
Check return code when calling this script.

Fixes: ab9407c3addd ("build: allow using wildcards to disable drivers")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 buildtools/meson.build | 2 +-
 drivers/meson.build    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildtools/meson.build b/buildtools/meson.build
index 04808dabc1..36161afe48 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -3,7 +3,6 @@
 
 pkgconf = find_program('pkg-config', 'pkgconf', required: false)
 pmdinfo = find_program('gen-pmdinfo-cfile.sh')
-list_dir_globs = find_program('list-dir-globs.py')
 check_symbols = find_program('check-symbols.sh')
 ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
 binutils_avx512_check = find_program('binutils-avx512-check.sh')
@@ -15,5 +14,6 @@ if python3.found()
 else
 	py3 = ['meson', 'runpython']
 endif
+list_dir_globs = py3 + files('list-dir-globs.py')
 map_to_win_cmd = py3 + files('map_to_win.py')
 sphinx_wrapper = py3 + files('call-sphinx-build.py')
diff --git a/drivers/meson.build b/drivers/meson.build
index f9febc579e..f7db4329bf 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -19,7 +19,7 @@ subdirs = [
 ]
 
 disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'),
-		).stdout().split()
+		check: true).stdout().split()
 
 default_cflags = machine_args
 default_cflags += ['-DALLOW_EXPERIMENTAL_API']
-- 
2.23.0

Re: [dpdk-stable] [PATCH 20.11] build: fix drivers selection without Python

[Richardson, Bruce]

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Tuesday, June 15, 2021 1:22 PM
> To: stable@dpdk.org
> Cc: xuemingl@nvidia.com; Richardson, Bruce <bruce.richardson@intel.com>;
> Robin Jarry <robin.jarry@6wind.com>; Luca Boccassi <bluca@debian.org>
> Subject: [PATCH 20.11] build: fix drivers selection without Python
> 
> [ upstream commit 627c5b41bb14a1afbd1489b0fc4b8224532a823d ]
> 
> The list of disabled drivers is built by calling list-dir-globs.py.
> 
> But if no Python interpreter is installed, no error is reported
> and no driver is disabled.
> 
> Example on a minimal FreeBSD VM:
> 
>   dpdk@freebsd:~/dpdk $ meson setup build -Ddisable_drivers=net/*
>   ...
>   Message:
>   ===============
>   Drivers Enabled
>   ===============
> 
>   common:
>   	cpt, iavf, octeontx, octeontx2, sfc_efx, qat,
>   bus:
>   	ifpga, pci, vdev,
>   mempool:
>   	bucket, octeontx, octeontx2, ring, stack,
>   net:
>   	ark, atlantic, bond, bnxt, cxgbe, e1000, ena, enic,
>   	failsafe, fm10k, i40e, hinic, iavf, ice, igc, ixgbe,
>   	liquidio, null, octeontx, octeontx2, pcap, qede, ring, sfc,
>   	thunderx, txgbe, virtio, vmxnet3,
>   ...
> 
>   dpdk@freebsd:~/dpdk $ cd drivers/
>   dpdk@freebsd:~/dpdk/drivers $ ~/dpdk/buildtools/list-dir-globs.py net/*
>   env: python3: No such file or directory
> 
> Rely on meson internal interpreter.
> Check return code when calling this script.
> 
> Fixes: ab9407c3addd ("build: allow using wildcards to disable drivers")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [dpdk-stable] [PATCH 20.11] build: fix drivers selection without Python

[Xueming(Steven) Li]

Merged, thanks!

> -----Original Message-----
> From: Richardson, Bruce <bruce.richardson@intel.com>
> Sent: Tuesday, June 15, 2021 8:42 PM
> To: David Marchand <david.marchand@redhat.com>; stable@dpdk.org
> Cc: Xueming(Steven) Li <xuemingl@nvidia.com>; Robin Jarry <robin.jarry@6wind.com>; Luca Boccassi <bluca@debian.org>
> Subject: RE: [PATCH 20.11] build: fix drivers selection without Python
> 
> 
> 
> > -----Original Message-----
> > From: David Marchand <david.marchand@redhat.com>
> > Sent: Tuesday, June 15, 2021 1:22 PM
> > To: stable@dpdk.org
> > Cc: xuemingl@nvidia.com; Richardson, Bruce
> > <bruce.richardson@intel.com>; Robin Jarry <robin.jarry@6wind.com>;
> > Luca Boccassi <bluca@debian.org>
> > Subject: [PATCH 20.11] build: fix drivers selection without Python
> >
> > [ upstream commit 627c5b41bb14a1afbd1489b0fc4b8224532a823d ]
> >
> > The list of disabled drivers is built by calling list-dir-globs.py.
> >
> > But if no Python interpreter is installed, no error is reported and no
> > driver is disabled.
> >
> > Example on a minimal FreeBSD VM:
> >
> >   dpdk@freebsd:~/dpdk $ meson setup build -Ddisable_drivers=net/*
> >   ...
> >   Message:
> >   ===============
> >   Drivers Enabled
> >   ===============
> >
> >   common:
> >   	cpt, iavf, octeontx, octeontx2, sfc_efx, qat,
> >   bus:
> >   	ifpga, pci, vdev,
> >   mempool:
> >   	bucket, octeontx, octeontx2, ring, stack,
> >   net:
> >   	ark, atlantic, bond, bnxt, cxgbe, e1000, ena, enic,
> >   	failsafe, fm10k, i40e, hinic, iavf, ice, igc, ixgbe,
> >   	liquidio, null, octeontx, octeontx2, pcap, qede, ring, sfc,
> >   	thunderx, txgbe, virtio, vmxnet3,
> >   ...
> >
> >   dpdk@freebsd:~/dpdk $ cd drivers/
> >   dpdk@freebsd:~/dpdk/drivers $ ~/dpdk/buildtools/list-dir-globs.py net/*
> >   env: python3: No such file or directory
> >
> > Rely on meson internal interpreter.
> > Check return code when calling this script.
> >
> > Fixes: ab9407c3addd ("build: allow using wildcards to disable
> > drivers")
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> 
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>