On Tue, Nov 02, 2021 at 08:50:55AM -0700, Stephen Hemminger wrote:
> Per the meson recommendation the meson.build file
> should be indented with spaces not tabs.
> This patch is semi-automatically generated by running
> all the meson.build files through expand command.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> Note: if users (like me) just editconfig setup in their
> favorite editor, this would not be a problem.
>
> Also, shouldn't checkpatch be made smarter to catch this?
>
> app/pdump/meson.build | 6 +--
> app/proc-info/meson.build | 6 +--
> app/test-acl/meson.build | 6 +--
> app/test-bbdev/meson.build | 8 ++--
> app/test-cmdline/meson.build | 6 +--
> app/test-compress-perf/meson.build | 6 +--
> app/test-crypto-perf/meson.build | 6 +--
> app/test-eventdev/meson.build | 6 +--
> app/test-fib/meson.build | 6 +--
> app/test-flow-perf/meson.build | 6 +--
> app/test-pipeline/meson.build | 6 +--
> app/test-regex/meson.build | 6 +--
> app/test-sad/meson.build | 6 +--
> app/test/meson.build | 6 +--
> config/meson.build | 60 +++++++++++++--------------
> drivers/compress/octeontx/meson.build | 6 +--
> drivers/crypto/cnxk/meson.build | 6 +--
> drivers/crypto/ipsec_mb/meson.build | 38 ++++++++---------
> drivers/crypto/qat/meson.build | 2 +-
> drivers/net/ice/meson.build | 2 +-
> 20 files changed, 100 insertions(+), 100 deletions(-)
>
Yes, this should be caught automatically, and David M. has already proposed
a patch to automatically check for this [1].
For your patch specifically, most of the tabs need to be replaced by
4-chars rather than 8-chars of space. The last indent (drivers/net/ice) is
the one exception, I believe, and requires an 8-space indent.
Regards,
/Bruce
[1] http://patches.dpdk.org/project/dpdk/patch/20211022205531.9966-1-david.marchand@redhat.com/
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
@@ -24,5 +24,5 @@ if dpdk_conf.has('RTE_BASEBAND_ACC100')
deps += ['baseband_acc100']
endif
if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_LA12XX')
- deps += ['baseband_la12xx']
+ deps += ['baseband_la12xx']
endif
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('commands.c', 'cmdline_test.c')
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
@@ -2,9 +2,9 @@
# Copyright(c) 2017 Cavium, Inc
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
@@ -2,9 +2,9 @@
# Copyright(c) 2020 Mellanox Technologies, Ltd
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
@@ -2,9 +2,9 @@
# Copyright 2020 Mellanox Technologies, Ltd
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
@@ -2,9 +2,9 @@
# Copyright(c) 2017 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
if not get_option('tests')
@@ -324,47 +324,47 @@ endif
max_lcores = get_option('max_lcores')
if max_lcores == 'detect'
- # discovery makes sense only for non-cross builds
- if meson.is_cross_build()
- error('Discovery of max_lcores is not supported for cross-compilation.')
- endif
- # overwrite the default value with discovered values
- max_lcores = run_command(get_cpu_count_cmd).stdout().to_int()
- min_lcores = 2
- # DPDK must be built for at least 2 cores
- if max_lcores < min_lcores
- message('Found less than @0@ cores, building for @0@ cores'.format(min_lcores))
- max_lcores = min_lcores
- else
- message('Found @0@ cores'.format(max_lcores))
- endif
- dpdk_conf.set('RTE_MAX_LCORE', max_lcores)
+ # discovery makes sense only for non-cross builds
+ if meson.is_cross_build()
+ error('Discovery of max_lcores is not supported for cross-compilation.')
+ endif
+ # overwrite the default value with discovered values
+ max_lcores = run_command(get_cpu_count_cmd).stdout().to_int()
+ min_lcores = 2
+ # DPDK must be built for at least 2 cores
+ if max_lcores < min_lcores
+ message('Found less than @0@ cores, building for @0@ cores'.format(min_lcores))
+ max_lcores = min_lcores
+ else
+ message('Found @0@ cores'.format(max_lcores))
+ endif
+ dpdk_conf.set('RTE_MAX_LCORE', max_lcores)
elif max_lcores != 'default'
- # overwrite the default value from arch_subdir with user input
- dpdk_conf.set('RTE_MAX_LCORE', max_lcores.to_int())
+ # overwrite the default value from arch_subdir with user input
+ dpdk_conf.set('RTE_MAX_LCORE', max_lcores.to_int())
endif
max_numa_nodes = get_option('max_numa_nodes')
if max_numa_nodes == 'detect'
- # discovery makes sense only for non-cross builds
- if meson.is_cross_build()
- error('Discovery of max_numa_nodes not supported for cross-compilation.')
- endif
- # overwrite the default value with discovered values
- max_numa_nodes = run_command(get_numa_count_cmd).stdout().to_int()
- message('Found @0@ numa nodes'.format(max_numa_nodes))
- dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes)
+ # discovery makes sense only for non-cross builds
+ if meson.is_cross_build()
+ error('Discovery of max_numa_nodes not supported for cross-compilation.')
+ endif
+ # overwrite the default value with discovered values
+ max_numa_nodes = run_command(get_numa_count_cmd).stdout().to_int()
+ message('Found @0@ numa nodes'.format(max_numa_nodes))
+ dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes)
elif max_numa_nodes != 'default'
- # overwrite the default value from arch_subdir with user input
- dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes.to_int())
+ # overwrite the default value from arch_subdir with user input
+ dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes.to_int())
endif
# check that CPU and NUMA counts are set
if not dpdk_conf.has('RTE_MAX_LCORE')
- error('Number of CPU cores not specified.')
+ error('Number of CPU cores not specified.')
endif
if not dpdk_conf.has('RTE_MAX_NUMA_NODES')
- error('Number of NUMA nodes not specified.')
+ error('Number of NUMA nodes not specified.')
endif
# set the install path for the drivers
@@ -429,7 +429,7 @@ if get_option('b_sanitize') == 'address' or get_option('b_sanitize') == 'address
endif
if is_linux and arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
- dpdk_conf.set10('RTE_MALLOC_ASAN', true)
+ dpdk_conf.set10('RTE_MALLOC_ASAN', true)
endif
endif
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Cavium, Inc
if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
- build = false
- reason = 'only supported on 64-bit Linux'
- subdir_done()
+ build = false
+ reason = 'only supported on 64-bit Linux'
+ subdir_done()
endif
sources = files('otx_zip.c', 'otx_zip_pmd.c')
@@ -3,9 +3,9 @@
#
if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
- build = false
- reason = 'only supported on 64-bit Linux'
- subdir_done()
+ build = false
+ reason = 'only supported on 64-bit Linux'
+ subdir_done()
endif
sources = files(
@@ -4,30 +4,30 @@
IMB_required_ver = '1.0.0'
lib = cc.find_library('IPSec_MB', required: false)
if not lib.found()
- build = false
- reason = 'missing dependency, "libIPSec_MB"'
+ build = false
+ reason = 'missing dependency, "libIPSec_MB"'
else
- ext_deps += lib
+ ext_deps += lib
- # version comes with quotes, so we split based on " and take the middle
- imb_ver = cc.get_define('IMB_VERSION_STR',
- prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
+ # version comes with quotes, so we split based on " and take the middle
+ imb_ver = cc.get_define('IMB_VERSION_STR',
+ prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
- if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
- reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
- IMB_required_ver, imb_ver)
- build = false
- endif
+ if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
+ reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
+ IMB_required_ver, imb_ver)
+ build = false
+ endif
endif
sources = files('ipsec_mb_private.c',
- 'ipsec_mb_ops.c',
- 'pmd_aesni_mb.c',
- 'pmd_aesni_gcm.c',
- 'pmd_chacha_poly.c',
- 'pmd_kasumi.c',
- 'pmd_snow3g.c',
- 'pmd_zuc.c'
- )
+ 'ipsec_mb_ops.c',
+ 'pmd_aesni_mb.c',
+ 'pmd_aesni_gcm.c',
+ 'pmd_chacha_poly.c',
+ 'pmd_kasumi.c',
+ 'pmd_snow3g.c',
+ 'pmd_zuc.c'
+ )
deps += ['bus_vdev', 'net', 'security']
@@ -19,7 +19,7 @@ if dep.found()
'qat_sym_hw_dp.c',
'qat_sym_pmd.c',
'qat_sym_session.c',
- )
+ )
qat_ext_deps += dep
qat_cflags += '-DBUILD_QAT_SYM'
qat_cflags += '-DBUILD_QAT_ASYM'
@@ -71,6 +71,6 @@ sources += files('ice_dcf.c',
'ice_dcf_vf_representor.c',
'ice_dcf_ethdev.c',
'ice_dcf_parent.c',
- 'ice_dcf_sched.c')
+ 'ice_dcf_sched.c')
headers = files('rte_pmd_ice.h')