From patchwork Thu Apr 1 11:50:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 90362 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 11C47A0548; Thu, 1 Apr 2021 13:51:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 725AD1410E6; Thu, 1 Apr 2021 13:50:33 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 792BC1410BC for ; Thu, 1 Apr 2021 13:50:30 +0200 (CEST) IronPort-SDR: SoJhh+elC1Bwm1MPoyo3VZUmCrAG3wTn3rEbK6EaGQ3Tfz5y85TWOWOjtNpAbXXuSigOjwEGy/ XKCxiaHI2piw== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="179760782" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="179760782" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 04:50:30 -0700 IronPort-SDR: vL5ar0S2S2Zf4l++OEOYxokL2lHZlLroYyJu3i94D/k3PMvI0b0qIqaMMVwo4j0nIvCUJM+EFP req4qVJ4HfYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="446062637" Received: from silpixa00399126.ir.intel.com ([10.237.223.116]) by FMSMGA003.fm.intel.com with ESMTP; 01 Apr 2021 04:50:28 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, david.marchand@redhat.com, bluca@debian.org, Bruce Richardson Date: Thu, 1 Apr 2021 12:50:00 +0100 Message-Id: <20210401115009.1063844-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401115009.1063844-1-bruce.richardson@intel.com> References: <20210401115009.1063844-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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 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']