From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, arybchenko@solarflare.com,
ferruh.yigit@intel.com, thomas@monjalon.net,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [RFC PATCH v2 6/8] build: standardize component names and defines
Date: Fri, 2 Oct 2020 16:58:53 +0100 [thread overview]
Message-ID: <20201002155855.622456-7-bruce.richardson@intel.com> (raw)
In-Reply-To: <20201002155855.622456-1-bruce.richardson@intel.com>
As discussed on the dpdk-dev mailing list[1], we can make some easy
improvements in standardizing the naming of the various components in DPDK,
and their associated feature-enabled macros.
Following this patch, each library will have the name in format,
'librte_<name>.so', and the macro indicating that library is enabled in the
build will have the form 'RTE_LIB_<NAME>'.
Similarly, for libraries, the equivalent name formats and macros are:
'librte_<class>_<name>.so' and 'RTE_<CLASS>_<NAME>', where class is the
device type taken from the relevant driver subdirectory name, i.e. 'net',
'crypto' etc.
To avoid too many changes at once for end applications, the old macro names
will still be provided in the build in this release, but will be removed
subsequently.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
[1] http://inbox.dpdk.org/dev/ef7c1a87-79ab-e405-4202-39b7ad6b0c71@solarflare.com/t/#u
---
app/test-bbdev/meson.build | 4 ++--
app/test-crypto-perf/meson.build | 2 +-
app/test-pmd/meson.build | 12 ++++++------
app/test/meson.build | 8 ++++----
doc/guides/rel_notes/deprecation.rst | 8 ++++++++
drivers/baseband/meson.build | 1 -
drivers/bus/meson.build | 1 -
drivers/common/meson.build | 1 -
drivers/common/mlx5/meson.build | 1 -
drivers/common/qat/meson.build | 1 -
drivers/compress/meson.build | 1 -
drivers/compress/octeontx/meson.build | 2 +-
drivers/crypto/meson.build | 1 -
drivers/crypto/null/meson.build | 2 +-
drivers/crypto/octeontx/meson.build | 2 +-
drivers/crypto/octeontx2/meson.build | 2 +-
drivers/crypto/scheduler/meson.build | 2 +-
drivers/crypto/virtio/meson.build | 2 +-
drivers/event/dpaa/meson.build | 2 +-
drivers/event/dpaa2/meson.build | 2 +-
drivers/event/meson.build | 1 -
drivers/event/octeontx/meson.build | 2 +-
drivers/event/octeontx2/meson.build | 2 +-
drivers/mempool/meson.build | 1 -
drivers/meson.build | 9 ++++-----
drivers/net/meson.build | 1 -
drivers/net/mlx4/meson.build | 2 +-
drivers/raw/ifpga/meson.build | 2 +-
drivers/raw/meson.build | 1 -
drivers/regex/meson.build | 1 -
drivers/vdpa/meson.build | 1 -
examples/bond/meson.build | 2 +-
examples/ethtool/meson.build | 2 +-
examples/ioat/meson.build | 2 +-
examples/l2fwd-crypto/meson.build | 2 +-
examples/ntb/meson.build | 2 +-
examples/vm_power_manager/meson.build | 6 +++---
lib/librte_ethdev/meson.build | 1 -
lib/librte_graph/meson.build | 2 --
lib/meson.build | 3 ++-
40 files changed, 47 insertions(+), 55 deletions(-)
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 18ab6a8c6c..178306b08c 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -7,8 +7,8 @@ sources = files('main.c',
'test_bbdev_vector.c')
deps += ['bbdev', 'bus_vdev']
if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC')
- deps += ['pmd_bbdev_fpga_lte_fec']
+ deps += ['baseband_fpga_lte_fec']
endif
if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC')
- deps += ['pmd_bbdev_fpga_5gnr_fec']
+ deps += ['baseband_fpga_5gnr_fec']
endif
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 4bd71510dc..e6ddda6f0c 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -13,5 +13,5 @@ sources = files('cperf_ops.c',
'main.c')
deps += ['cryptodev', 'net', 'security']
if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
- deps += 'pmd_crypto_scheduler'
+ deps += 'crypto_scheduler'
endif
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 0d9e450494..2e8b9f8a99 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -38,22 +38,22 @@ if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS')
deps += 'latencystats'
endif
if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
- deps += 'pmd_crypto_scheduler'
+ deps += 'crypto_scheduler'
endif
if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
- deps += 'pmd_bond'
+ deps += 'net_bond'
endif
if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')
- deps += 'pmd_bnxt'
+ deps += 'net_bnxt'
endif
if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')
- deps += 'pmd_i40e'
+ deps += 'net_i40e'
endif
if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')
- deps += 'pmd_ixgbe'
+ deps += 'net_ixgbe'
endif
if dpdk_conf.has('RTE_LIBRTE_DPAA_PMD')
- deps += ['bus_dpaa', 'mempool_dpaa', 'pmd_dpaa']
+ deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
endif
if dpdk_conf.has('RTE_LIBRTE_BPF')
sources += files('bpf_cmd.c')
diff --git a/app/test/meson.build b/app/test/meson.build
index 781555f9de..d3ae9c91ac 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -344,10 +344,10 @@ if dpdk_conf.has('RTE_LIBRTE_STACK_MEMPOOL')
test_deps += 'mempool_stack'
endif
if dpdk_conf.has('RTE_LIBRTE_SKELETON_EVENTDEV_PMD')
- test_deps += 'pmd_skeleton_event'
+ test_deps += 'event_skeleton'
endif
if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
- test_deps += 'pmd_crypto_scheduler'
+ test_deps += 'crypto_scheduler'
endif
if dpdk_conf.has('RTE_LIBRTE_TELEMETRY')
test_sources += 'test_telemetry_json.c'
@@ -357,7 +357,7 @@ endif
# The following linkages of drivers are required because
# they are used via a driver-specific API.
if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
- test_deps += 'pmd_bond'
+ test_deps += 'net_bond'
test_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c']
driver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest']
if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
@@ -366,7 +366,7 @@ if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
endif
endif
if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
- test_deps += 'pmd_ring'
+ test_deps += 'net_ring'
test_sources += 'test_pmd_ring_perf.c'
test_sources += 'test_pmd_ring.c'
test_sources += 'test_event_eth_tx_adapter.c'
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 0be208edca..dafabdfaa5 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -11,6 +11,14 @@ here.
Deprecation Notices
-------------------
+* build: The macros defined to indicate which DPDK libraries and drivers
+ are included in the meson build are changing to a standardized format of
+ ``RTE_LIB_<NAME>`` and ``RTE_<CLASS>_<NAME>``, where ``NAME`` is the
+ upper-case component name, e.g. EAL, ETHDEV, IXGBE, and ``CLASS`` is the
+ upper-case name of the device class to which a driver belongs e.g.
+ ``NET``, ``CRYPTO``, ``VDPA``. The old macros are deprecated and will be
+ removed in a future release.
+
* meson: The minimum supported version of meson for configuring and building
DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For
those users with a version earlier than 0.47.1, an updated copy of meson
diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build
index 415b6724b1..7e1b64ffdd 100644
--- a/drivers/baseband/meson.build
+++ b/drivers/baseband/meson.build
@@ -8,4 +8,3 @@ endif
drivers = ['null', 'turbo_sw', 'fpga_lte_fec', 'fpga_5gnr_fec']
config_flag_fmt = 'RTE_LIBRTE_PMD_BBDEV_@0@'
-driver_name_fmt = 'rte_pmd_bbdev_@0@'
diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build
index 80de2d91d5..bd73efd187 100644
--- a/drivers/bus/meson.build
+++ b/drivers/bus/meson.build
@@ -4,4 +4,3 @@
drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus']
std_deps = ['eal']
config_flag_fmt = 'RTE_LIBRTE_@0@_BUS'
-driver_name_fmt = 'rte_bus_@0@'
diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index abb4f1529a..d78882f05e 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -8,4 +8,3 @@ endif
std_deps = ['eal']
drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx']
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
-driver_name_fmt = 'rte_common_@0@'
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index 8e5608703e..3dacc6f683 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -8,7 +8,6 @@ if not is_linux
endif
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
-driver_name_fmt = 'rte_common_@0@'
deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs']
sources += files(
'mlx5_devx_cmds.c',
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 3409162d03..fdf8b84f89 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -2,7 +2,6 @@
# Copyright(c) 2017-2018 Intel Corporation
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
-driver_name_fmt = 'rte_common_@0@'
qat_crypto = true
qat_crypto_path = 'crypto/qat'
diff --git a/drivers/compress/meson.build b/drivers/compress/meson.build
index 3a4723c0ce..33f5e33dde 100644
--- a/drivers/compress/meson.build
+++ b/drivers/compress/meson.build
@@ -9,4 +9,3 @@ drivers = ['isal', 'octeontx', 'zlib']
std_deps = ['compressdev'] # compressdev pulls in all other needed deps
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'
-driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/compress/octeontx/meson.build b/drivers/compress/octeontx/meson.build
index 0dc98b7627..2d71b4da21 100644
--- a/drivers/compress/octeontx/meson.build
+++ b/drivers/compress/octeontx/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Cavium, Inc
-name = 'octeontx_compress'
+fmt_name = 'octeontx_compress'
sources = files('otx_zip.c', 'otx_zip_pmd.c')
includes += include_directories('include')
deps += ['mempool_octeontx', 'bus_pci']
diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index bd7a940e6d..fa5c7ef3a5 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -26,4 +26,3 @@ drivers = ['aesni_gcm',
std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'
-driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/crypto/null/meson.build b/drivers/crypto/null/meson.build
index 502336da2b..421414916c 100644
--- a/drivers/crypto/null/meson.build
+++ b/drivers/crypto/null/meson.build
@@ -2,5 +2,5 @@
# Copyright(c) 2017 Intel Corporation
deps += 'bus_vdev'
-name = 'null_crypto'
+fmt_name = 'null_crypto'
sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c')
diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build
index cf031b006c..d6939720d8 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -7,7 +7,7 @@ endif
deps += ['bus_pci']
deps += ['common_cpt']
-name = 'octeontx_crypto'
+fmt_name = 'octeontx_crypto'
sources = files('otx_cryptodev.c',
'otx_cryptodev_capabilities.c',
diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build
index 148ec184a6..bf502e247d 100644
--- a/drivers/crypto/octeontx2/meson.build
+++ b/drivers/crypto/octeontx2/meson.build
@@ -11,7 +11,7 @@ deps += ['common_cpt']
deps += ['common_octeontx2']
deps += ['ethdev']
deps += ['security']
-name = 'octeontx2_crypto'
+fmt_name = 'octeontx2_crypto'
sources = files('otx2_cryptodev.c',
'otx2_cryptodev_capabilities.c',
diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build
index c5ba2d6804..2209c50232 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -2,7 +2,7 @@
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
deps += ['bus_vdev', 'reorder']
-name = 'crypto_scheduler'
+fmt_name = 'crypto_scheduler'
sources = files(
'rte_cryptodev_scheduler.c',
'scheduler_failover.c',
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index b15b3f9fab..6cea782deb 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -3,6 +3,6 @@
includes += include_directories('../../../lib/librte_vhost')
deps += 'bus_pci'
-name = 'virtio_crypto'
+fmt_name = 'virtio_crypto'
sources = files('virtio_cryptodev.c', 'virtio_pci.c',
'virtio_rxtx.c', 'virtqueue.c')
diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build
index 2f761f8e5b..9abb75e3e9 100644
--- a/drivers/event/dpaa/meson.build
+++ b/drivers/event/dpaa/meson.build
@@ -5,7 +5,7 @@ if not is_linux
build = false
reason = 'only supported on linux'
endif
-deps += ['pmd_dpaa', 'pmd_dpaa_sec']
+deps += ['net_dpaa', 'crypto_dpaa_sec']
sources = files('dpaa_eventdev.c')
includes += include_directories('../../crypto/dpaa_sec/')
diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build
index 71c8be3d6e..4ead7bb3e9 100644
--- a/drivers/event/dpaa2/meson.build
+++ b/drivers/event/dpaa2/meson.build
@@ -5,7 +5,7 @@ if not is_linux
build = false
reason = 'only supported on linux'
endif
-deps += ['bus_vdev', 'pmd_dpaa2', 'pmd_dpaa2_sec']
+deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec']
sources = files('dpaa2_hw_dpcon.c',
'dpaa2_eventdev.c',
'dpaa2_eventdev_selftest.c')
diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index f2a3431472..a7dac99de2 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -12,4 +12,3 @@ if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and
endif
std_deps = ['eventdev', 'kvargs']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_EVENTDEV'
-driver_name_fmt = 'rte_pmd_@0@_event'
diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build
index 2b74bb62de..41e367684c 100644
--- a/drivers/event/octeontx/meson.build
+++ b/drivers/event/octeontx/meson.build
@@ -10,4 +10,4 @@ sources = files('ssovf_worker.c',
'timvf_probe.c'
)
-deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'pmd_octeontx']
+deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx']
diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build
index 0ade51cec7..3e5eb37d24 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -24,6 +24,6 @@ foreach flag: extra_flags
endif
endforeach
-deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'pmd_octeontx2']
+deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'net_octeontx2']
includes += include_directories('../../crypto/octeontx2')
diff --git a/drivers/mempool/meson.build b/drivers/mempool/meson.build
index c9609f1453..036647149e 100644
--- a/drivers/mempool/meson.build
+++ b/drivers/mempool/meson.build
@@ -8,4 +8,3 @@ endif
drivers = ['bucket', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring', 'stack']
std_deps = ['mempool']
config_flag_fmt = 'RTE_LIBRTE_@0@_MEMPOOL'
-driver_name_fmt = 'rte_mempool_@0@'
diff --git a/drivers/meson.build b/drivers/meson.build
index 3d4bbff13b..a5a6fed06e 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -33,9 +33,6 @@ foreach subpath:subdirs
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
- driver_name_fmt = '' # format string for driver name, used to name
- # the library, the dependency and to find the
- # version file for linking
# subpath can be either "class" or "class/driver"
if subpath.contains('/')
@@ -113,11 +110,14 @@ foreach subpath:subdirs
endif
else
enabled_drivers += name
+ lib_name = '_'.join(['rte', class, name])
+ dpdk_conf.set(lib_name.to_upper(), 1)
if fmt_name == ''
fmt_name = name
endif
- dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1)
+
+ dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) #old-style macro
# for driver compatibility, since we changed the
# default to match that of make. Remove in future release
# after following deprecation process
@@ -133,7 +133,6 @@ foreach subpath:subdirs
dpdk_conf.set(alt_flag_fmt.format(
fmt_name.to_upper()), 1)
endif
- lib_name = driver_name_fmt.format(fmt_name)
dpdk_extra_ldflags += pkgconfig_extra_libs
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index d56b24051a..4e4c2c976a 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -59,4 +59,3 @@ std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std
std_deps += ['bus_vdev'] # same with vdev bus
config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
-driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 5a25e11a7b..4040065150 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -116,7 +116,7 @@ configure_file(output : 'mlx4_autoconf.h', configuration : config)
# Build Glue Library
if dlopen_ibverbs
dlopen_name = 'mlx4_glue'
- dlopen_lib_name = driver_name_fmt.format(dlopen_name)
+ dlopen_lib_name = 'rte_net_' + dlopen_name
dlopen_so_version = LIB_GLUE_VERSION
dlopen_sources = files('mlx4_glue.c')
dlopen_install_dir = [ eal_pmd_path + '-glue' ]
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index da454b1942..027ff80562 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -11,7 +11,7 @@ subdir('base')
objs = [base_objs]
deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
- 'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke']
+ 'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
sources = files('ifpga_rawdev.c')
diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
index 2c1e65ec79..d8d6cf5824 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -12,4 +12,3 @@ drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
'skeleton']
std_deps = ['rawdev']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
-driver_name_fmt = 'rte_rawdev_@0@'
diff --git a/drivers/regex/meson.build b/drivers/regex/meson.build
index 8edeba3a0a..f171e9fdf0 100644
--- a/drivers/regex/meson.build
+++ b/drivers/regex/meson.build
@@ -4,4 +4,3 @@
drivers = ['mlx5']
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
-driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
index 798eb38305..b346e43086 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -10,4 +10,3 @@ drivers = ['ifc',
std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost']
config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
-driver_name_fmt = 'rte_pmd_@0@'
diff --git a/examples/bond/meson.build b/examples/bond/meson.build
index 82e355a492..69382ffcd2 100644
--- a/examples/bond/meson.build
+++ b/examples/bond/meson.build
@@ -6,7 +6,7 @@
# To build this example as a standalone application with an already-installed
# DPDK instance, use 'make'
-deps += 'pmd_bond'
+deps += 'net_bond'
allow_experimental_apis = true
sources = files(
'main.c'
diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build
index bc7a35514c..fdfdd1971e 100644
--- a/examples/ethtool/meson.build
+++ b/examples/ethtool/meson.build
@@ -14,7 +14,7 @@ includes = include_directories('lib', 'ethtool-app')
deps += 'bus_pci'
if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')
- deps += 'pmd_ixgbe'
+ deps += 'net_ixgbe'
endif
allow_experimental_apis = true
diff --git a/examples/ioat/meson.build b/examples/ioat/meson.build
index f72cf70e7e..f1a045a0a6 100644
--- a/examples/ioat/meson.build
+++ b/examples/ioat/meson.build
@@ -9,7 +9,7 @@
allow_experimental_apis = true
build = dpdk_conf.has('RTE_LIBRTE_PMD_IOAT_RAWDEV')
-deps += ['rawdev_ioat']
+deps += ['raw_ioat']
sources = files(
'ioatfwd.c'
diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build
index 39e1604fac..9002d62a6c 100644
--- a/examples/l2fwd-crypto/meson.build
+++ b/examples/l2fwd-crypto/meson.build
@@ -8,7 +8,7 @@
deps += 'cryptodev'
if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
- deps += 'pmd_crypto_scheduler'
+ deps += 'crypto_scheduler'
endif
allow_experimental_apis = true
sources = files(
diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build
index 45a59350c5..bac6e5cd23 100644
--- a/examples/ntb/meson.build
+++ b/examples/ntb/meson.build
@@ -16,5 +16,5 @@ sources = files(
'ntb_fwd.c'
)
if dpdk_conf.has('RTE_LIBRTE_PMD_NTB_RAWDEV')
- deps += 'rawdev_ntb'
+ deps += 'raw_ntb'
endif
diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index 54e2b584f6..2dd132015f 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -14,15 +14,15 @@ endif
deps += ['power']
if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')
- deps += ['pmd_bnxt']
+ deps += ['net_bnxt']
endif
if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')
- deps += ['pmd_i40e']
+ deps += ['net_i40e']
endif
if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')
- deps += ['pmd_ixgbe']
+ deps += ['net_ixgbe']
endif
allow_experimental_apis = true
diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build
index 8fc24e8c8a..e4b610246f 100644
--- a/lib/librte_ethdev/meson.build
+++ b/lib/librte_ethdev/meson.build
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-name = 'ethdev'
sources = files('ethdev_private.c',
'ethdev_profile.c',
'ethdev_trace_points.c',
diff --git a/lib/librte_graph/meson.build b/lib/librte_graph/meson.build
index d5de1e250a..d3ec78ca62 100644
--- a/lib/librte_graph/meson.build
+++ b/lib/librte_graph/meson.build
@@ -1,8 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(C) 2020 Marvell International Ltd.
-name = 'graph'
-
sources = files('node.c', 'graph.c', 'graph_ops.c', 'graph_debug.c', 'graph_stats.c', 'graph_populate.c')
headers = files('rte_graph.h', 'rte_graph_worker.h')
diff --git a/lib/meson.build b/lib/meson.build
index 3ea26db204..38678a7fb5 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -97,7 +97,8 @@ foreach l:libraries
set_variable(name.underscorify() + '_disable_reason', reason)
else
enabled_libs += name
- dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1)
+ dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro
+ dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro
install_headers(headers)
libname = 'rte_' + name
--
2.25.1
next prev parent reply other threads:[~2020-10-02 16:02 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 16:44 [dpdk-dev] [RFC PATCH 0/5] rework feature enabling macros for compatibility Bruce Richardson
2020-09-16 16:44 ` [dpdk-dev] [RFC PATCH 1/5] app: fix missing dependencies Bruce Richardson
2020-09-16 16:44 ` [dpdk-dev] [RFC PATCH 2/5] examples/l2fwd-crypto: fix missing dependency Bruce Richardson
2020-09-16 16:44 ` [dpdk-dev] [RFC PATCH 3/5] meson: fix compatibility with make build defines Bruce Richardson
2020-09-16 16:44 ` [dpdk-dev] [RFC PATCH 4/5] build: add defines for compatibility with make build Bruce Richardson
2020-09-16 16:44 ` [dpdk-dev] [RFC PATCH 5/5] build: replace use of old build macros Bruce Richardson
2020-09-17 17:59 ` [dpdk-dev] [RFC PATCH 0/5] rework feature enabling macros for compatibility Andrew Rybchenko
2020-09-18 8:41 ` Bruce Richardson
2020-09-18 8:59 ` Andrew Rybchenko
2020-09-18 12:19 ` Ferruh Yigit
2020-09-23 12:46 ` Thomas Monjalon
2020-09-30 16:49 ` Richardson, Bruce
2020-09-30 17:31 ` Thomas Monjalon
2020-09-18 15:12 ` David Marchand
2020-09-30 16:12 ` Ferruh Yigit
2020-09-30 16:19 ` Bruce Richardson
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 0/8] Rework build macros Bruce Richardson
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 1/8] app: fix missing dependencies Bruce Richardson
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 2/8] examples/l2fwd-crypto: fix missing dependency Bruce Richardson
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 3/8] build: add defines for compatibility with make build Bruce Richardson
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 4/8] qat: build from common folder Bruce Richardson
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 5/8] build: remove library name from version map filename Bruce Richardson
2020-10-02 15:58 ` Bruce Richardson [this message]
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 7/8] build: replace use of old build macros Bruce Richardson
2020-10-02 15:58 ` [dpdk-dev] [RFC PATCH v2 8/8] [v21.02] build: remove compatibility build defines Bruce Richardson
2020-10-14 14:12 ` [dpdk-dev] [PATCH v3 0/7] Rework build macros Bruce Richardson
2020-10-14 14:12 ` [dpdk-dev] [PATCH v3 1/7] app: fix missing dependencies Bruce Richardson
2020-10-15 10:32 ` Luca Boccassi
2020-10-14 14:12 ` [dpdk-dev] [PATCH v3 2/7] examples/l2fwd-crypto: fix missing dependency Bruce Richardson
2020-10-15 10:32 ` Luca Boccassi
2020-10-14 14:13 ` [dpdk-dev] [PATCH v3 3/7] build: add defines for compatibility with make build Bruce Richardson
2020-10-15 10:31 ` Luca Boccassi
2020-10-15 11:20 ` Bruce Richardson
2020-10-14 14:13 ` [dpdk-dev] [PATCH v3 4/7] qat: build from common folder Bruce Richardson
2020-10-15 10:32 ` Luca Boccassi
2020-10-14 14:13 ` [dpdk-dev] [PATCH v3 5/7] build: remove library name from version map filename Bruce Richardson
2020-10-15 10:32 ` Luca Boccassi
2020-10-14 14:13 ` [dpdk-dev] [PATCH v3 6/7] build: standardize component names and defines Bruce Richardson
2020-10-15 10:30 ` Luca Boccassi
2020-10-15 11:18 ` Bruce Richardson
2020-10-15 13:05 ` Luca Boccassi
2020-10-15 14:03 ` Bruce Richardson
2020-10-15 15:32 ` Luca Boccassi
2020-10-15 15:34 ` Bruce Richardson
2020-10-14 14:13 ` [dpdk-dev] [PATCH v3 7/7] build: replace use of old build macros Bruce Richardson
2020-10-15 10:32 ` Luca Boccassi
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 0/8] Rework " Bruce Richardson
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 1/8] app: fix missing dependencies Bruce Richardson
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 2/8] examples/l2fwd-crypto: fix missing dependency Bruce Richardson
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 3/8] build: add defines for compatibility with make build Bruce Richardson
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 4/8] qat: build from common folder Bruce Richardson
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 5/8] build: remove library name from version map filename Bruce Richardson
2020-10-18 11:56 ` Xu, Rosen
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 6/8] devtools/test-null: load all drivers from directory Bruce Richardson
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 7/8] build: standardize component names and defines Bruce Richardson
2020-10-18 11:55 ` Xu, Rosen
2020-10-15 11:03 ` [dpdk-dev] [PATCH v4 8/8] build: replace use of old build macros Bruce Richardson
2020-10-18 11:55 ` Xu, Rosen
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 0/8] Rework " Bruce Richardson
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 1/8] app: fix missing dependencies Bruce Richardson
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 2/8] examples/l2fwd-crypto: fix missing dependency Bruce Richardson
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 3/8] build: add defines for compatibility with make build Bruce Richardson
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 4/8] qat: build from common folder Bruce Richardson
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 5/8] build: remove library name from version map filename Bruce Richardson
2020-10-15 15:28 ` Andrew Rybchenko
2020-10-19 20:04 ` Thomas Monjalon
2020-10-18 9:24 ` Xu, Rosen
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 6/8] devtools/test-null: load all drivers from directory Bruce Richardson
2020-10-19 16:58 ` Thomas Monjalon
2020-10-20 8:37 ` Bruce Richardson
2020-10-20 10:01 ` Thomas Monjalon
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 7/8] build: standardize component names and defines Bruce Richardson
2020-10-15 15:32 ` Andrew Rybchenko
2020-10-15 15:35 ` Bruce Richardson
2020-10-18 9:21 ` Xu, Rosen
2020-10-15 15:05 ` [dpdk-dev] [PATCH v5 8/8] build: replace use of old build macros Bruce Richardson
2020-10-15 15:34 ` Andrew Rybchenko
2020-10-18 9:23 ` Xu, Rosen
2020-10-19 19:03 ` Thomas Monjalon
2020-10-19 20:27 ` [dpdk-dev] [PATCH v5 0/8] Rework " Thomas Monjalon
2020-10-20 7:17 ` David Marchand
2020-10-20 8:37 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201002155855.622456-7-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=arybchenko@solarflare.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).