Skip to contentSkip to conversation

meson.build: replace tabs with spaces

PATCH In review Stephen Hemminger 2 participants 2 messages Nov 2, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson.build: replace tabs with spaces

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.

---
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(-)
app/pdump/meson.build +3 -3
index db1fcadbfe2c..b8a507f4e190 100644
@@ -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')
app/proc-info/meson.build +3 -3
index 82ed05bb0b4e..6c6933ac78f2 100644
@@ -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')
app/test-acl/meson.build +3 -3
index 14d36b33e930..57ce1b18180e 100644
@@ -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')
app/test-bbdev/meson.build +4 -4
index a726a5b3fa2a..9a5bdcbd5725 100644
@@ -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
app/test-cmdline/meson.build +3 -3
index 08988212000a..0e6c75accb9c 100644
@@ -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')
app/test-compress-perf/meson.build +3 -3
index f29c6ee86390..52de7d0d103c 100644
@@ -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(
app/test-crypto-perf/meson.build +3 -3
index ef3582a87c86..6685aaf07775 100644
@@ -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(
app/test-eventdev/meson.build +3 -3
index 17be36067717..a70c074db7f4 100644
@@ -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(
app/test-fib/meson.build +3 -3
index 3360ea02b0c9..584b178ddbac 100644
@@ -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')
app/test-flow-perf/meson.build +3 -3
index a33cad9078e8..ff5664d8e541 100644
@@ -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(
app/test-pipeline/meson.build +3 -3
index 7d123e32fb77..f1e22f936716 100644
@@ -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(
app/test-regex/meson.build +3 -3
index 02b101980eb5..453599dc9a26 100644
@@ -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')
app/test-sad/meson.build +3 -3
index 3d15727a0181..30a29b34bcf3 100644
@@ -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')
app/test/meson.build +3 -3
index 20f36a18034a..73f198db8172 100644
@@ -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')
config/meson.build +30 -30

84 lines not on this page · raw message

drivers/compress/octeontx/meson.build +3 -3
index cd8687fde30e..e839007066d7 100644
@@ -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')
drivers/crypto/cnxk/meson.build +3 -3
index 024109f7e92c..becb46019c4c 100644
@@ -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(
drivers/crypto/ipsec_mb/meson.build +19 -19
index d7037daea15f..cf37a1816905 100644
@@ -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']
drivers/crypto/qat/meson.build +1 -1
index b3b2d1725809..2b4dd9e09fb8 100644
@@ -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'
drivers/net/ice/meson.build +1 -1
index 0b86d74a49bc..be15a2ed0253 100644
@@ -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')
Signature · 1 line
2.30.2
#1 lore raw
Quoted 25 lines · Stephen Hemminger

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.

---
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 +--
Quoted 9 lines
 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/[email protected]/