From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, david.marchand@redhat.com, bluca@debian.org,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation
Date: Thu, 1 Apr 2021 12:50:00 +0100 [thread overview]
Message-ID: <20210401115009.1063844-6-bruce.richardson@intel.com> (raw)
In-Reply-To: <20210401115009.1063844-1-bruce.richardson@intel.com>
Ensure all lists of drivers are one-per-line and replace tabs with spaces
in each file to correspond to the new standard.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/baseband/meson.build | 8 ++-
drivers/bus/meson.build | 7 ++-
drivers/common/meson.build | 9 +++-
drivers/compress/meson.build | 7 ++-
drivers/crypto/meson.build | 38 ++++++-------
drivers/event/meson.build | 17 ++++--
drivers/mempool/meson.build | 8 ++-
drivers/meson.build | 33 ++++++------
drivers/net/meson.build | 102 +++++++++++++++++------------------
drivers/raw/meson.build | 15 +++---
drivers/regex/meson.build | 3 +-
drivers/vdpa/meson.build | 4 +-
12 files changed, 142 insertions(+), 109 deletions(-)
diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build
index 920e3b02ee..22d0036cd7 100644
--- a/drivers/baseband/meson.build
+++ b/drivers/baseband/meson.build
@@ -2,7 +2,11 @@
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
if is_windows
- subdir_done()
+ subdir_done()
endif
-drivers = ['null', 'turbo_sw', 'fpga_lte_fec', 'fpga_5gnr_fec', 'acc100']
+drivers = ['null',
+ 'turbo_sw',
+ 'fpga_lte_fec',
+ 'fpga_5gnr_fec',
+ 'acc100']
diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build
index 2e7727af08..65716c23f9 100644
--- a/drivers/bus/meson.build
+++ b/drivers/bus/meson.build
@@ -1,5 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus']
+drivers = ['dpaa',
+ 'fslmc',
+ 'ifpga',
+ 'pci',
+ 'vdev',
+ 'vmbus']
std_deps = ['eal']
diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index 66e12143b2..dfebb17e29 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -2,8 +2,13 @@
# Copyright(c) 2018 Cavium, Inc
if is_windows
- subdir_done()
+ subdir_done()
endif
std_deps = ['eal']
-drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2']
+drivers = ['cpt',
+ 'dpaax',
+ 'iavf',
+ 'mvep',
+ 'octeontx',
+ 'octeontx2']
diff --git a/drivers/compress/meson.build b/drivers/compress/meson.build
index 49fa02d4ce..9cd631dff3 100644
--- a/drivers/compress/meson.build
+++ b/drivers/compress/meson.build
@@ -2,9 +2,12 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- subdir_done()
+ subdir_done()
endif
-drivers = ['isal', 'mlx5', 'octeontx', 'zlib']
+drivers = ['isal',
+ 'mlx5',
+ 'octeontx',
+ 'zlib']
std_deps = ['compressdev'] # compressdev pulls in all other needed deps
diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index c927c5f8d3..e337fc5d1d 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,27 +2,27 @@
# Copyright(c) 2017 Intel Corporation
if is_windows
- subdir_done()
+ subdir_done()
endif
drivers = ['aesni_gcm',
- 'aesni_mb',
- 'armv8',
- 'bcmfs',
- 'caam_jr',
- 'ccp',
- 'dpaa_sec',
- 'dpaa2_sec',
- 'kasumi',
- 'mvsam',
- 'nitrox',
- 'null',
- 'octeontx',
- 'octeontx2',
- 'openssl',
- 'scheduler',
- 'snow3g',
- 'virtio',
- 'zuc']
+ 'aesni_mb',
+ 'armv8',
+ 'bcmfs',
+ 'caam_jr',
+ 'ccp',
+ 'dpaa_sec',
+ 'dpaa2_sec',
+ 'kasumi',
+ 'mvsam',
+ 'nitrox',
+ 'null',
+ 'octeontx',
+ 'octeontx2',
+ 'openssl',
+ 'scheduler',
+ 'snow3g',
+ 'virtio',
+ 'zuc']
std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index a49288a5d4..60eac20dd6 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -2,13 +2,20 @@
# Copyright(c) 2017 Intel Corporation
if is_windows
- subdir_done()
+ subdir_done()
endif
-drivers = ['dlb', 'dlb2', 'dpaa', 'dpaa2', 'octeontx2', 'opdl', 'skeleton', 'sw',
- 'dsw']
+drivers = ['dlb',
+ 'dlb2',
+ 'dpaa',
+ 'dpaa2',
+ 'octeontx2',
+ 'opdl',
+ 'skeleton',
+ 'sw',
+ 'dsw']
if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and
- dpdk_conf.has('RTE_ARCH_ARM64'))
- drivers += 'octeontx'
+ dpdk_conf.has('RTE_ARCH_ARM64'))
+ drivers += 'octeontx'
endif
std_deps = ['eventdev', 'kvargs']
diff --git a/drivers/mempool/meson.build b/drivers/mempool/meson.build
index 4428813dae..8dacc74016 100644
--- a/drivers/mempool/meson.build
+++ b/drivers/mempool/meson.build
@@ -1,5 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-drivers = ['bucket', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring', 'stack']
+drivers = ['bucket',
+ 'dpaa',
+ 'dpaa2',
+ 'octeontx',
+ 'octeontx2',
+ 'ring',
+ 'stack']
std_deps = ['mempool']
diff --git a/drivers/meson.build b/drivers/meson.build
index 57b15bda03..cb273406c0 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -3,31 +3,30 @@
# Defines the order of dependencies evaluation
subdirs = [
- 'common',
- 'bus',
- 'common/mlx5', # depends on bus.
- 'common/qat', # depends on bus.
- 'common/sfc_efx', # depends on bus.
- 'mempool', # depends on common and bus.
- 'net', # depends on common, bus, mempool
- 'raw', # depends on common, bus and net.
- 'crypto', # depends on common, bus and mempool (net in future).
- 'compress', # depends on common, bus, mempool.
- 'regex', # depends on common, bus, regexdev.
- 'vdpa', # depends on common, bus and mempool.
- 'event', # depends on common, bus, mempool and net.
- 'baseband', # depends on common and bus.
+ 'common',
+ 'bus',
+ 'common/mlx5', # depends on bus.
+ 'common/qat', # depends on bus.
+ 'common/sfc_efx', # depends on bus.
+ 'mempool', # depends on common and bus.
+ 'net', # depends on common, bus, mempool
+ 'raw', # depends on common, bus and net.
+ 'crypto', # depends on common, bus and mempool (net in future).
+ 'compress', # depends on common, bus, mempool.
+ 'regex', # depends on common, bus, regexdev.
+ 'vdpa', # depends on common, bus and mempool.
+ 'event', # depends on common, bus, mempool and net.
+ 'baseband', # depends on common and bus.
]
-disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'),
- ).stdout().split()
+disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers')).stdout().split()
default_cflags = machine_args
default_cflags += ['-DALLOW_EXPERIMENTAL_API']
default_cflags += ['-DALLOW_INTERNAL_API']
if cc.has_argument('-Wno-format-truncation')
- default_cflags += '-Wno-format-truncation'
+ default_cflags += '-Wno-format-truncation'
endif
foreach subpath:subdirs
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index fb9ff05a1f..c2ecb57b4f 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -3,57 +3,57 @@
drivers = ['af_packet',
- 'af_xdp',
- 'ark',
- 'atlantic',
- 'avp',
- 'axgbe', 'bonding',
- 'bnx2x',
- 'bnxt',
- 'cxgbe',
- 'dpaa', 'dpaa2',
- 'e1000',
- 'ena',
- 'enetc',
- 'enic',
- 'failsafe',
- 'fm10k', 'i40e',
- 'hinic',
- 'hns3',
- 'iavf',
- 'ice',
- 'igc',
- 'ionic',
- 'ipn3ke',
- 'ixgbe',
- 'kni',
- 'liquidio',
- 'memif',
- 'mlx4',
- 'mlx5',
- 'mvneta',
- 'mvpp2',
- 'netvsc',
- 'nfb',
- 'nfp',
- 'null',
- 'octeontx',
- 'octeontx2',
- 'octeontx_ep',
- 'pcap',
- 'pfe',
- 'qede',
- 'ring',
- 'sfc',
- 'softnic',
- 'szedata2',
- 'tap',
- 'thunderx',
- 'txgbe',
- 'vdev_netvsc',
- 'vhost',
- 'virtio',
- 'vmxnet3',
+ 'af_xdp',
+ 'ark',
+ 'atlantic',
+ 'avp',
+ 'axgbe', 'bonding',
+ 'bnx2x',
+ 'bnxt',
+ 'cxgbe',
+ 'dpaa', 'dpaa2',
+ 'e1000',
+ 'ena',
+ 'enetc',
+ 'enic',
+ 'failsafe',
+ 'fm10k', 'i40e',
+ 'hinic',
+ 'hns3',
+ 'iavf',
+ 'ice',
+ 'igc',
+ 'ionic',
+ 'ipn3ke',
+ 'ixgbe',
+ 'kni',
+ 'liquidio',
+ 'memif',
+ 'mlx4',
+ 'mlx5',
+ 'mvneta',
+ 'mvpp2',
+ 'netvsc',
+ 'nfb',
+ 'nfp',
+ 'null',
+ 'octeontx',
+ 'octeontx2',
+ 'octeontx_ep',
+ 'pcap',
+ 'pfe',
+ 'qede',
+ 'ring',
+ 'sfc',
+ 'softnic',
+ 'szedata2',
+ 'tap',
+ 'thunderx',
+ 'txgbe',
+ 'vdev_netvsc',
+ 'vhost',
+ 'virtio',
+ 'vmxnet3',
]
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
diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
index 8c3a036dfd..cb45019c59 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -2,12 +2,15 @@
# Copyright 2018 NXP
if is_windows
- subdir_done()
+ subdir_done()
endif
-drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
- 'ifpga', 'ioat', 'ntb',
- 'octeontx2_dma',
- 'octeontx2_ep',
- 'skeleton']
+drivers = ['dpaa2_cmdif',
+ 'dpaa2_qdma',
+ 'ifpga',
+ 'ioat',
+ 'ntb',
+ 'octeontx2_dma',
+ 'octeontx2_ep',
+ 'skeleton']
std_deps = ['rawdev']
diff --git a/drivers/regex/meson.build b/drivers/regex/meson.build
index 2d05d5af12..ccdaa688b5 100644
--- a/drivers/regex/meson.build
+++ b/drivers/regex/meson.build
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2020 Mellanox Technologies, Ltd
-drivers = ['mlx5', 'octeontx2']
+drivers = ['mlx5',
+ 'octeontx2']
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
index 4929be4c03..a46f02bfb3 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -2,10 +2,10 @@
# Copyright 2019 Mellanox Technologies, Ltd
if is_windows
- subdir_done()
+ subdir_done()
endif
drivers = ['ifc',
- 'mlx5',]
+ 'mlx5',]
std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost']
--
2.27.0
next prev parent reply other threads:[~2021-04-01 11:51 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 11:49 [dpdk-dev] [RFC PATCH 00/14] Build file update proposals Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 01/14] editorconfig: add entry for meson files Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 02/14] build: simplify library build file Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 03/14] build: correct indentation in list of libs Bruce Richardson
2021-04-01 13:30 ` Thomas Monjalon
2021-04-01 14:01 ` Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 04/14] build: simplify the driver build configuration file Bruce Richardson
2021-04-01 11:50 ` Bruce Richardson [this message]
2021-04-01 12:14 ` [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation Andrew Rybchenko
2021-04-01 12:33 ` Bruce Richardson
2021-04-01 12:40 ` Andrew Rybchenko
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 06/14] build: reduce indentation in app build spec Bruce Richardson
2021-04-01 13:32 ` Thomas Monjalon
2021-04-01 14:05 ` Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 07/14] build: reduce indentation in examples " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 08/14] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 09/14] lib: change meson " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 10/14] drivers: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 11/14] examples: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 12/14] app: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 13/14] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-01 13:42 ` Thomas Monjalon
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 14/14] lib: allow disabling optional libraries Bruce Richardson
2021-04-01 12:27 ` [dpdk-dev] [RFC PATCH 00/14] Build file update proposals Andrew Rybchenko
2021-04-01 13:15 ` Luca Boccassi
2021-04-01 13:36 ` Thomas Monjalon
2021-04-01 14:10 ` Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 00/14] Build file updates Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 01/14] build: simplify library build file Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 02/14] build: tidy up list of libraries to build Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 03/14] build: simplify the driver build configuration file Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 04/14] build: clean up driver lists Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 05/14] build: reduce indentation in app build spec Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 06/14] build: reduce indentation in examples " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 07/14] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 08/14] lib: cleanup whitespace in meson build files Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 09/14] drivers: change meson file tabs to spaces Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 10/14] examples: " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 11/14] app: " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 12/14] editorconfig: add entry for meson files Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 13/14] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 14/14] lib: allow disabling optional libraries Bruce Richardson
2021-04-18 8:45 ` [dpdk-dev] [PATCH 00/14] Build file updates Xueming(Steven) Li
2021-04-19 13:06 ` Bruce Richardson
2021-04-21 13:01 ` Xueming(Steven) Li
2021-04-21 15:52 ` Xueming(Steven) Li
2021-04-19 0:20 ` Thomas Monjalon
2021-04-19 13:09 ` Bruce Richardson
2021-04-19 13:47 ` Thomas Monjalon
2021-04-19 14:23 ` Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 00/16] " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 01/16] build: simplify library build file Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 02/16] build: tidy up list of libraries to build Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 03/16] build: simplify the driver build configuration file Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 04/16] build: clean up driver lists Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 05/16] build: reduce indentation in app build spec Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 06/16] build: reduce indentation in examples " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 07/16] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-27 19:16 ` David Christensen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 08/16] lib: cleanup whitespace in meson build files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 09/16] drivers: change meson file tabs to spaces Bruce Richardson
2021-04-21 1:48 ` Xu, Rosen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 10/16] examples: " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 11/16] app: " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 12/16] editorconfig: add entry for meson files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 13/16] doc: add meson coding style section to contributors guide Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 14/16] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-28 20:18 ` David Christensen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 15/16] devtools: add script to ease backport of renamed files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 16/16] lib: allow disabling optional libraries Bruce Richardson
2021-04-21 12:08 ` [dpdk-dev] [PATCH v2 00/16] Build file updates Thomas Monjalon
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=20210401115009.1063844-6-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--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).