build: remove custom dependency checks in drivers

Message ID 20220120105421.27200-1-david.marchand@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series build: remove custom dependency checks in drivers |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Functional fail Functional Testing issues
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-abi-testing success Testing PASS

Commit Message

David Marchand Jan. 20, 2022, 10:54 a.m. UTC
  Some drivers currently have their own checks and give some non
consistent reasons when an internal dependency is unavailable.

drivers/meson.build also checks for internal dependencies via 'deps'.
Let's rely on it for consistency, and smaller code.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/kni/meson.build         | 5 +----
 drivers/net/netvsc/meson.build      | 4 +---
 drivers/net/vhost/meson.build       | 4 +---
 drivers/raw/dpaa2_cmdif/meson.build | 2 --
 drivers/raw/dpaa2_qdma/meson.build  | 2 --
 drivers/vdpa/ifc/meson.build        | 4 +---
 6 files changed, 4 insertions(+), 17 deletions(-)
  

Comments

Bruce Richardson Jan. 20, 2022, 11:37 a.m. UTC | #1
On Thu, Jan 20, 2022 at 11:54:21AM +0100, David Marchand wrote:
> Some drivers currently have their own checks and give some non
> consistent reasons when an internal dependency is unavailable.
> 
> drivers/meson.build also checks for internal dependencies via 'deps'.
> Let's rely on it for consistency, and smaller code.
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
Thanks for the cleanup.

Acked-by: Bruce Richardson <bruce.richardson@intel.com>
  
Long Li Jan. 20, 2022, 8:29 p.m. UTC | #2
> Subject: Re: [PATCH] build: remove custom dependency checks in drivers
> 
> On Thu, Jan 20, 2022 at 11:54:21AM +0100, David Marchand wrote:
> > Some drivers currently have their own checks and give some non
> > consistent reasons when an internal dependency is unavailable.
> >
> > drivers/meson.build also checks for internal dependencies via 'deps'.
> > Let's rely on it for consistency, and smaller code.
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> Thanks for the cleanup.
> 
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Thank you.

Acked-by: Long Li <longli@microsoft.com>
  
Thomas Monjalon Jan. 21, 2022, 2:37 p.m. UTC | #3
> > > Some drivers currently have their own checks and give some non
> > > consistent reasons when an internal dependency is unavailable.
> > >
> > > drivers/meson.build also checks for internal dependencies via 'deps'.
> > > Let's rely on it for consistency, and smaller code.
> > >
> > > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > > ---
> > Thanks for the cleanup.
> > 
> > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> Thank you.
> 
> Acked-by: Long Li <longli@microsoft.com>

Applied, thanks
  

Patch

diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
index c0751aeb59..2acc989694 100644
--- a/drivers/net/kni/meson.build
+++ b/drivers/net/kni/meson.build
@@ -7,8 +7,5 @@  if is_windows
     subdir_done()
 endif
 
-# this driver can be built if-and-only-if KNI library is buildable
-build = dpdk_conf.has('RTE_LIB_KNI')
-reason = 'missing dependency, DPDK KNI library'
-sources = files('rte_eth_kni.c')
 deps += 'kni'
+sources = files('rte_eth_kni.c')
diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build
index f74b941f65..399400dd01 100644
--- a/drivers/net/netvsc/meson.build
+++ b/drivers/net/netvsc/meson.build
@@ -7,8 +7,7 @@  if is_windows
     subdir_done()
 endif
 
-build = dpdk_conf.has('RTE_BUS_VMBUS')
-reason = 'missing dependency, DPDK VMBus driver'
+deps += 'bus_vmbus'
 sources = files(
         'hn_ethdev.c',
         'hn_nvs.c',
@@ -17,4 +16,3 @@  sources = files(
         'hn_vf.c',
 )
 
-deps += ['bus_vmbus' ]
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
index 858b79fdf5..f481a3a4b8 100644
--- a/drivers/net/vhost/meson.build
+++ b/drivers/net/vhost/meson.build
@@ -7,8 +7,6 @@  if is_windows
     subdir_done()
 endif
 
-build = dpdk_conf.has('RTE_LIB_VHOST')
-reason = 'missing dependency, DPDK vhost library'
+deps += 'vhost'
 sources = files('rte_eth_vhost.c')
 headers = files('rte_eth_vhost.h')
-deps += 'vhost'
diff --git a/drivers/raw/dpaa2_cmdif/meson.build b/drivers/raw/dpaa2_cmdif/meson.build
index 8824f887ce..3b1d3371b2 100644
--- a/drivers/raw/dpaa2_cmdif/meson.build
+++ b/drivers/raw/dpaa2_cmdif/meson.build
@@ -1,8 +1,6 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 NXP
 
-build = dpdk_conf.has('RTE_MEMPOOL_DPAA2')
-reason = 'missing dependency, DPDK DPAA2 mempool driver'
 deps += ['rawdev', 'mempool_dpaa2', 'bus_vdev']
 sources = files('dpaa2_cmdif.c')
 
diff --git a/drivers/raw/dpaa2_qdma/meson.build b/drivers/raw/dpaa2_qdma/meson.build
index 0c9ae0d8dc..4639073bcf 100644
--- a/drivers/raw/dpaa2_qdma/meson.build
+++ b/drivers/raw/dpaa2_qdma/meson.build
@@ -1,8 +1,6 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 NXP
 
-build = dpdk_conf.has('RTE_MEMPOOL_DPAA2')
-reason = 'missing dependency, DPDK DPAA2 mempool driver'
 deps += ['rawdev', 'mempool_dpaa2', 'ring', 'kvargs']
 sources = files('dpaa2_qdma.c')
 
diff --git a/drivers/vdpa/ifc/meson.build b/drivers/vdpa/ifc/meson.build
index 9d256af4b9..f78d36a715 100644
--- a/drivers/vdpa/ifc/meson.build
+++ b/drivers/vdpa/ifc/meson.build
@@ -1,8 +1,6 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-build = dpdk_conf.has('RTE_LIB_VHOST')
-reason = 'missing dependency, DPDK vhost library'
+deps += 'vhost'
 sources = files('ifcvf_vdpa.c', 'base/ifcvf.c')
 includes += include_directories('base')
-deps += 'vhost'