[dpdk-dev] [RFC PATCH 00/14] Build file update proposals

[dpdk-dev] [RFC PATCH 00/14] Build file update proposals

[Bruce Richardson]

This RFC contains 5 changes/updates to the DPDK build and build files. These
updates all assume that the minimum version for DPDK has increased to at least
meson 0.49 as proposed in [1].

The changes in this set are:
1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
   in the foreach loops when building library or driver components.
2. For libraries, drop support for header-only libraries, which was added just
   for the "compat" lib which had a single header, and is now part of EAL. This
   similarly reduces indentation levels and makes the code easier to follow
3. Since the larger blocks of meson code in our repo is seeing massive
   whitespace changes, take the opportunity to switch our indentation style for
   meson files from that of C-files using tabs, to Meson/Python style using
   spaces. [More below on this for discussion]
4. Remove the "librte_" prefix from all our library directories. While as useful
   cleanup, the main driver for this was that it simplifies the matching for #5
   below.
5. Add a "disable_libs" build option to allow the user to optionally not build
   certain components. Include in this an explicit list of libraries which are
   "known safe" to disable in the build. For now this is a short list of three
   libs, all of which are safe because they are not buildable on FreeBSD. More
   work is needed to expand this list in future.

Of these changes, I expect #3 to be most controversial. The initial
implementation of meson build for DPDK should have originally been done using
the correct meson style using spaces[2], but sadly it was not done that way. If
we are to ever change, I believe it should be now while other rework such as
this is being done. Here are the arguments for/against, as I see them.

Reasons to change:
* Align with official meson style, used on other projects
* Reduce indentation levels in code. NOTE: While not normally a consideration in
  programming, this is a possible issue with meson compared to C or Python,
  because we cannot create separate functions to move inner loops to lower
  indentation levels.
* It's probably now or never.

Reasons not to change:
* Outstanding patches for meson would need respin
* More work involved in backports - though with the more complicated meson
  blocks changing whitespace levels anyway due to #1 and #2 above, it's probably
  no more difficult than it would otherwise be. The extra changes to e.g. list
  indentation, require work to adjust whitespace, but are trivial to fix.
* Code churn

Feedback on these patches and proposed changes welcome, as always.

[1] http://patches.dpdk.org/project/dpdk/list/?series=15827
[2] https://mesonbuild.com/Style-guide.html#tabs-or-spaces

Bruce Richardson (14):
  editorconfig: add entry for meson files
  build: simplify library build file
  build: correct indentation in list of libs
  build: simplify the driver build configuration file
  build: clean up driver list indentation
  build: reduce indentation in app build spec
  build: reduce indentation in examples build spec
  build: change infrastructure file tabs to spaces
  lib: change meson file tabs to spaces
  drivers: change meson file tabs to spaces
  examples: change meson file tabs to spaces
  app: change meson file tabs to spaces
  lib: remove librte_ prefix from directory names
  lib: allow disabling optional libraries

 .editorconfig                                 |   5 +
 MAINTAINERS                                   | 212 ++---
 app/meson.build                               | 100 +--
 app/test-bbdev/meson.build                    |  12 +-
 app/test-compress-perf/meson.build            |  10 +-
 app/test-crypto-perf/meson.build              |  20 +-
 app/test-eventdev/meson.build                 |  24 +-
 app/test-flow-perf/meson.build                |   8 +-
 app/test-pipeline/meson.build                 |  18 +-
 app/test-pmd/meson.build                      |  60 +-
 app/test/meson.build                          | 812 +++++++++---------
 app/test/test_eal_fs.c                        |   2 +-
 app/test/test_memzone.c                       |   2 +-
 app/test/test_telemetry_json.c                |   2 +-
 buildtools/chkincs/meson.build                |  24 +-
 buildtools/meson.build                        |  34 +-
 buildtools/pkg-config/meson.build             |  34 +-
 config/arm/meson.build                        | 448 +++++-----
 config/meson.build                            | 278 +++---
 config/ppc/meson.build                        |   8 +-
 config/x86/meson.build                        |  64 +-
 devtools/build-tags.sh                        |  14 +-
 doc/api/doxy-api.conf.in                      | 104 +--
 doc/api/meson.build                           |  36 +-
 doc/guides/contributing/abi_versioning.rst    |  12 +-
 doc/guides/contributing/coding_style.rst      |   4 +-
 doc/guides/contributing/documentation.rst     |  10 +-
 doc/guides/meson.build                        |  24 +-
 doc/guides/prog_guide/event_timer_adapter.rst |   2 +-
 doc/guides/prog_guide/qos_framework.rst       |   4 +-
 doc/guides/prog_guide/rawdev.rst              |   2 +-
 doc/guides/rel_notes/known_issues.rst         |   2 +-
 doc/meson.build                               |   6 +-
 drivers/baseband/meson.build                  |   8 +-
 drivers/baseband/turbo_sw/meson.build         |  46 +-
 drivers/bus/dpaa/meson.build                  |  28 +-
 drivers/bus/fslmc/meson.build                 |  30 +-
 drivers/bus/ifpga/meson.build                 |   6 +-
 drivers/bus/meson.build                       |   7 +-
 drivers/bus/pci/meson.build                   |  24 +-
 drivers/bus/vdev/meson.build                  |   2 +-
 drivers/bus/vmbus/meson.build                 |  22 +-
 drivers/common/cpt/meson.build                |   2 +-
 drivers/common/dpaax/meson.build              |   8 +-
 drivers/common/meson.build                    |   9 +-
 drivers/common/mlx5/linux/meson.build         | 350 ++++----
 drivers/common/mlx5/meson.build               |  40 +-
 drivers/common/mlx5/windows/meson.build       |  30 +-
 drivers/common/mvep/meson.build               |   6 +-
 drivers/common/octeontx2/meson.build          |  18 +-
 drivers/common/qat/meson.build                |  60 +-
 drivers/common/sfc_efx/base/meson.build       | 142 +--
 drivers/common/sfc_efx/meson.build            |  24 +-
 drivers/compress/isal/meson.build             |   4 +-
 drivers/compress/meson.build                  |   7 +-
 drivers/compress/mlx5/meson.build             |  24 +-
 drivers/compress/zlib/meson.build             |   4 +-
 drivers/crypto/aesni_gcm/meson.build          |  22 +-
 drivers/crypto/aesni_mb/meson.build           |  22 +-
 drivers/crypto/armv8/meson.build              |   6 +-
 drivers/crypto/bcmfs/meson.build              |  26 +-
 drivers/crypto/caam_jr/meson.build            |  10 +-
 drivers/crypto/ccp/meson.build                |  16 +-
 drivers/crypto/dpaa2_sec/meson.build          |   6 +-
 drivers/crypto/dpaa_sec/meson.build           |   4 +-
 drivers/crypto/kasumi/meson.build             |  20 +-
 drivers/crypto/meson.build                    |  38 +-
 drivers/crypto/mvsam/meson.build              |   6 +-
 drivers/crypto/nitrox/meson.build             |  20 +-
 drivers/crypto/octeontx/meson.build           |  12 +-
 drivers/crypto/octeontx2/meson.build          |  16 +-
 drivers/crypto/openssl/meson.build            |   4 +-
 drivers/crypto/qat/meson.build                |  20 +-
 drivers/crypto/scheduler/meson.build          |  18 +-
 drivers/crypto/snow3g/meson.build             |  18 +-
 drivers/crypto/virtio/meson.build             |   4 +-
 drivers/crypto/zuc/meson.build                |  20 +-
 drivers/event/dlb/meson.build                 |  14 +-
 drivers/event/dlb2/meson.build                |  14 +-
 drivers/event/dpaa/meson.build                |   4 +-
 drivers/event/dpaa2/meson.build               |   8 +-
 drivers/event/dsw/meson.build                 |   2 +-
 drivers/event/meson.build                     |  17 +-
 drivers/event/octeontx/meson.build            |  12 +-
 drivers/event/octeontx2/meson.build           |  24 +-
 drivers/event/opdl/meson.build                |  10 +-
 drivers/event/sw/meson.build                  |   8 +-
 drivers/mempool/bucket/meson.build            |   4 +-
 drivers/mempool/dpaa/meson.build              |   4 +-
 drivers/mempool/dpaa2/meson.build             |   4 +-
 drivers/mempool/meson.build                   |   8 +-
 drivers/mempool/octeontx/meson.build          |   6 +-
 drivers/mempool/octeontx2/meson.build         |  20 +-
 drivers/mempool/stack/meson.build             |   4 +-
 drivers/meson.build                           | 394 +++++----
 drivers/net/af_packet/meson.build             |   4 +-
 drivers/net/af_xdp/meson.build                |  24 +-
 drivers/net/ark/meson.build                   |  24 +-
 drivers/net/atlantic/meson.build              |  22 +-
 drivers/net/avp/meson.build                   |   4 +-
 drivers/net/axgbe/meson.build                 |  16 +-
 drivers/net/bnx2x/meson.build                 |  18 +-
 drivers/net/bnxt/meson.build                  | 124 +--
 drivers/net/bonding/meson.build               |   8 +-
 drivers/net/cxgbe/meson.build                 |  30 +-
 drivers/net/dpaa/meson.build                  |  16 +-
 drivers/net/dpaa2/meson.build                 |  26 +-
 drivers/net/e1000/base/meson.build            |  50 +-
 drivers/net/e1000/meson.build                 |  20 +-
 drivers/net/ena/meson.build                   |  10 +-
 drivers/net/enetc/meson.build                 |   6 +-
 drivers/net/enic/meson.build                  |  46 +-
 drivers/net/failsafe/meson.build              |  24 +-
 drivers/net/fm10k/base/meson.build            |  28 +-
 drivers/net/fm10k/meson.build                 |  12 +-
 drivers/net/hinic/base/meson.build            |  26 +-
 drivers/net/hinic/meson.build                 |  16 +-
 drivers/net/hns3/meson.build                  |  46 +-
 drivers/net/i40e/base/meson.build             |  32 +-
 drivers/net/i40e/meson.build                  | 110 +--
 drivers/net/iavf/meson.build                  |  94 +-
 drivers/net/ice/base/meson.build              |  40 +-
 drivers/net/ice/meson.build                   | 100 +--
 drivers/net/igc/base/meson.build              |  20 +-
 drivers/net/igc/meson.build                   |  16 +-
 drivers/net/ionic/meson.build                 |  20 +-
 drivers/net/ipn3ke/meson.build                |  18 +-
 drivers/net/ixgbe/base/meson.build            |  42 +-
 drivers/net/ixgbe/meson.build                 |  32 +-
 drivers/net/kni/meson.build                   |   6 +-
 drivers/net/liquidio/meson.build              |  12 +-
 drivers/net/memif/meson.build                 |   6 +-
 drivers/net/meson.build                       | 102 +--
 drivers/net/mlx4/meson.build                  | 160 ++--
 drivers/net/mlx5/linux/meson.build            |  14 +-
 drivers/net/mlx5/meson.build                  |  78 +-
 drivers/net/mlx5/windows/meson.build          |  10 +-
 drivers/net/mvneta/meson.build                |  16 +-
 drivers/net/mvpp2/meson.build                 |  22 +-
 drivers/net/netvsc/meson.build                |   6 +-
 drivers/net/nfb/meson.build                   |   6 +-
 drivers/net/nfp/meson.build                   |  28 +-
 drivers/net/null/meson.build                  |   6 +-
 drivers/net/octeontx/base/meson.build         |  18 +-
 drivers/net/octeontx/meson.build              |  12 +-
 drivers/net/octeontx2/meson.build             |  62 +-
 drivers/net/pcap/meson.build                  |  10 +-
 drivers/net/pfe/meson.build                   |  12 +-
 drivers/net/qede/base/meson.build             |  78 +-
 drivers/net/qede/meson.build                  |  22 +-
 drivers/net/ring/meson.build                  |   6 +-
 drivers/net/sfc/meson.build                   |  64 +-
 drivers/net/softnic/meson.build               |  32 +-
 drivers/net/szedata2/meson.build              |   6 +-
 drivers/net/tap/meson.build                   |  42 +-
 drivers/net/thunderx/base/meson.build         |  10 +-
 drivers/net/thunderx/meson.build              |  14 +-
 drivers/net/txgbe/base/meson.build            |  26 +-
 drivers/net/txgbe/meson.build                 |  24 +-
 drivers/net/vdev_netvsc/meson.build           |   4 +-
 drivers/net/vhost/meson.build                 |   6 +-
 drivers/net/virtio/meson.build                |  78 +-
 drivers/net/vmxnet3/meson.build               |  12 +-
 drivers/raw/ifpga/base/meson.build            |  54 +-
 drivers/raw/ifpga/meson.build                 |   8 +-
 drivers/raw/ioat/meson.build                  |  18 +-
 drivers/raw/meson.build                       |  15 +-
 drivers/raw/ntb/meson.build                   |   2 +-
 drivers/raw/octeontx2_dma/meson.build         |   8 +-
 drivers/raw/octeontx2_ep/meson.build          |   6 +-
 drivers/regex/meson.build                     |   3 +-
 drivers/regex/mlx5/meson.build                |  32 +-
 drivers/regex/octeontx2/meson.build           |  22 +-
 drivers/vdpa/meson.build                      |   4 +-
 drivers/vdpa/mlx5/meson.build                 |  38 +-
 examples/bbdev_app/meson.build                |   2 +-
 examples/bond/meson.build                     |   2 +-
 examples/cmdline/meson.build                  |   2 +-
 examples/distributor/meson.build              |   4 +-
 examples/ethtool/meson.build                  |   8 +-
 examples/eventdev_pipeline/meson.build        |   6 +-
 examples/fips_validation/meson.build          |  22 +-
 examples/flow_classify/meson.build            |   2 +-
 examples/flow_filtering/meson.build           |   2 +-
 examples/helloworld/meson.build               |   2 +-
 examples/ioat/meson.build                     |   4 +-
 examples/ip_fragmentation/meson.build         |   2 +-
 examples/ip_pipeline/meson.build              |  30 +-
 examples/ip_reassembly/meson.build            |   2 +-
 examples/ipsec-secgw/meson.build              |  26 +-
 examples/ipv4_multicast/meson.build           |   2 +-
 examples/kni/meson.build                      |   4 +-
 examples/l2fwd-cat/meson.build                |   4 +-
 examples/l2fwd-crypto/meson.build             |   4 +-
 examples/l2fwd-event/meson.build              |  12 +-
 examples/l2fwd-jobstats/meson.build           |   2 +-
 examples/l2fwd-keepalive/meson.build          |   6 +-
 examples/l2fwd/meson.build                    |   2 +-
 examples/l3fwd-acl/meson.build                |   2 +-
 examples/l3fwd-graph/meson.build              |   2 +-
 examples/l3fwd-power/meson.build              |   2 +-
 examples/l3fwd/meson.build                    |   4 +-
 examples/link_status_interrupt/meson.build    |   2 +-
 examples/meson.build                          | 158 ++--
 .../client_server_mp/mp_client/meson.build    |   2 +-
 .../client_server_mp/mp_server/meson.build    |   2 +-
 examples/multi_process/hotplug_mp/meson.build |   2 +-
 examples/multi_process/simple_mp/meson.build  |   2 +-
 .../multi_process/symmetric_mp/meson.build    |   2 +-
 examples/ntb/meson.build                      |   8 +-
 examples/packet_ordering/meson.build          |   2 +-
 .../l3fwd-thread/meson.build                  |  20 +-
 .../pthread_shim/meson.build                  |  22 +-
 examples/pipeline/meson.build                 |  12 +-
 examples/ptpclient/meson.build                |   2 +-
 examples/qos_meter/meson.build                |   2 +-
 examples/qos_sched/meson.build                |   4 +-
 examples/rxtx_callbacks/meson.build           |   2 +-
 examples/service_cores/meson.build            |   2 +-
 examples/skeleton/meson.build                 |   2 +-
 examples/timer/meson.build                    |   2 +-
 examples/vdpa/meson.build                     |   6 +-
 examples/vhost/meson.build                    |  10 +-
 examples/vhost_blk/meson.build                |  10 +-
 examples/vhost_crypto/meson.build             |   4 +-
 .../vm_power_manager/guest_cli/meson.build    |   2 +-
 examples/vm_power_manager/meson.build         |  20 +-
 examples/vmdq/meson.build                     |   2 +-
 examples/vmdq_dcb/meson.build                 |   2 +-
 kernel/freebsd/meson.build                    |  32 +-
 kernel/linux/kni/meson.build                  |  40 +-
 kernel/linux/meson.build                      | 112 +--
 lib/{librte_acl => acl}/acl.h                 |   0
 lib/{librte_acl => acl}/acl_bld.c             |   0
 lib/{librte_acl => acl}/acl_gen.c             |   0
 lib/{librte_acl => acl}/acl_run.h             |   0
 lib/{librte_acl => acl}/acl_run_altivec.c     |   0
 lib/{librte_acl => acl}/acl_run_altivec.h     |   0
 lib/{librte_acl => acl}/acl_run_avx2.c        |   0
 lib/{librte_acl => acl}/acl_run_avx2.h        |   0
 lib/{librte_acl => acl}/acl_run_avx512.c      |   0
 .../acl_run_avx512_common.h                   |   0
 lib/{librte_acl => acl}/acl_run_avx512x16.h   |   0
 lib/{librte_acl => acl}/acl_run_avx512x8.h    |   0
 lib/{librte_acl => acl}/acl_run_neon.c        |   0
 lib/{librte_acl => acl}/acl_run_neon.h        |   0
 lib/{librte_acl => acl}/acl_run_scalar.c      |   0
 lib/{librte_acl => acl}/acl_run_sse.c         |   0
 lib/{librte_acl => acl}/acl_run_sse.h         |   0
 lib/{librte_acl => acl}/acl_vect.h            |   0
 lib/acl/meson.build                           |  83 ++
 lib/{librte_acl => acl}/rte_acl.c             |   0
 lib/{librte_acl => acl}/rte_acl.h             |   0
 lib/{librte_acl => acl}/rte_acl_osdep.h       |   0
 lib/{librte_acl => acl}/tb_mem.c              |   0
 lib/{librte_acl => acl}/tb_mem.h              |   0
 lib/{librte_acl => acl}/version.map           |   0
 lib/{librte_bbdev => bbdev}/meson.build       |   4 +-
 lib/{librte_bbdev => bbdev}/rte_bbdev.c       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.h       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_op.h    |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h   |   0
 lib/{librte_bbdev => bbdev}/version.map       |   0
 .../meson.build                               |   0
 .../rte_bitrate.c                             |   0
 .../rte_bitrate.h                             |   0
 .../version.map                               |   0
 lib/{librte_bpf => bpf}/bpf.c                 |   0
 lib/{librte_bpf => bpf}/bpf_def.h             |   0
 lib/{librte_bpf => bpf}/bpf_exec.c            |   0
 lib/{librte_bpf => bpf}/bpf_impl.h            |   0
 lib/{librte_bpf => bpf}/bpf_jit_arm64.c       |   0
 lib/{librte_bpf => bpf}/bpf_jit_x86.c         |   0
 lib/{librte_bpf => bpf}/bpf_load.c            |   0
 lib/{librte_bpf => bpf}/bpf_load_elf.c        |   0
 lib/{librte_bpf => bpf}/bpf_pkt.c             |   0
 lib/{librte_bpf => bpf}/bpf_validate.c        |   0
 lib/{librte_bpf => bpf}/meson.build           |  22 +-
 lib/{librte_bpf => bpf}/rte_bpf.h             |   0
 lib/{librte_bpf => bpf}/rte_bpf_ethdev.h      |   0
 lib/{librte_bpf => bpf}/version.map           |   0
 lib/{librte_cfgfile => cfgfile}/meson.build   |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h |   0
 lib/{librte_cfgfile => cfgfile}/version.map   |   0
 lib/{librte_cmdline => cmdline}/cmdline.c     |   0
 lib/{librte_cmdline => cmdline}/cmdline.h     |   0
 .../cmdline_cirbuf.c                          |   0
 .../cmdline_cirbuf.h                          |   0
 .../cmdline_os_unix.c                         |   0
 .../cmdline_os_windows.c                      |   0
 .../cmdline_parse.c                           |   0
 .../cmdline_parse.h                           |   0
 .../cmdline_parse_etheraddr.c                 |   0
 .../cmdline_parse_etheraddr.h                 |   0
 .../cmdline_parse_ipaddr.c                    |   0
 .../cmdline_parse_ipaddr.h                    |   0
 .../cmdline_parse_num.c                       |   0
 .../cmdline_parse_num.h                       |   0
 .../cmdline_parse_portlist.c                  |   0
 .../cmdline_parse_portlist.h                  |   0
 .../cmdline_parse_string.c                    |   0
 .../cmdline_parse_string.h                    |   0
 .../cmdline_private.h                         |   0
 .../cmdline_rdline.c                          |   0
 .../cmdline_rdline.h                          |   0
 .../cmdline_socket.c                          |   0
 .../cmdline_socket.h                          |   0
 .../cmdline_vt100.c                           |   0
 .../cmdline_vt100.h                           |   0
 lib/cmdline/meson.build                       |  34 +
 lib/{librte_cmdline => cmdline}/version.map   |   0
 .../meson.build                               |  10 +-
 .../rte_comp.c                                |   0
 .../rte_comp.h                                |   0
 .../rte_compressdev.c                         |   0
 .../rte_compressdev.h                         |   0
 .../rte_compressdev_internal.h                |   0
 .../rte_compressdev_pmd.c                     |   0
 .../rte_compressdev_pmd.h                     |   0
 .../version.map                               |   0
 .../cryptodev_trace_points.c                  |   0
 .../meson.build                               |  12 +-
 .../rte_crypto.h                              |   0
 .../rte_crypto_asym.h                         |   0
 .../rte_crypto_sym.h                          |   0
 .../rte_cryptodev.c                           |   0
 .../rte_cryptodev.h                           |   0
 .../rte_cryptodev_pmd.c                       |   0
 .../rte_cryptodev_pmd.h                       |   0
 .../rte_cryptodev_trace.h                     |   0
 .../rte_cryptodev_trace_fp.h                  |   0
 .../version.map                               |   0
 .../distributor_private.h                     |   0
 .../meson.build                               |   4 +-
 .../rte_distributor.c                         |   0
 .../rte_distributor.h                         |   0
 .../rte_distributor_match_generic.c           |   0
 .../rte_distributor_match_sse.c               |   0
 .../rte_distributor_single.c                  |   0
 .../rte_distributor_single.h                  |   0
 .../version.map                               |   0
 lib/eal/arm/include/meson.build               |  33 +
 .../arm/include/rte_atomic.h                  |   0
 .../arm/include/rte_atomic_32.h               |   0
 .../arm/include/rte_atomic_64.h               |   0
 .../arm/include/rte_byteorder.h               |   0
 .../arm/include/rte_cpuflags.h                |   0
 .../arm/include/rte_cpuflags_32.h             |   0
 .../arm/include/rte_cpuflags_64.h             |   0
 .../arm/include/rte_cycles.h                  |   0
 .../arm/include/rte_cycles_32.h               |   0
 .../arm/include/rte_cycles_64.h               |   0
 lib/{librte_eal => eal}/arm/include/rte_io.h  |   0
 .../arm/include/rte_io_64.h                   |   0
 .../arm/include/rte_mcslock.h                 |   0
 .../arm/include/rte_memcpy.h                  |   0
 .../arm/include/rte_memcpy_32.h               |   0
 .../arm/include/rte_memcpy_64.h               |   0
 .../arm/include/rte_pause.h                   |   0
 .../arm/include/rte_pause_32.h                |   0
 .../arm/include/rte_pause_64.h                |   0
 .../arm/include/rte_power_intrinsics.h        |   0
 .../arm/include/rte_prefetch.h                |   0
 .../arm/include/rte_prefetch_32.h             |   0
 .../arm/include/rte_prefetch_64.h             |   0
 .../arm/include/rte_rwlock.h                  |   0
 .../arm/include/rte_spinlock.h                |   0
 .../arm/include/rte_ticketlock.h              |   0
 .../arm/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/arm/meson.build       |   8 +-
 lib/{librte_eal => eal}/arm/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/arm/rte_cycles.c      |   0
 lib/{librte_eal => eal}/arm/rte_hypervisor.c  |   0
 .../arm/rte_power_intrinsics.c                |   0
 .../common/eal_common_bus.c                   |   0
 .../common/eal_common_class.c                 |   0
 .../common/eal_common_config.c                |   0
 .../common/eal_common_cpuflags.c              |   0
 .../common/eal_common_debug.c                 |   0
 .../common/eal_common_dev.c                   |   0
 .../common/eal_common_devargs.c               |   0
 .../common/eal_common_dynmem.c                |   0
 .../common/eal_common_errno.c                 |   0
 .../common/eal_common_fbarray.c               |   0
 .../common/eal_common_hexdump.c               |   0
 .../common/eal_common_hypervisor.c            |   0
 .../common/eal_common_launch.c                |   0
 .../common/eal_common_lcore.c                 |   0
 .../common/eal_common_log.c                   |   0
 .../common/eal_common_mcfg.c                  |   0
 .../common/eal_common_memalloc.c              |   0
 .../common/eal_common_memory.c                |   0
 .../common/eal_common_memzone.c               |   0
 .../common/eal_common_options.c               |   0
 .../common/eal_common_proc.c                  |   0
 .../common/eal_common_string_fns.c            |   0
 .../common/eal_common_tailqs.c                |   0
 .../common/eal_common_thread.c                |   0
 .../common/eal_common_timer.c                 |   0
 .../common/eal_common_trace.c                 |   0
 .../common/eal_common_trace_ctf.c             |   0
 .../common/eal_common_trace_points.c          |   0
 .../common/eal_common_trace_utils.c           |   0
 .../common/eal_common_uuid.c                  |   0
 .../common/eal_filesystem.h                   |   0
 .../common/eal_hugepages.h                    |   0
 .../common/eal_internal_cfg.h                 |   0
 lib/{librte_eal => eal}/common/eal_memalloc.h |   0
 lib/{librte_eal => eal}/common/eal_memcfg.h   |   0
 lib/{librte_eal => eal}/common/eal_options.h  |   0
 lib/{librte_eal => eal}/common/eal_private.h  |   0
 lib/{librte_eal => eal}/common/eal_thread.h   |   0
 lib/{librte_eal => eal}/common/eal_trace.h    |   0
 lib/{librte_eal => eal}/common/hotplug_mp.c   |   0
 lib/{librte_eal => eal}/common/hotplug_mp.h   |   0
 lib/{librte_eal => eal}/common/malloc_elem.c  |   0
 lib/{librte_eal => eal}/common/malloc_elem.h  |   0
 lib/{librte_eal => eal}/common/malloc_heap.c  |   0
 lib/{librte_eal => eal}/common/malloc_heap.h  |   0
 lib/{librte_eal => eal}/common/malloc_mp.c    |   0
 lib/{librte_eal => eal}/common/malloc_mp.h    |   0
 lib/eal/common/meson.build                    |  88 ++
 .../common/rte_keepalive.c                    |   0
 lib/{librte_eal => eal}/common/rte_malloc.c   |   0
 lib/{librte_eal => eal}/common/rte_random.c   |   0
 .../common/rte_reciprocal.c                   |   0
 lib/{librte_eal => eal}/common/rte_service.c  |   0
 lib/{librte_eal => eal}/common/rte_version.c  |   0
 lib/{librte_eal => eal}/freebsd/eal.c         |   0
 lib/{librte_eal => eal}/freebsd/eal_alarm.c   |   0
 .../freebsd/eal_alarm_private.h               |   0
 .../freebsd/eal_cpuflags.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_debug.c   |   0
 lib/{librte_eal => eal}/freebsd/eal_dev.c     |   0
 .../freebsd/eal_hugepage_info.c               |   0
 .../freebsd/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/freebsd/eal_lcore.c   |   0
 .../freebsd/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_memory.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_thread.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_timer.c   |   0
 .../freebsd/include/meson.build               |   0
 .../freebsd/include/rte_os.h                  |   0
 lib/eal/freebsd/meson.build                   |  21 +
 .../include/generic/rte_atomic.h              |   0
 .../include/generic/rte_byteorder.h           |   0
 .../include/generic/rte_cpuflags.h            |   0
 .../include/generic/rte_cycles.h              |   0
 .../include/generic/rte_io.h                  |   0
 .../include/generic/rte_mcslock.h             |   0
 .../include/generic/rte_memcpy.h              |   0
 .../include/generic/rte_pause.h               |   0
 .../include/generic/rte_power_intrinsics.h    |   0
 .../include/generic/rte_prefetch.h            |   0
 .../include/generic/rte_rwlock.h              |   0
 .../include/generic/rte_spinlock.h            |   0
 .../include/generic/rte_ticketlock.h          |   0
 .../include/generic/rte_vect.h                |   0
 lib/eal/include/meson.build                   |  70 ++
 lib/{librte_eal => eal}/include/rte_alarm.h   |   0
 lib/{librte_eal => eal}/include/rte_bitmap.h  |   0
 lib/{librte_eal => eal}/include/rte_bitops.h  |   0
 .../include/rte_branch_prediction.h           |   0
 lib/{librte_eal => eal}/include/rte_bus.h     |   0
 lib/{librte_eal => eal}/include/rte_class.h   |   0
 lib/{librte_eal => eal}/include/rte_common.h  |   0
 lib/{librte_eal => eal}/include/rte_compat.h  |   0
 lib/{librte_eal => eal}/include/rte_debug.h   |   0
 lib/{librte_eal => eal}/include/rte_dev.h     |   0
 lib/{librte_eal => eal}/include/rte_devargs.h |   0
 lib/{librte_eal => eal}/include/rte_eal.h     |   0
 .../include/rte_eal_interrupts.h              |   0
 .../include/rte_eal_memconfig.h               |   0
 .../include/rte_eal_paging.h                  |   0
 .../include/rte_eal_trace.h                   |   0
 lib/{librte_eal => eal}/include/rte_errno.h   |   0
 lib/{librte_eal => eal}/include/rte_fbarray.h |   0
 .../include/rte_function_versioning.h         |   0
 lib/{librte_eal => eal}/include/rte_hexdump.h |   0
 .../include/rte_hypervisor.h                  |   0
 .../include/rte_interrupts.h                  |   0
 .../include/rte_keepalive.h                   |   0
 lib/{librte_eal => eal}/include/rte_launch.h  |   0
 lib/{librte_eal => eal}/include/rte_lcore.h   |   0
 lib/{librte_eal => eal}/include/rte_log.h     |   0
 lib/{librte_eal => eal}/include/rte_malloc.h  |   0
 lib/{librte_eal => eal}/include/rte_memory.h  |   0
 lib/{librte_eal => eal}/include/rte_memzone.h |   0
 .../include/rte_pci_dev_feature_defs.h        |   0
 .../include/rte_pci_dev_features.h            |   0
 .../include/rte_per_lcore.h                   |   0
 lib/{librte_eal => eal}/include/rte_random.h  |   0
 .../include/rte_reciprocal.h                  |   0
 lib/{librte_eal => eal}/include/rte_service.h |   0
 .../include/rte_service_component.h           |   0
 .../include/rte_string_fns.h                  |   0
 lib/{librte_eal => eal}/include/rte_tailq.h   |   0
 lib/{librte_eal => eal}/include/rte_test.h    |   0
 lib/{librte_eal => eal}/include/rte_thread.h  |   0
 lib/{librte_eal => eal}/include/rte_time.h    |   0
 lib/{librte_eal => eal}/include/rte_trace.h   |   0
 .../include/rte_trace_point.h                 |   0
 .../include/rte_trace_point_register.h        |   0
 lib/{librte_eal => eal}/include/rte_uuid.h    |   0
 lib/{librte_eal => eal}/include/rte_version.h |   0
 lib/{librte_eal => eal}/include/rte_vfio.h    |   0
 lib/{librte_eal => eal}/linux/eal.c           |   0
 lib/{librte_eal => eal}/linux/eal_alarm.c     |   0
 lib/{librte_eal => eal}/linux/eal_cpuflags.c  |   0
 lib/{librte_eal => eal}/linux/eal_debug.c     |   0
 lib/{librte_eal => eal}/linux/eal_dev.c       |   0
 .../linux/eal_hugepage_info.c                 |   0
 .../linux/eal_interrupts.c                    |   0
 lib/{librte_eal => eal}/linux/eal_lcore.c     |   0
 lib/{librte_eal => eal}/linux/eal_log.c       |   0
 lib/{librte_eal => eal}/linux/eal_memalloc.c  |   0
 lib/{librte_eal => eal}/linux/eal_memory.c    |   0
 lib/{librte_eal => eal}/linux/eal_thread.c    |   0
 lib/{librte_eal => eal}/linux/eal_timer.c     |   0
 lib/{librte_eal => eal}/linux/eal_vfio.c      |   0
 lib/{librte_eal => eal}/linux/eal_vfio.h      |   0
 .../linux/eal_vfio_mp_sync.c                  |   0
 .../linux/include/meson.build                 |   0
 .../linux/include/rte_os.h                    |   0
 lib/eal/linux/meson.build                     |  27 +
 lib/{librte_eal => eal}/meson.build           |   8 +-
 lib/eal/ppc/include/meson.build               |  21 +
 .../ppc/include/rte_altivec.h                 |   0
 .../ppc/include/rte_atomic.h                  |   0
 .../ppc/include/rte_byteorder.h               |   0
 .../ppc/include/rte_cpuflags.h                |   0
 .../ppc/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/ppc/include/rte_io.h  |   0
 .../ppc/include/rte_mcslock.h                 |   0
 .../ppc/include/rte_memcpy.h                  |   0
 .../ppc/include/rte_pause.h                   |   0
 .../ppc/include/rte_power_intrinsics.h        |   0
 .../ppc/include/rte_prefetch.h                |   0
 .../ppc/include/rte_rwlock.h                  |   0
 .../ppc/include/rte_spinlock.h                |   0
 .../ppc/include/rte_ticketlock.h              |   0
 .../ppc/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/ppc/meson.build       |   8 +-
 lib/{librte_eal => eal}/ppc/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/ppc/rte_cycles.c      |   0
 lib/{librte_eal => eal}/ppc/rte_hypervisor.c  |   0
 .../ppc/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/rte_eal_exports.def   |   0
 lib/{librte_eal => eal}/unix/eal_file.c       |   0
 .../unix/eal_unix_memory.c                    |   0
 lib/{librte_eal => eal}/unix/eal_unix_timer.c |   0
 lib/{librte_eal => eal}/unix/meson.build      |   8 +-
 lib/{librte_eal => eal}/unix/rte_thread.c     |   0
 lib/{librte_eal => eal}/version.map           |   0
 lib/{librte_eal => eal}/windows/eal.c         |   0
 lib/{librte_eal => eal}/windows/eal_alarm.c   |   0
 lib/{librte_eal => eal}/windows/eal_debug.c   |   0
 lib/{librte_eal => eal}/windows/eal_file.c    |   0
 .../windows/eal_hugepages.c                   |   0
 .../windows/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/windows/eal_lcore.c   |   0
 lib/{librte_eal => eal}/windows/eal_log.c     |   0
 .../windows/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/windows/eal_memory.c  |   0
 lib/{librte_eal => eal}/windows/eal_mp.c      |   0
 lib/{librte_eal => eal}/windows/eal_thread.c  |   0
 lib/{librte_eal => eal}/windows/eal_timer.c   |   0
 lib/{librte_eal => eal}/windows/eal_windows.h |   0
 lib/{librte_eal => eal}/windows/fnmatch.c     |   0
 lib/{librte_eal => eal}/windows/getopt.c      |   0
 .../windows/include/arpa/inet.h               |   0
 .../windows/include/dirent.h                  |   0
 .../windows/include/fnmatch.h                 |   0
 .../windows/include/getopt.h                  |   0
 .../windows/include/meson.build               |   0
 .../windows/include/netinet/in.h              |   0
 .../windows/include/netinet/ip.h              |   0
 .../windows/include/pthread.h                 |   0
 .../windows/include/regex.h                   |   0
 .../windows/include/rte_os.h                  |   0
 .../windows/include/rte_virt2phys.h           |   0
 .../windows/include/rte_windows.h             |   0
 .../windows/include/sched.h                   |   0
 .../windows/include/sys/queue.h               |   0
 .../windows/include/sys/socket.h              |   0
 .../windows/include/unistd.h                  |   0
 lib/eal/windows/meson.build                   |  25 +
 lib/{librte_eal => eal}/windows/rte_thread.c  |   0
 lib/eal/x86/include/meson.build               |  29 +
 .../x86/include/rte_atomic.h                  |   0
 .../x86/include/rte_atomic_32.h               |   0
 .../x86/include/rte_atomic_64.h               |   0
 .../x86/include/rte_byteorder.h               |   0
 .../x86/include/rte_byteorder_32.h            |   0
 .../x86/include/rte_byteorder_64.h            |   0
 .../x86/include/rte_cpuflags.h                |   0
 .../x86/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/x86/include/rte_io.h  |   0
 .../x86/include/rte_mcslock.h                 |   0
 .../x86/include/rte_memcpy.h                  |   0
 .../x86/include/rte_pause.h                   |   0
 .../x86/include/rte_power_intrinsics.h        |   0
 .../x86/include/rte_prefetch.h                |   0
 lib/{librte_eal => eal}/x86/include/rte_rtm.h |   0
 .../x86/include/rte_rwlock.h                  |   0
 .../x86/include/rte_spinlock.h                |   0
 .../x86/include/rte_ticketlock.h              |   0
 .../x86/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/x86/meson.build       |  10 +-
 lib/{librte_eal => eal}/x86/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/x86/rte_cpuid.h       |   0
 lib/{librte_eal => eal}/x86/rte_cycles.c      |   0
 lib/{librte_eal => eal}/x86/rte_hypervisor.c  |   0
 .../x86/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/x86/rte_spinlock.c    |   0
 lib/{librte_efd => efd}/meson.build           |   0
 lib/{librte_efd => efd}/rte_efd.c             |   0
 lib/{librte_efd => efd}/rte_efd.h             |   0
 lib/{librte_efd => efd}/rte_efd_arm64.h       |   0
 lib/{librte_efd => efd}/rte_efd_x86.h         |   0
 lib/{librte_efd => efd}/version.map           |   0
 lib/{librte_ethdev => ethdev}/ethdev_driver.h |   0
 lib/{librte_ethdev => ethdev}/ethdev_pci.h    |   0
 .../ethdev_private.c                          |   0
 .../ethdev_private.h                          |   0
 .../ethdev_profile.c                          |   0
 .../ethdev_profile.h                          |   0
 .../ethdev_trace_points.c                     |   0
 lib/{librte_ethdev => ethdev}/ethdev_vdev.h   |   0
 lib/ethdev/meson.build                        |  27 +
 lib/{librte_ethdev => ethdev}/rte_class_eth.c |   0
 lib/{librte_ethdev => ethdev}/rte_dev_info.h  |   0
 lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h  |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.c    |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.h    |   0
 .../rte_ethdev_core.h                         |   0
 .../rte_ethdev_trace.h                        |   0
 .../rte_ethdev_trace_fp.h                     |   0
 lib/{librte_ethdev => ethdev}/rte_flow.c      |   0
 lib/{librte_ethdev => ethdev}/rte_flow.h      |   0
 .../rte_flow_driver.h                         |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.c       |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.h       |   0
 .../rte_mtr_driver.h                          |   0
 lib/{librte_ethdev => ethdev}/rte_tm.c        |   0
 lib/{librte_ethdev => ethdev}/rte_tm.h        |   0
 lib/{librte_ethdev => ethdev}/rte_tm_driver.h |   0
 lib/{librte_ethdev => ethdev}/version.map     |   0
 .../eventdev_pmd.h                            |   0
 .../eventdev_pmd_pci.h                        |   0
 .../eventdev_pmd_vdev.h                       |   0
 .../eventdev_trace_points.c                   |   0
 lib/eventdev/meson.build                      |  27 +
 .../rte_event_crypto_adapter.c                |   0
 .../rte_event_crypto_adapter.h                |   0
 .../rte_event_eth_rx_adapter.c                |   0
 .../rte_event_eth_rx_adapter.h                |   0
 .../rte_event_eth_tx_adapter.c                |   0
 .../rte_event_eth_tx_adapter.h                |   0
 .../rte_event_ring.c                          |   0
 .../rte_event_ring.h                          |   0
 .../rte_event_timer_adapter.c                 |   0
 .../rte_event_timer_adapter.h                 |   0
 .../rte_event_timer_adapter_pmd.h             |   0
 .../rte_eventdev.c                            |   0
 .../rte_eventdev.h                            |   0
 .../rte_eventdev_trace.h                      |   0
 .../rte_eventdev_trace_fp.h                   |   0
 lib/{librte_eventdev => eventdev}/version.map |   0
 lib/{librte_fib => fib}/dir24_8.c             |   0
 lib/{librte_fib => fib}/dir24_8.h             |   0
 lib/{librte_fib => fib}/dir24_8_avx512.c      |   0
 lib/{librte_fib => fib}/dir24_8_avx512.h      |   0
 lib/fib/meson.build                           |  58 ++
 lib/{librte_fib => fib}/rte_fib.c             |   0
 lib/{librte_fib => fib}/rte_fib.h             |   0
 lib/{librte_fib => fib}/rte_fib6.c            |   0
 lib/{librte_fib => fib}/rte_fib6.h            |   0
 lib/{librte_fib => fib}/trie.c                |   0
 lib/{librte_fib => fib}/trie.h                |   0
 lib/{librte_fib => fib}/trie_avx512.c         |   0
 lib/{librte_fib => fib}/trie_avx512.h         |   0
 lib/{librte_fib => fib}/version.map           |   0
 .../meson.build                               |   0
 .../rte_flow_classify.c                       |   0
 .../rte_flow_classify.h                       |   0
 .../rte_flow_classify_parse.c                 |   0
 .../rte_flow_classify_parse.h                 |   0
 .../version.map                               |   0
 lib/{librte_graph => graph}/graph.c           |   0
 lib/{librte_graph => graph}/graph_debug.c     |   0
 lib/{librte_graph => graph}/graph_ops.c       |   0
 lib/{librte_graph => graph}/graph_populate.c  |   0
 lib/{librte_graph => graph}/graph_private.h   |   0
 lib/{librte_graph => graph}/graph_stats.c     |   0
 lib/{librte_graph => graph}/meson.build       |   0
 lib/{librte_graph => graph}/node.c            |   0
 lib/{librte_graph => graph}/rte_graph.h       |   0
 .../rte_graph_worker.h                        |   0
 lib/{librte_graph => graph}/version.map       |   0
 lib/{librte_gro => gro}/gro_tcp4.c            |   0
 lib/{librte_gro => gro}/gro_tcp4.h            |   0
 lib/{librte_gro => gro}/gro_udp4.c            |   0
 lib/{librte_gro => gro}/gro_udp4.h            |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.h      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.h      |   0
 lib/{librte_gro => gro}/meson.build           |   0
 lib/{librte_gro => gro}/rte_gro.c             |   0
 lib/{librte_gro => gro}/rte_gro.h             |   0
 lib/{librte_gro => gro}/version.map           |   0
 lib/{librte_gso => gso}/gso_common.c          |   0
 lib/{librte_gso => gso}/gso_common.h          |   0
 lib/{librte_gso => gso}/gso_tcp4.c            |   0
 lib/{librte_gso => gso}/gso_tcp4.h            |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.h     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.h     |   0
 lib/{librte_gso => gso}/gso_udp4.c            |   0
 lib/{librte_gso => gso}/gso_udp4.h            |   0
 lib/{librte_gso => gso}/meson.build           |   2 +-
 lib/{librte_gso => gso}/rte_gso.c             |   0
 lib/{librte_gso => gso}/rte_gso.h             |   0
 lib/{librte_gso => gso}/version.map           |   0
 lib/{librte_hash => hash}/meson.build         |   8 +-
 lib/{librte_hash => hash}/rte_cmp_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cmp_x86.h       |   0
 lib/{librte_hash => hash}/rte_crc_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.c   |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.h   |   0
 lib/{librte_hash => hash}/rte_fbk_hash.c      |   0
 lib/{librte_hash => hash}/rte_fbk_hash.h      |   0
 lib/{librte_hash => hash}/rte_hash.h          |   0
 lib/{librte_hash => hash}/rte_hash_crc.h      |   0
 lib/{librte_hash => hash}/rte_jhash.h         |   0
 lib/{librte_hash => hash}/rte_thash.h         |   0
 lib/{librte_hash => hash}/version.map         |   0
 .../ip_frag_common.h                          |   0
 .../ip_frag_internal.c                        |   0
 lib/{librte_ip_frag => ip_frag}/meson.build   |  10 +-
 lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h |   0
 .../rte_ip_frag_common.c                      |   0
 .../rte_ipv4_fragmentation.c                  |   0
 .../rte_ipv4_reassembly.c                     |   0
 .../rte_ipv6_fragmentation.c                  |   0
 .../rte_ipv6_reassembly.c                     |   0
 lib/{librte_ip_frag => ip_frag}/version.map   |   0
 lib/{librte_ipsec => ipsec}/crypto.h          |   0
 lib/{librte_ipsec => ipsec}/esp_inb.c         |   0
 lib/{librte_ipsec => ipsec}/esp_outb.c        |   0
 lib/{librte_ipsec => ipsec}/iph.h             |   0
 lib/{librte_ipsec => ipsec}/ipsec_sad.c       |   0
 lib/{librte_ipsec => ipsec}/ipsec_sqn.h       |   0
 lib/{librte_ipsec => ipsec}/meson.build       |   0
 lib/{librte_ipsec => ipsec}/misc.h            |   0
 lib/{librte_ipsec => ipsec}/pad.h             |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec.h       |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_group.h |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h    |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h   |   0
 lib/{librte_ipsec => ipsec}/sa.c              |   0
 lib/{librte_ipsec => ipsec}/sa.h              |   0
 lib/{librte_ipsec => ipsec}/ses.c             |   0
 lib/{librte_ipsec => ipsec}/version.map       |   0
 lib/{librte_jobstats => jobstats}/meson.build |   0
 .../rte_jobstats.c                            |   0
 .../rte_jobstats.h                            |   0
 lib/{librte_jobstats => jobstats}/version.map |   0
 lib/{librte_kni => kni}/meson.build           |   4 +-
 lib/{librte_kni => kni}/rte_kni.c             |   0
 lib/{librte_kni => kni}/rte_kni.h             |   0
 lib/{librte_kni => kni}/rte_kni_common.h      |   0
 lib/{librte_kni => kni}/rte_kni_fifo.h        |   0
 lib/{librte_kni => kni}/version.map           |   0
 lib/{librte_kvargs => kvargs}/meson.build     |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.c    |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.h    |   0
 lib/{librte_kvargs => kvargs}/version.map     |   0
 .../meson.build                               |   0
 .../rte_latencystats.c                        |   0
 .../rte_latencystats.h                        |   0
 .../version.map                               |   0
 lib/librte_acl/meson.build                    |  83 --
 lib/librte_cmdline/meson.build                |  34 -
 lib/librte_eal/arm/include/meson.build        |  33 -
 lib/librte_eal/common/meson.build             |  88 --
 lib/librte_eal/freebsd/meson.build            |  21 -
 lib/librte_eal/include/meson.build            |  70 --
 lib/librte_eal/linux/meson.build              |  27 -
 lib/librte_eal/ppc/include/meson.build        |  21 -
 lib/librte_eal/windows/meson.build            |  25 -
 lib/librte_eal/x86/include/meson.build        |  29 -
 lib/librte_ethdev/meson.build                 |  27 -
 lib/librte_eventdev/meson.build               |  27 -
 lib/librte_fib/meson.build                    |  58 --
 lib/librte_net/meson.build                    | 110 ---
 lib/librte_pipeline/meson.build               |  16 -
 lib/librte_port/meson.build                   |  46 -
 lib/librte_power/meson.build                  |  17 -
 lib/librte_ring/meson.build                   |  19 -
 lib/librte_table/meson.build                  |  36 -
 lib/{librte_lpm => lpm}/meson.build           |   0
 lib/{librte_lpm => lpm}/rte_lpm.c             |   0
 lib/{librte_lpm => lpm}/rte_lpm.h             |   0
 lib/{librte_lpm => lpm}/rte_lpm6.c            |   0
 lib/{librte_lpm => lpm}/rte_lpm6.h            |   0
 lib/{librte_lpm => lpm}/rte_lpm_altivec.h     |   0
 lib/{librte_lpm => lpm}/rte_lpm_neon.h        |   0
 lib/{librte_lpm => lpm}/rte_lpm_sse.h         |   0
 lib/{librte_lpm => lpm}/rte_lpm_sve.h         |   0
 lib/{librte_lpm => lpm}/version.map           |   0
 lib/{librte_mbuf => mbuf}/meson.build         |   6 +-
 lib/{librte_mbuf => mbuf}/rte_mbuf.c          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.h          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_core.h     |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c    |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h    |   0
 lib/{librte_mbuf => mbuf}/version.map         |   0
 lib/{librte_member => member}/meson.build     |   0
 lib/{librte_member => member}/rte_member.c    |   0
 lib/{librte_member => member}/rte_member.h    |   0
 lib/{librte_member => member}/rte_member_ht.c |   0
 lib/{librte_member => member}/rte_member_ht.h |   0
 .../rte_member_vbf.c                          |   0
 .../rte_member_vbf.h                          |   0
 .../rte_member_x86.h                          |   0
 lib/{librte_member => member}/version.map     |   0
 .../mempool_trace_points.c                    |   0
 lib/{librte_mempool => mempool}/meson.build   |  10 +-
 lib/{librte_mempool => mempool}/rte_mempool.c |   0
 lib/{librte_mempool => mempool}/rte_mempool.h |   0
 .../rte_mempool_ops.c                         |   0
 .../rte_mempool_ops_default.c                 |   0
 .../rte_mempool_trace.h                       |   0
 .../rte_mempool_trace_fp.h                    |   0
 lib/{librte_mempool => mempool}/version.map   |   0
 lib/meson.build                               | 387 +++++----
 lib/{librte_meter => meter}/meson.build       |   0
 lib/{librte_meter => meter}/rte_meter.c       |   0
 lib/{librte_meter => meter}/rte_meter.h       |   0
 lib/{librte_meter => meter}/version.map       |   0
 lib/{librte_metrics => metrics}/meson.build   |   4 +-
 lib/{librte_metrics => metrics}/rte_metrics.c |   0
 lib/{librte_metrics => metrics}/rte_metrics.h |   0
 .../rte_metrics_telemetry.c                   |   0
 .../rte_metrics_telemetry.h                   |   0
 lib/{librte_metrics => metrics}/version.map   |   0
 lib/net/meson.build                           | 110 +++
 lib/{librte_net => net}/net_crc.h             |   0
 lib/{librte_net => net}/net_crc_avx512.c      |   0
 lib/{librte_net => net}/net_crc_neon.c        |   0
 lib/{librte_net => net}/net_crc_sse.c         |   0
 lib/{librte_net => net}/rte_arp.c             |   0
 lib/{librte_net => net}/rte_arp.h             |   0
 lib/{librte_net => net}/rte_ecpri.h           |   0
 lib/{librte_net => net}/rte_esp.h             |   0
 lib/{librte_net => net}/rte_ether.c           |   0
 lib/{librte_net => net}/rte_ether.h           |   0
 lib/{librte_net => net}/rte_geneve.h          |   0
 lib/{librte_net => net}/rte_gre.h             |   0
 lib/{librte_net => net}/rte_gtp.h             |   0
 lib/{librte_net => net}/rte_higig.h           |   0
 lib/{librte_net => net}/rte_icmp.h            |   0
 lib/{librte_net => net}/rte_ip.h              |   0
 lib/{librte_net => net}/rte_mpls.h            |   0
 lib/{librte_net => net}/rte_net.c             |   0
 lib/{librte_net => net}/rte_net.h             |   0
 lib/{librte_net => net}/rte_net_crc.c         |   0
 lib/{librte_net => net}/rte_net_crc.h         |   0
 lib/{librte_net => net}/rte_sctp.h            |   0
 lib/{librte_net => net}/rte_tcp.h             |   0
 lib/{librte_net => net}/rte_udp.h             |   0
 lib/{librte_net => net}/rte_vxlan.h           |   0
 lib/{librte_net => net}/version.map           |   0
 lib/{librte_node => node}/ethdev_ctrl.c       |   0
 lib/{librte_node => node}/ethdev_rx.c         |   0
 lib/{librte_node => node}/ethdev_rx_priv.h    |   0
 lib/{librte_node => node}/ethdev_tx.c         |   0
 lib/{librte_node => node}/ethdev_tx_priv.h    |   0
 lib/{librte_node => node}/ip4_lookup.c        |   0
 lib/{librte_node => node}/ip4_lookup_neon.h   |   0
 lib/{librte_node => node}/ip4_lookup_sse.h    |   0
 lib/{librte_node => node}/ip4_rewrite.c       |   0
 lib/{librte_node => node}/ip4_rewrite_priv.h  |   0
 lib/{librte_node => node}/log.c               |   0
 lib/{librte_node => node}/meson.build         |   2 +-
 lib/{librte_node => node}/node_private.h      |   0
 lib/{librte_node => node}/null.c              |   0
 lib/{librte_node => node}/pkt_cls.c           |   0
 lib/{librte_node => node}/pkt_cls_priv.h      |   0
 lib/{librte_node => node}/pkt_drop.c          |   0
 lib/{librte_node => node}/rte_node_eth_api.h  |   0
 lib/{librte_node => node}/rte_node_ip4_api.h  |   0
 lib/{librte_node => node}/version.map         |   0
 lib/{librte_pci => pci}/meson.build           |   0
 lib/{librte_pci => pci}/rte_pci.c             |   0
 lib/{librte_pci => pci}/rte_pci.h             |   0
 lib/{librte_pci => pci}/version.map           |   0
 lib/{librte_pdump => pdump}/meson.build       |   0
 lib/{librte_pdump => pdump}/rte_pdump.c       |   0
 lib/{librte_pdump => pdump}/rte_pdump.h       |   0
 lib/{librte_pdump => pdump}/version.map       |   0
 lib/pipeline/meson.build                      |  16 +
 .../rte_pipeline.c                            |   0
 .../rte_pipeline.h                            |   0
 .../rte_port_in_action.c                      |   0
 .../rte_port_in_action.h                      |   0
 .../rte_swx_ctl.c                             |   0
 .../rte_swx_ctl.h                             |   0
 .../rte_swx_extern.h                          |   0
 .../rte_swx_pipeline.c                        |   0
 .../rte_swx_pipeline.h                        |   0
 .../rte_swx_pipeline_spec.c                   |   0
 .../rte_table_action.c                        |   0
 .../rte_table_action.h                        |   0
 lib/{librte_pipeline => pipeline}/version.map |   0
 lib/port/meson.build                          |  46 +
 lib/{librte_port => port}/rte_port.h          |   0
 lib/{librte_port => port}/rte_port_ethdev.c   |   0
 lib/{librte_port => port}/rte_port_ethdev.h   |   0
 lib/{librte_port => port}/rte_port_eventdev.c |   0
 lib/{librte_port => port}/rte_port_eventdev.h |   0
 lib/{librte_port => port}/rte_port_fd.c       |   0
 lib/{librte_port => port}/rte_port_fd.h       |   0
 lib/{librte_port => port}/rte_port_frag.c     |   0
 lib/{librte_port => port}/rte_port_frag.h     |   0
 lib/{librte_port => port}/rte_port_kni.c      |   0
 lib/{librte_port => port}/rte_port_kni.h      |   0
 lib/{librte_port => port}/rte_port_ras.c      |   0
 lib/{librte_port => port}/rte_port_ras.h      |   0
 lib/{librte_port => port}/rte_port_ring.c     |   0
 lib/{librte_port => port}/rte_port_ring.h     |   0
 lib/{librte_port => port}/rte_port_sched.c    |   0
 lib/{librte_port => port}/rte_port_sched.h    |   0
 .../rte_port_source_sink.c                    |   0
 .../rte_port_source_sink.h                    |   0
 .../rte_port_sym_crypto.c                     |   0
 .../rte_port_sym_crypto.h                     |   0
 lib/{librte_port => port}/rte_swx_port.h      |   0
 .../rte_swx_port_ethdev.c                     |   0
 .../rte_swx_port_ethdev.h                     |   0
 lib/{librte_port => port}/rte_swx_port_fd.c   |   0
 lib/{librte_port => port}/rte_swx_port_fd.h   |   0
 lib/{librte_port => port}/rte_swx_port_ring.c |   0
 lib/{librte_port => port}/rte_swx_port_ring.h |   0
 .../rte_swx_port_source_sink.c                |   0
 .../rte_swx_port_source_sink.h                |   0
 lib/{librte_port => port}/version.map         |   0
 lib/{librte_power => power}/guest_channel.c   |   0
 lib/{librte_power => power}/guest_channel.h   |   0
 lib/power/meson.build                         |  17 +
 .../power_acpi_cpufreq.c                      |   0
 .../power_acpi_cpufreq.h                      |   0
 lib/{librte_power => power}/power_common.c    |   0
 lib/{librte_power => power}/power_common.h    |   0
 lib/{librte_power => power}/power_kvm_vm.c    |   0
 lib/{librte_power => power}/power_kvm_vm.h    |   0
 .../power_pstate_cpufreq.c                    |   0
 .../power_pstate_cpufreq.h                    |   0
 lib/{librte_power => power}/rte_power.c       |   0
 lib/{librte_power => power}/rte_power.h       |   0
 .../rte_power_empty_poll.c                    |   0
 .../rte_power_empty_poll.h                    |   0
 .../rte_power_guest_channel.h                 |   0
 .../rte_power_pmd_mgmt.c                      |   0
 .../rte_power_pmd_mgmt.h                      |   0
 lib/{librte_power => power}/version.map       |   0
 lib/{librte_rawdev => rawdev}/meson.build     |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.c    |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.h    |   0
 .../rte_rawdev_pmd.h                          |   0
 lib/{librte_rawdev => rawdev}/version.map     |   0
 lib/{librte_rcu => rcu}/meson.build           |   0
 lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.c        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.h        |   0
 lib/{librte_rcu => rcu}/version.map           |   0
 lib/{librte_regexdev => regexdev}/meson.build |   2 +-
 .../rte_regexdev.c                            |   0
 .../rte_regexdev.h                            |   0
 .../rte_regexdev_core.h                       |   0
 .../rte_regexdev_driver.h                     |   0
 lib/{librte_regexdev => regexdev}/version.map |   0
 lib/{librte_reorder => reorder}/meson.build   |   0
 lib/{librte_reorder => reorder}/rte_reorder.c |   0
 lib/{librte_reorder => reorder}/rte_reorder.h |   0
 lib/{librte_reorder => reorder}/version.map   |   0
 lib/{librte_rib => rib}/meson.build           |   0
 lib/{librte_rib => rib}/rte_rib.c             |   0
 lib/{librte_rib => rib}/rte_rib.h             |   0
 lib/{librte_rib => rib}/rte_rib6.c            |   0
 lib/{librte_rib => rib}/rte_rib6.h            |   0
 lib/{librte_rib => rib}/version.map           |   0
 lib/ring/meson.build                          |  19 +
 lib/{librte_ring => ring}/rte_ring.c          |   0
 lib/{librte_ring => ring}/rte_ring.h          |   0
 lib/{librte_ring => ring}/rte_ring_c11_pvt.h  |   0
 lib/{librte_ring => ring}/rte_ring_core.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem_pvt.h |   0
 .../rte_ring_generic_pvt.h                    |   0
 lib/{librte_ring => ring}/rte_ring_hts.h      |   0
 .../rte_ring_hts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/rte_ring_peek.h     |   0
 .../rte_ring_peek_elem_pvt.h                  |   0
 lib/{librte_ring => ring}/rte_ring_peek_zc.h  |   0
 lib/{librte_ring => ring}/rte_ring_rts.h      |   0
 .../rte_ring_rts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/version.map         |   0
 lib/{librte_sched => sched}/meson.build       |   2 +-
 lib/{librte_sched => sched}/rte_approx.c      |   0
 lib/{librte_sched => sched}/rte_approx.h      |   0
 lib/{librte_sched => sched}/rte_red.c         |   0
 lib/{librte_sched => sched}/rte_red.h         |   0
 lib/{librte_sched => sched}/rte_sched.c       |   0
 lib/{librte_sched => sched}/rte_sched.h       |   0
 .../rte_sched_common.h                        |   0
 lib/{librte_sched => sched}/version.map       |   0
 lib/{librte_security => security}/meson.build |   0
 .../rte_security.c                            |   0
 .../rte_security.h                            |   0
 .../rte_security_driver.h                     |   0
 lib/{librte_security => security}/version.map |   0
 lib/{librte_stack => stack}/meson.build       |   8 +-
 lib/{librte_stack => stack}/rte_stack.c       |   0
 lib/{librte_stack => stack}/rte_stack.h       |   0
 lib/{librte_stack => stack}/rte_stack_lf.c    |   0
 lib/{librte_stack => stack}/rte_stack_lf.h    |   0
 .../rte_stack_lf_c11.h                        |   0
 .../rte_stack_lf_generic.h                    |   0
 .../rte_stack_lf_stubs.h                      |   0
 lib/{librte_stack => stack}/rte_stack_std.c   |   0
 lib/{librte_stack => stack}/rte_stack_std.h   |   0
 lib/{librte_stack => stack}/stack_pvt.h       |   0
 lib/{librte_stack => stack}/version.map       |   0
 lib/table/meson.build                         |  36 +
 lib/{librte_table => table}/rte_lru.h         |   0
 lib/{librte_table => table}/rte_lru_arm64.h   |   0
 lib/{librte_table => table}/rte_lru_x86.h     |   0
 lib/{librte_table => table}/rte_swx_table.h   |   0
 .../rte_swx_table_em.c                        |   0
 .../rte_swx_table_em.h                        |   0
 .../rte_swx_table_wm.c                        |   0
 .../rte_swx_table_wm.h                        |   0
 lib/{librte_table => table}/rte_table.h       |   0
 lib/{librte_table => table}/rte_table_acl.c   |   0
 lib/{librte_table => table}/rte_table_acl.h   |   0
 lib/{librte_table => table}/rte_table_array.c |   0
 lib/{librte_table => table}/rte_table_array.h |   0
 lib/{librte_table => table}/rte_table_hash.h  |   0
 .../rte_table_hash_cuckoo.c                   |   0
 .../rte_table_hash_cuckoo.h                   |   0
 .../rte_table_hash_ext.c                      |   0
 .../rte_table_hash_func.h                     |   0
 .../rte_table_hash_func_arm64.h               |   0
 .../rte_table_hash_key16.c                    |   0
 .../rte_table_hash_key32.c                    |   0
 .../rte_table_hash_key8.c                     |   0
 .../rte_table_hash_lru.c                      |   0
 lib/{librte_table => table}/rte_table_lpm.c   |   0
 lib/{librte_table => table}/rte_table_lpm.h   |   0
 .../rte_table_lpm_ipv6.c                      |   0
 .../rte_table_lpm_ipv6.h                      |   0
 lib/{librte_table => table}/rte_table_stub.c  |   0
 lib/{librte_table => table}/rte_table_stub.h  |   0
 lib/{librte_table => table}/version.map       |   0
 .../meson.build                               |   2 +-
 .../rte_telemetry.h                           |   0
 .../telemetry.c                               |   0
 .../telemetry_data.c                          |   0
 .../telemetry_data.h                          |   0
 .../telemetry_internal.h                      |   0
 .../telemetry_json.h                          |   0
 .../telemetry_legacy.c                        |   0
 .../version.map                               |   0
 lib/{librte_timer => timer}/meson.build       |   0
 lib/{librte_timer => timer}/rte_timer.c       |   0
 lib/{librte_timer => timer}/rte_timer.h       |   0
 lib/{librte_timer => timer}/version.map       |   0
 lib/{librte_vhost => vhost}/fd_man.c          |   0
 lib/{librte_vhost => vhost}/fd_man.h          |   0
 lib/{librte_vhost => vhost}/iotlb.c           |   0
 lib/{librte_vhost => vhost}/iotlb.h           |   0
 lib/{librte_vhost => vhost}/meson.build       |  20 +-
 lib/{librte_vhost => vhost}/rte_vdpa.h        |   0
 lib/{librte_vhost => vhost}/rte_vdpa_dev.h    |   0
 lib/{librte_vhost => vhost}/rte_vhost.h       |   0
 lib/{librte_vhost => vhost}/rte_vhost_async.h |   0
 .../rte_vhost_crypto.h                        |   0
 lib/{librte_vhost => vhost}/socket.c          |   0
 lib/{librte_vhost => vhost}/vdpa.c            |   0
 lib/{librte_vhost => vhost}/version.map       |   0
 lib/{librte_vhost => vhost}/vhost.c           |   0
 lib/{librte_vhost => vhost}/vhost.h           |   0
 lib/{librte_vhost => vhost}/vhost_crypto.c    |   0
 lib/{librte_vhost => vhost}/vhost_user.c      |   0
 lib/{librte_vhost => vhost}/vhost_user.h      |   0
 lib/{librte_vhost => vhost}/virtio_crypto.h   |   0
 lib/{librte_vhost => vhost}/virtio_net.c      |   0
 license/exceptions.txt                        |   6 +-
 meson.build                                   |  82 +-
 meson_options.txt                             |  36 +-
 usertools/meson.build                         |   8 +-
 1110 files changed, 4738 insertions(+), 4688 deletions(-)
 rename lib/{librte_acl => acl}/acl.h (100%)
 rename lib/{librte_acl => acl}/acl_bld.c (100%)
 rename lib/{librte_acl => acl}/acl_gen.c (100%)
 rename lib/{librte_acl => acl}/acl_run.h (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.c (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512_common.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x16.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x8.h (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.c (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.h (100%)
 rename lib/{librte_acl => acl}/acl_run_scalar.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.h (100%)
 rename lib/{librte_acl => acl}/acl_vect.h (100%)
 create mode 100644 lib/acl/meson.build
 rename lib/{librte_acl => acl}/rte_acl.c (100%)
 rename lib/{librte_acl => acl}/rte_acl.h (100%)
 rename lib/{librte_acl => acl}/rte_acl_osdep.h (100%)
 rename lib/{librte_acl => acl}/tb_mem.c (100%)
 rename lib/{librte_acl => acl}/tb_mem.h (100%)
 rename lib/{librte_acl => acl}/version.map (100%)
 rename lib/{librte_bbdev => bbdev}/meson.build (74%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.c (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_op.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h (100%)
 rename lib/{librte_bbdev => bbdev}/version.map (100%)
 rename lib/{librte_bitratestats => bitratestats}/meson.build (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.c (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.h (100%)
 rename lib/{librte_bitratestats => bitratestats}/version.map (100%)
 rename lib/{librte_bpf => bpf}/bpf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_def.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_exec.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_impl.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_arm64.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_x86.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load_elf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_pkt.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_validate.c (100%)
 rename lib/{librte_bpf => bpf}/meson.build (52%)
 rename lib/{librte_bpf => bpf}/rte_bpf.h (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf_ethdev.h (100%)
 rename lib/{librte_bpf => bpf}/version.map (100%)
 rename lib/{librte_cfgfile => cfgfile}/meson.build (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h (100%)
 rename lib/{librte_cfgfile => cfgfile}/version.map (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_unix.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_windows.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_private.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.h (100%)
 create mode 100644 lib/cmdline/meson.build
 rename lib/{librte_cmdline => cmdline}/version.map (100%)
 rename lib/{librte_compressdev => compressdev}/meson.build (58%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_internal.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.h (100%)
 rename lib/{librte_compressdev => compressdev}/version.map (100%)
 rename lib/{librte_cryptodev => cryptodev}/cryptodev_trace_points.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/meson.build (60%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_asym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_sym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace_fp.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/version.map (100%)
 rename lib/{librte_distributor => distributor}/distributor_private.h (100%)
 rename lib/{librte_distributor => distributor}/meson.build (68%)
 rename lib/{librte_distributor => distributor}/rte_distributor.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.h (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_generic.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_sse.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.h (100%)
 rename lib/{librte_distributor => distributor}/version.map (100%)
 create mode 100644 lib/eal/arm/include/meson.build
 rename lib/{librte_eal => eal}/arm/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/arm/meson.build (55%)
 rename lib/{librte_eal => eal}/arm/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_bus.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_class.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_config.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_debug.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dev.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_devargs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dynmem.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_errno.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_fbarray.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hexdump.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_launch.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_lcore.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_log.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_mcfg.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memalloc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memory.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memzone.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_options.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_proc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_string_fns.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_tailqs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_thread.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_timer.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_ctf.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_points.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_utils.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_uuid.c (100%)
 rename lib/{librte_eal => eal}/common/eal_filesystem.h (100%)
 rename lib/{librte_eal => eal}/common/eal_hugepages.h (100%)
 rename lib/{librte_eal => eal}/common/eal_internal_cfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memalloc.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memcfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_options.h (100%)
 rename lib/{librte_eal => eal}/common/eal_private.h (100%)
 rename lib/{librte_eal => eal}/common/eal_thread.h (100%)
 rename lib/{librte_eal => eal}/common/eal_trace.h (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.c (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.h (100%)
 create mode 100644 lib/eal/common/meson.build
 rename lib/{librte_eal => eal}/common/rte_keepalive.c (100%)
 rename lib/{librte_eal => eal}/common/rte_malloc.c (100%)
 rename lib/{librte_eal => eal}/common/rte_random.c (100%)
 rename lib/{librte_eal => eal}/common/rte_reciprocal.c (100%)
 rename lib/{librte_eal => eal}/common/rte_service.c (100%)
 rename lib/{librte_eal => eal}/common/rte_version.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm_private.h (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/freebsd/include/meson.build (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os.h (100%)
 create mode 100644 lib/eal/freebsd/meson.build
 rename lib/{librte_eal => eal}/include/generic/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_io.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_vect.h (100%)
 create mode 100644 lib/eal/include/meson.build
 rename lib/{librte_eal => eal}/include/rte_alarm.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitmap.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitops.h (100%)
 rename lib/{librte_eal => eal}/include/rte_branch_prediction.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bus.h (100%)
 rename lib/{librte_eal => eal}/include/rte_class.h (100%)
 rename lib/{librte_eal => eal}/include/rte_common.h (100%)
 rename lib/{librte_eal => eal}/include/rte_compat.h (100%)
 rename lib/{librte_eal => eal}/include/rte_debug.h (100%)
 rename lib/{librte_eal => eal}/include/rte_dev.h (100%)
 rename lib/{librte_eal => eal}/include/rte_devargs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_memconfig.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_paging.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_errno.h (100%)
 rename lib/{librte_eal => eal}/include/rte_fbarray.h (100%)
 rename lib/{librte_eal => eal}/include/rte_function_versioning.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hexdump.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hypervisor.h (100%)
 rename lib/{librte_eal => eal}/include/rte_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_keepalive.h (100%)
 rename lib/{librte_eal => eal}/include/rte_launch.h (100%)
 rename lib/{librte_eal => eal}/include/rte_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_log.h (100%)
 rename lib/{librte_eal => eal}/include/rte_malloc.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memory.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memzone.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_feature_defs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_features.h (100%)
 rename lib/{librte_eal => eal}/include/rte_per_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_random.h (100%)
 rename lib/{librte_eal => eal}/include/rte_reciprocal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service_component.h (100%)
 rename lib/{librte_eal => eal}/include/rte_string_fns.h (100%)
 rename lib/{librte_eal => eal}/include/rte_tailq.h (100%)
 rename lib/{librte_eal => eal}/include/rte_test.h (100%)
 rename lib/{librte_eal => eal}/include/rte_thread.h (100%)
 rename lib/{librte_eal => eal}/include/rte_time.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point_register.h (100%)
 rename lib/{librte_eal => eal}/include/rte_uuid.h (100%)
 rename lib/{librte_eal => eal}/include/rte_version.h (100%)
 rename lib/{librte_eal => eal}/include/rte_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_log.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio_mp_sync.c (100%)
 rename lib/{librte_eal => eal}/linux/include/meson.build (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os.h (100%)
 create mode 100644 lib/eal/linux/meson.build
 rename lib/{librte_eal => eal}/meson.build (78%)
 create mode 100644 lib/eal/ppc/include/meson.build
 rename lib/{librte_eal => eal}/ppc/include/rte_altivec.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/ppc/meson.build (58%)
 rename lib/{librte_eal => eal}/ppc/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/rte_eal_exports.def (100%)
 rename lib/{librte_eal => eal}/unix/eal_file.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_memory.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_timer.c (100%)
 rename lib/{librte_eal => eal}/unix/meson.build (52%)
 rename lib/{librte_eal => eal}/unix/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/version.map (100%)
 rename lib/{librte_eal => eal}/windows/eal.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_file.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_hugepages.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_log.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_mp.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/fnmatch.c (100%)
 rename lib/{librte_eal => eal}/windows/getopt.c (100%)
 rename lib/{librte_eal => eal}/windows/include/arpa/inet.h (100%)
 rename lib/{librte_eal => eal}/windows/include/dirent.h (100%)
 rename lib/{librte_eal => eal}/windows/include/fnmatch.h (100%)
 rename lib/{librte_eal => eal}/windows/include/getopt.h (100%)
 rename lib/{librte_eal => eal}/windows/include/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/include/netinet/in.h (100%)
 rename lib/{librte_eal => eal}/windows/include/netinet/ip.h (100%)
 rename lib/{librte_eal => eal}/windows/include/pthread.h (100%)
 rename lib/{librte_eal => eal}/windows/include/regex.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_virt2phys.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sched.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/queue.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/socket.h (100%)
 rename lib/{librte_eal => eal}/windows/include/unistd.h (100%)
 create mode 100644 lib/eal/windows/meson.build
 rename lib/{librte_eal => eal}/windows/rte_thread.c (100%)
 create mode 100644 lib/eal/x86/include/meson.build
 rename lib/{librte_eal => eal}/x86/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rtm.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/x86/meson.build (50%)
 rename lib/{librte_eal => eal}/x86/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuid.h (100%)
 rename lib/{librte_eal => eal}/x86/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_spinlock.c (100%)
 rename lib/{librte_efd => efd}/meson.build (100%)
 rename lib/{librte_efd => efd}/rte_efd.c (100%)
 rename lib/{librte_efd => efd}/rte_efd.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_arm64.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_x86.h (100%)
 rename lib/{librte_efd => efd}/version.map (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_pci.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_trace_points.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_vdev.h (100%)
 create mode 100644 lib/ethdev/meson.build
 rename lib/{librte_ethdev => ethdev}/rte_class_eth.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_dev_info.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_core.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace_fp.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/version.map (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_pci.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_vdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_trace_points.c (100%)
 create mode 100644 lib/eventdev/meson.build
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace_fp.h (100%)
 rename lib/{librte_eventdev => eventdev}/version.map (100%)
 rename lib/{librte_fib => fib}/dir24_8.c (100%)
 rename lib/{librte_fib => fib}/dir24_8.h (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.c (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.h (100%)
 create mode 100644 lib/fib/meson.build
 rename lib/{librte_fib => fib}/rte_fib.c (100%)
 rename lib/{librte_fib => fib}/rte_fib.h (100%)
 rename lib/{librte_fib => fib}/rte_fib6.c (100%)
 rename lib/{librte_fib => fib}/rte_fib6.h (100%)
 rename lib/{librte_fib => fib}/trie.c (100%)
 rename lib/{librte_fib => fib}/trie.h (100%)
 rename lib/{librte_fib => fib}/trie_avx512.c (100%)
 rename lib/{librte_fib => fib}/trie_avx512.h (100%)
 rename lib/{librte_fib => fib}/version.map (100%)
 rename lib/{librte_flow_classify => flow_classify}/meson.build (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/version.map (100%)
 rename lib/{librte_graph => graph}/graph.c (100%)
 rename lib/{librte_graph => graph}/graph_debug.c (100%)
 rename lib/{librte_graph => graph}/graph_ops.c (100%)
 rename lib/{librte_graph => graph}/graph_populate.c (100%)
 rename lib/{librte_graph => graph}/graph_private.h (100%)
 rename lib/{librte_graph => graph}/graph_stats.c (100%)
 rename lib/{librte_graph => graph}/meson.build (100%)
 rename lib/{librte_graph => graph}/node.c (100%)
 rename lib/{librte_graph => graph}/rte_graph.h (100%)
 rename lib/{librte_graph => graph}/rte_graph_worker.h (100%)
 rename lib/{librte_graph => graph}/version.map (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_udp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.h (100%)
 rename lib/{librte_gro => gro}/meson.build (100%)
 rename lib/{librte_gro => gro}/rte_gro.c (100%)
 rename lib/{librte_gro => gro}/rte_gro.h (100%)
 rename lib/{librte_gro => gro}/version.map (100%)
 rename lib/{librte_gso => gso}/gso_common.c (100%)
 rename lib/{librte_gso => gso}/gso_common.h (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.h (100%)
 rename lib/{librte_gso => gso}/gso_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_udp4.h (100%)
 rename lib/{librte_gso => gso}/meson.build (74%)
 rename lib/{librte_gso => gso}/rte_gso.c (100%)
 rename lib/{librte_gso => gso}/rte_gso.h (100%)
 rename lib/{librte_gso => gso}/version.map (100%)
 rename lib/{librte_hash => hash}/meson.build (76%)
 rename lib/{librte_hash => hash}/rte_cmp_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cmp_x86.h (100%)
 rename lib/{librte_hash => hash}/rte_crc_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash_crc.h (100%)
 rename lib/{librte_hash => hash}/rte_jhash.h (100%)
 rename lib/{librte_hash => hash}/rte_thash.h (100%)
 rename lib/{librte_hash => hash}/version.map (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_common.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_internal.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/meson.build (52%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag_common.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/version.map (100%)
 rename lib/{librte_ipsec => ipsec}/crypto.h (100%)
 rename lib/{librte_ipsec => ipsec}/esp_inb.c (100%)
 rename lib/{librte_ipsec => ipsec}/esp_outb.c (100%)
 rename lib/{librte_ipsec => ipsec}/iph.h (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sad.c (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sqn.h (100%)
 rename lib/{librte_ipsec => ipsec}/meson.build (100%)
 rename lib/{librte_ipsec => ipsec}/misc.h (100%)
 rename lib/{librte_ipsec => ipsec}/pad.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_group.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h (100%)
 rename lib/{librte_ipsec => ipsec}/sa.c (100%)
 rename lib/{librte_ipsec => ipsec}/sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/ses.c (100%)
 rename lib/{librte_ipsec => ipsec}/version.map (100%)
 rename lib/{librte_jobstats => jobstats}/meson.build (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.c (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.h (100%)
 rename lib/{librte_jobstats => jobstats}/version.map (100%)
 rename lib/{librte_kni => kni}/meson.build (79%)
 rename lib/{librte_kni => kni}/rte_kni.c (100%)
 rename lib/{librte_kni => kni}/rte_kni.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_common.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_fifo.h (100%)
 rename lib/{librte_kni => kni}/version.map (100%)
 rename lib/{librte_kvargs => kvargs}/meson.build (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.c (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.h (100%)
 rename lib/{librte_kvargs => kvargs}/version.map (100%)
 rename lib/{librte_latencystats => latencystats}/meson.build (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.c (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.h (100%)
 rename lib/{librte_latencystats => latencystats}/version.map (100%)
 delete mode 100644 lib/librte_acl/meson.build
 delete mode 100644 lib/librte_cmdline/meson.build
 delete mode 100644 lib/librte_eal/arm/include/meson.build
 delete mode 100644 lib/librte_eal/common/meson.build
 delete mode 100644 lib/librte_eal/freebsd/meson.build
 delete mode 100644 lib/librte_eal/include/meson.build
 delete mode 100644 lib/librte_eal/linux/meson.build
 delete mode 100644 lib/librte_eal/ppc/include/meson.build
 delete mode 100644 lib/librte_eal/windows/meson.build
 delete mode 100644 lib/librte_eal/x86/include/meson.build
 delete mode 100644 lib/librte_ethdev/meson.build
 delete mode 100644 lib/librte_eventdev/meson.build
 delete mode 100644 lib/librte_fib/meson.build
 delete mode 100644 lib/librte_net/meson.build
 delete mode 100644 lib/librte_pipeline/meson.build
 delete mode 100644 lib/librte_port/meson.build
 delete mode 100644 lib/librte_power/meson.build
 delete mode 100644 lib/librte_ring/meson.build
 delete mode 100644 lib/librte_table/meson.build
 rename lib/{librte_lpm => lpm}/meson.build (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_altivec.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_neon.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sse.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sve.h (100%)
 rename lib/{librte_lpm => lpm}/version.map (100%)
 rename lib/{librte_mbuf => mbuf}/meson.build (69%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_core.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h (100%)
 rename lib/{librte_mbuf => mbuf}/version.map (100%)
 rename lib/{librte_member => member}/meson.build (100%)
 rename lib/{librte_member => member}/rte_member.c (100%)
 rename lib/{librte_member => member}/rte_member.h (100%)
 rename lib/{librte_member => member}/rte_member_ht.c (100%)
 rename lib/{librte_member => member}/rte_member_ht.h (100%)
 rename lib/{librte_member => member}/rte_member_vbf.c (100%)
 rename lib/{librte_member => member}/rte_member_vbf.h (100%)
 rename lib/{librte_member => member}/rte_member_x86.h (100%)
 rename lib/{librte_member => member}/version.map (100%)
 rename lib/{librte_mempool => mempool}/mempool_trace_points.c (100%)
 rename lib/{librte_mempool => mempool}/meson.build (62%)
 rename lib/{librte_mempool => mempool}/rte_mempool.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops_default.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace_fp.h (100%)
 rename lib/{librte_mempool => mempool}/version.map (100%)
 rename lib/{librte_meter => meter}/meson.build (100%)
 rename lib/{librte_meter => meter}/rte_meter.c (100%)
 rename lib/{librte_meter => meter}/rte_meter.h (100%)
 rename lib/{librte_meter => meter}/version.map (100%)
 rename lib/{librte_metrics => metrics}/meson.build (83%)
 rename lib/{librte_metrics => metrics}/rte_metrics.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.h (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.h (100%)
 rename lib/{librte_metrics => metrics}/version.map (100%)
 create mode 100644 lib/net/meson.build
 rename lib/{librte_net => net}/net_crc.h (100%)
 rename lib/{librte_net => net}/net_crc_avx512.c (100%)
 rename lib/{librte_net => net}/net_crc_neon.c (100%)
 rename lib/{librte_net => net}/net_crc_sse.c (100%)
 rename lib/{librte_net => net}/rte_arp.c (100%)
 rename lib/{librte_net => net}/rte_arp.h (100%)
 rename lib/{librte_net => net}/rte_ecpri.h (100%)
 rename lib/{librte_net => net}/rte_esp.h (100%)
 rename lib/{librte_net => net}/rte_ether.c (100%)
 rename lib/{librte_net => net}/rte_ether.h (100%)
 rename lib/{librte_net => net}/rte_geneve.h (100%)
 rename lib/{librte_net => net}/rte_gre.h (100%)
 rename lib/{librte_net => net}/rte_gtp.h (100%)
 rename lib/{librte_net => net}/rte_higig.h (100%)
 rename lib/{librte_net => net}/rte_icmp.h (100%)
 rename lib/{librte_net => net}/rte_ip.h (100%)
 rename lib/{librte_net => net}/rte_mpls.h (100%)
 rename lib/{librte_net => net}/rte_net.c (100%)
 rename lib/{librte_net => net}/rte_net.h (100%)
 rename lib/{librte_net => net}/rte_net_crc.c (100%)
 rename lib/{librte_net => net}/rte_net_crc.h (100%)
 rename lib/{librte_net => net}/rte_sctp.h (100%)
 rename lib/{librte_net => net}/rte_tcp.h (100%)
 rename lib/{librte_net => net}/rte_udp.h (100%)
 rename lib/{librte_net => net}/rte_vxlan.h (100%)
 rename lib/{librte_net => net}/version.map (100%)
 rename lib/{librte_node => node}/ethdev_ctrl.c (100%)
 rename lib/{librte_node => node}/ethdev_rx.c (100%)
 rename lib/{librte_node => node}/ethdev_rx_priv.h (100%)
 rename lib/{librte_node => node}/ethdev_tx.c (100%)
 rename lib/{librte_node => node}/ethdev_tx_priv.h (100%)
 rename lib/{librte_node => node}/ip4_lookup.c (100%)
 rename lib/{librte_node => node}/ip4_lookup_neon.h (100%)
 rename lib/{librte_node => node}/ip4_lookup_sse.h (100%)
 rename lib/{librte_node => node}/ip4_rewrite.c (100%)
 rename lib/{librte_node => node}/ip4_rewrite_priv.h (100%)
 rename lib/{librte_node => node}/log.c (100%)
 rename lib/{librte_node => node}/meson.build (85%)
 rename lib/{librte_node => node}/node_private.h (100%)
 rename lib/{librte_node => node}/null.c (100%)
 rename lib/{librte_node => node}/pkt_cls.c (100%)
 rename lib/{librte_node => node}/pkt_cls_priv.h (100%)
 rename lib/{librte_node => node}/pkt_drop.c (100%)
 rename lib/{librte_node => node}/rte_node_eth_api.h (100%)
 rename lib/{librte_node => node}/rte_node_ip4_api.h (100%)
 rename lib/{librte_node => node}/version.map (100%)
 rename lib/{librte_pci => pci}/meson.build (100%)
 rename lib/{librte_pci => pci}/rte_pci.c (100%)
 rename lib/{librte_pci => pci}/rte_pci.h (100%)
 rename lib/{librte_pci => pci}/version.map (100%)
 rename lib/{librte_pdump => pdump}/meson.build (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.c (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.h (100%)
 rename lib/{librte_pdump => pdump}/version.map (100%)
 create mode 100644 lib/pipeline/meson.build
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_extern.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline_spec.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/version.map (100%)
 create mode 100644 lib/port/meson.build
 rename lib/{librte_port => port}/rte_port.h (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.c (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.h (100%)
 rename lib/{librte_port => port}/rte_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_port_frag.c (100%)
 rename lib/{librte_port => port}/rte_port_frag.h (100%)
 rename lib/{librte_port => port}/rte_port_kni.c (100%)
 rename lib/{librte_port => port}/rte_port_kni.h (100%)
 rename lib/{librte_port => port}/rte_port_ras.c (100%)
 rename lib/{librte_port => port}/rte_port_ras.h (100%)
 rename lib/{librte_port => port}/rte_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_port_sched.c (100%)
 rename lib/{librte_port => port}/rte_port_sched.h (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.h (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.c (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.h (100%)
 rename lib/{librte_port => port}/rte_swx_port.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.h (100%)
 rename lib/{librte_port => port}/version.map (100%)
 rename lib/{librte_power => power}/guest_channel.c (100%)
 rename lib/{librte_power => power}/guest_channel.h (100%)
 create mode 100644 lib/power/meson.build
 rename lib/{librte_power => power}/power_acpi_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.h (100%)
 rename lib/{librte_power => power}/power_common.c (100%)
 rename lib/{librte_power => power}/power_common.h (100%)
 rename lib/{librte_power => power}/power_kvm_vm.c (100%)
 rename lib/{librte_power => power}/power_kvm_vm.h (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.h (100%)
 rename lib/{librte_power => power}/rte_power.c (100%)
 rename lib/{librte_power => power}/rte_power.h (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.c (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.h (100%)
 rename lib/{librte_power => power}/rte_power_guest_channel.h (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.c (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.h (100%)
 rename lib/{librte_power => power}/version.map (100%)
 rename lib/{librte_rawdev => rawdev}/meson.build (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.c (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.h (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev_pmd.h (100%)
 rename lib/{librte_rawdev => rawdev}/version.map (100%)
 rename lib/{librte_rcu => rcu}/meson.build (100%)
 rename lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.c (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.h (100%)
 rename lib/{librte_rcu => rcu}/version.map (100%)
 rename lib/{librte_regexdev => regexdev}/meson.build (88%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.c (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_core.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_driver.h (100%)
 rename lib/{librte_regexdev => regexdev}/version.map (100%)
 rename lib/{librte_reorder => reorder}/meson.build (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.c (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.h (100%)
 rename lib/{librte_reorder => reorder}/version.map (100%)
 rename lib/{librte_rib => rib}/meson.build (100%)
 rename lib/{librte_rib => rib}/rte_rib.c (100%)
 rename lib/{librte_rib => rib}/rte_rib.h (100%)
 rename lib/{librte_rib => rib}/rte_rib6.c (100%)
 rename lib/{librte_rib => rib}/rte_rib6.h (100%)
 rename lib/{librte_rib => rib}/version.map (100%)
 create mode 100644 lib/ring/meson.build
 rename lib/{librte_ring => ring}/rte_ring.c (100%)
 rename lib/{librte_ring => ring}/rte_ring.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_c11_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_core.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_generic_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_zc.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/version.map (100%)
 rename lib/{librte_sched => sched}/meson.build (85%)
 rename lib/{librte_sched => sched}/rte_approx.c (100%)
 rename lib/{librte_sched => sched}/rte_approx.h (100%)
 rename lib/{librte_sched => sched}/rte_red.c (100%)
 rename lib/{librte_sched => sched}/rte_red.h (100%)
 rename lib/{librte_sched => sched}/rte_sched.c (100%)
 rename lib/{librte_sched => sched}/rte_sched.h (100%)
 rename lib/{librte_sched => sched}/rte_sched_common.h (100%)
 rename lib/{librte_sched => sched}/version.map (100%)
 rename lib/{librte_security => security}/meson.build (100%)
 rename lib/{librte_security => security}/rte_security.c (100%)
 rename lib/{librte_security => security}/rte_security.h (100%)
 rename lib/{librte_security => security}/rte_security_driver.h (100%)
 rename lib/{librte_security => security}/version.map (100%)
 rename lib/{librte_stack => stack}/meson.build (68%)
 rename lib/{librte_stack => stack}/rte_stack.c (100%)
 rename lib/{librte_stack => stack}/rte_stack.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_c11.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_generic.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_stubs.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.h (100%)
 rename lib/{librte_stack => stack}/stack_pvt.h (100%)
 rename lib/{librte_stack => stack}/version.map (100%)
 create mode 100644 lib/table/meson.build
 rename lib/{librte_table => table}/rte_lru.h (100%)
 rename lib/{librte_table => table}/rte_lru_arm64.h (100%)
 rename lib/{librte_table => table}/rte_lru_x86.h (100%)
 rename lib/{librte_table => table}/rte_swx_table.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.h (100%)
 rename lib/{librte_table => table}/rte_table.h (100%)
 rename lib/{librte_table => table}/rte_table_acl.c (100%)
 rename lib/{librte_table => table}/rte_table_acl.h (100%)
 rename lib/{librte_table => table}/rte_table_array.c (100%)
 rename lib/{librte_table => table}/rte_table_array.h (100%)
 rename lib/{librte_table => table}/rte_table_hash.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_ext.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_func.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_func_arm64.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_key16.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key32.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key8.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_lru.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.h (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.h (100%)
 rename lib/{librte_table => table}/rte_table_stub.c (100%)
 rename lib/{librte_table => table}/rte_table_stub.h (100%)
 rename lib/{librte_table => table}/version.map (100%)
 rename lib/{librte_telemetry => telemetry}/meson.build (80%)
 rename lib/{librte_telemetry => telemetry}/rte_telemetry.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_internal.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_json.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_legacy.c (100%)
 rename lib/{librte_telemetry => telemetry}/version.map (100%)
 rename lib/{librte_timer => timer}/meson.build (100%)
 rename lib/{librte_timer => timer}/rte_timer.c (100%)
 rename lib/{librte_timer => timer}/rte_timer.h (100%)
 rename lib/{librte_timer => timer}/version.map (100%)
 rename lib/{librte_vhost => vhost}/fd_man.c (100%)
 rename lib/{librte_vhost => vhost}/fd_man.h (100%)
 rename lib/{librte_vhost => vhost}/iotlb.c (100%)
 rename lib/{librte_vhost => vhost}/iotlb.h (100%)
 rename lib/{librte_vhost => vhost}/meson.build (59%)
 rename lib/{librte_vhost => vhost}/rte_vdpa.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa_dev.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_async.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/socket.c (100%)
 rename lib/{librte_vhost => vhost}/vdpa.c (100%)
 rename lib/{librte_vhost => vhost}/version.map (100%)
 rename lib/{librte_vhost => vhost}/vhost.c (100%)
 rename lib/{librte_vhost => vhost}/vhost.h (100%)
 rename lib/{librte_vhost => vhost}/vhost_crypto.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_net.c (100%)

--
2.27.0

[dpdk-dev] [RFC PATCH 01/14] editorconfig: add entry for meson files

[Bruce Richardson]

Meson style guide recommends four-space indents, like for python, so add
to editorconfig file.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 .editorconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index d705825574..5101630c8c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,11 @@ max_line_length = 80
 indent_style = space
 indent_size = 4
 
+[meson.build]
+indent_style = space
+indent_size = 4
+tab_width = 4
+
 [*.rst]
 indent_style = space
 indent_size = 3
-- 
2.27.0

[dpdk-dev] [RFC PATCH 02/14] build: simplify library build file

[Bruce Richardson]

Two simplifications can be made to the build file which reduce indentation
levels and make it easier to read:

1. When meson build support was first added, the compat library existed in
DPDK as a single header file. Since that header has been merged into EAL,
we no longer need to support header-only libraries, so can shorten the
code.

2. From meson 0.49 onwards we have the "continue" keyword available to
break out of one loop iteration and begin the next. This allows us to
remove blocks in the build configuration file which were conditional on the
"build" variable being true. Instead we can use "continue" to abort
processing at the point where the "build" value becomes false.

Since this patch changes the indentation level of large parts of the
meson.build file, we use the opportunity to adjust the whitespace used to
the meson-standard 4-spec indentation level.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build | 291 +++++++++++++++++++++++-------------------------
 1 file changed, 141 insertions(+), 150 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 7712aa4977..70a9ef0a0e 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -54,159 +54,150 @@ 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
 
 enabled_libs = [] # used to print summary at the end
 
 foreach l:libraries
-	build = true
-	reason = '<unknown reason>' # set if build == false to explain why
-	name = l
-	use_function_versioning = false
-	sources = []
-	headers = []
-	indirect_headers = [] # public headers not directly included by apps
-	includes = []
-	cflags = default_cflags
-	objs = [] # other object files to link against, used e.g. for
-	          # instruction-set optimized versions of code
-
-	# use "deps" for internal DPDK dependencies, and "ext_deps" for
-	# external package/library requirements
-	ext_deps = []
-	deps = []
-	# eal is standard dependency once built
-	if dpdk_conf.has('RTE_LIB_EAL')
-		deps += ['eal']
-	endif
-
-	dir_name = 'librte_' + l
-	subdir(dir_name)
-
-	if build
-		shared_deps = ext_deps
-		static_deps = ext_deps
-		foreach d:deps
-			if not is_variable('shared_rte_' + d)
-				error('Missing internal dependency "@0@" for @1@ [@2@]'
-						.format(d, name, 'lib/' + dir_name))
-			endif
-			shared_deps += [get_variable('shared_rte_' + d)]
-			static_deps += [get_variable('static_rte_' + d)]
-		endforeach
-	endif
-
-	if not build
-		dpdk_libs_disabled += name
-		set_variable(name.underscorify() + '_disable_reason', reason)
-	else
-		enabled_libs += name
-		dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
-		install_headers(headers)
-		install_headers(indirect_headers)
-		dpdk_chkinc_headers += headers
-
-		libname = 'rte_' + name
-		includes += include_directories(dir_name)
-
-		if sources.length() == 0
-			# if no C files, just set a dependency on header path
-			shared_dep = declare_dependency(include_directories: includes)
-			static_dep = shared_dep
-		else
-			if is_windows and use_function_versioning
-				message('@0@: Function versioning is not supported by Windows.'
-				.format(name))
-			endif
-
-			if use_function_versioning
-				cflags += '-DRTE_USE_FUNCTION_VERSIONING'
-			endif
-
-			# first build static lib
-			static_lib = static_library(libname,
-					sources,
-					objects: objs,
-					c_args: cflags,
-					dependencies: static_deps,
-					include_directories: includes,
-					install: true)
-			static_dep = declare_dependency(
-					include_directories: includes,
-					dependencies: static_deps)
-
-			if not use_function_versioning or is_windows
-				# use pre-build objects to build shared lib
-				sources = []
-				objs += static_lib.extract_all_objects(recursive: false)
-			else
-				# for compat we need to rebuild with
-				# RTE_BUILD_SHARED_LIB defined
-				cflags += '-DRTE_BUILD_SHARED_LIB'
-			endif
-			version_map = '@0@/@1@/version.map'.format(
-					meson.current_source_dir(), dir_name)
-			implib = dir_name + '.dll.a'
-
-			def_file = custom_target(libname + '_def',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_exports.def'.format(libname))
-
-			mingw_map = custom_target(libname + '_mingw',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_mingw.map'.format(libname))
-
-			if is_ms_linker
-				lk_args = ['-Wl,/def:' + def_file.full_path()]
-				if meson.version().version_compare('<0.54.0')
-					lk_args += ['-Wl,/implib:lib\\' + implib]
-				endif
-			else
-				if is_windows
-					lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
-				else
-					lk_args = ['-Wl,--version-script=' + version_map]
-				endif
-			endif
-
-			lk_deps = [version_map, def_file, mingw_map]
-			if not is_windows
-				# on unix systems check the output of the
-				# check-symbols.sh script, using it as a
-				# dependency of the .so build
-				lk_deps += custom_target(name + '.sym_chk',
-					command: [check_symbols,
-						version_map, '@INPUT@'],
-					capture: true,
-					input: static_lib,
-					output: name + '.sym_chk')
-			endif
-
-			shared_lib = shared_library(libname,
-					sources,
-					objects: objs,
-					c_args: cflags,
-					dependencies: shared_deps,
-					include_directories: includes,
-					link_args: lk_args,
-					link_depends: lk_deps,
-					version: abi_version,
-					soversion: so_version,
-					install: true)
-			shared_dep = declare_dependency(link_with: shared_lib,
-					include_directories: includes,
-					dependencies: shared_deps)
-
-			dpdk_libraries = [shared_lib] + dpdk_libraries
-			dpdk_static_libraries = [static_lib] + dpdk_static_libraries
-		endif # sources.length() > 0
-
-		set_variable('shared_rte_' + name, shared_dep)
-		set_variable('static_rte_' + name, static_dep)
-		message('lib/@0@: Defining dependency "@1@"'.format(
-				dir_name, name))
-	endif # if build
+    build = true
+    reason = '<unknown reason>' # set if build == false to explain why
+    name = l
+    use_function_versioning = false
+    sources = []
+    headers = []
+    indirect_headers = [] # public headers not directly included by apps
+    includes = []
+    cflags = default_cflags
+    objs = [] # other object files to link against, used e.g. for
+              # instruction-set optimized versions of code
+
+    # use "deps" for internal DPDK dependencies, and "ext_deps" for
+    # external package/library requirements
+    ext_deps = []
+    deps = []
+    # eal is standard dependency once built
+    if dpdk_conf.has('RTE_LIB_EAL')
+        deps += ['eal']
+    endif
+
+    dir_name = 'librte_' + l
+    subdir(dir_name)
+
+    if not build
+        dpdk_libs_disabled += name
+        set_variable(name.underscorify() + '_disable_reason', reason)
+        continue
+    endif
+
+    shared_deps = ext_deps
+    static_deps = ext_deps
+    foreach d:deps
+        if not is_variable('shared_rte_' + d)
+            error('Missing internal dependency "@0@" for @1@ [@2@]'
+                    .format(d, name, 'lib/' + dir_name))
+        endif
+        shared_deps += [get_variable('shared_rte_' + d)]
+        static_deps += [get_variable('static_rte_' + d)]
+    endforeach
+
+    enabled_libs += name
+    dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
+    install_headers(headers)
+    install_headers(indirect_headers)
+    dpdk_chkinc_headers += headers
+
+    libname = 'rte_' + name
+    includes += include_directories(dir_name)
+
+    if is_windows and use_function_versioning
+        message('@0@: Function versioning is not supported by Windows.'.format(name))
+    endif
+
+    if use_function_versioning
+        cflags += '-DRTE_USE_FUNCTION_VERSIONING'
+    endif
+
+    # first build static lib
+    static_lib = static_library(libname,
+            sources,
+            objects: objs,
+            c_args: cflags,
+            dependencies: static_deps,
+            include_directories: includes,
+            install: true)
+    static_dep = declare_dependency(
+            include_directories: includes,
+            dependencies: static_deps)
+
+    if not use_function_versioning or is_windows
+        # use pre-build objects to build shared lib
+        sources = []
+        objs += static_lib.extract_all_objects(recursive: false)
+    else
+        # for compat we need to rebuild with
+        # RTE_BUILD_SHARED_LIB defined
+        cflags += '-DRTE_BUILD_SHARED_LIB'
+    endif
+    version_map = '@0@/@1@/version.map'.format(
+            meson.current_source_dir(), dir_name)
+    implib = dir_name + '.dll.a'
+
+    def_file = custom_target(libname + '_def',
+            command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+            input: version_map,
+            output: '@0@_exports.def'.format(libname))
+
+    mingw_map = custom_target(libname + '_mingw',
+            command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+            input: version_map,
+            output: '@0@_mingw.map'.format(libname))
+
+    if is_ms_linker
+        lk_args = ['-Wl,/def:' + def_file.full_path()]
+        if meson.version().version_compare('<0.54.0')
+            lk_args += ['-Wl,/implib:lib\\' + implib]
+        endif
+    else
+        if is_windows
+            lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
+        else
+            lk_args = ['-Wl,--version-script=' + version_map]
+        endif
+    endif
+
+    lk_deps = [version_map, def_file, mingw_map]
+    if not is_windows
+        # on unix systems check the output of the
+        # check-symbols.sh script, using it as a
+        # dependency of the .so build
+        lk_deps += custom_target(name + '.sym_chk',
+                command: [check_symbols,
+                    version_map, '@INPUT@'],
+                capture: true,
+                input: static_lib,
+                output: name + '.sym_chk')
+    endif
+
+    shared_lib = shared_library(libname,
+            sources,
+            objects: objs,
+            c_args: cflags,
+            dependencies: shared_deps,
+            include_directories: includes,
+            link_args: lk_args,
+            link_depends: lk_deps,
+            version: abi_version,
+            soversion: so_version,
+            install: true)
+    shared_dep = declare_dependency(link_with: shared_lib,
+            include_directories: includes,
+            dependencies: shared_deps)
+
+    dpdk_libraries = [shared_lib] + dpdk_libraries
+    dpdk_static_libraries = [static_lib] + dpdk_static_libraries
+
+    set_variable('shared_rte_' + name, shared_dep)
+    set_variable('static_rte_' + name, static_dep)
+    message('lib/@0@: Defining dependency "@1@"'.format(dir_name, name))
 endforeach
-- 
2.27.0

[dpdk-dev] [RFC PATCH 03/14] build: correct indentation in list of libs

[Bruce Richardson]

With the lib/meson.build file changed from C-style indentation to
python-style indentation, we need to correct the indentation of the lists
of libraries, since these libs were not modified in the previous patches.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build | 72 ++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 70a9ef0a0e..7821dc9290 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -9,44 +9,44 @@
 # given as a dep, no need to mention ring. This is especially true for the
 # core libs which are widely reused, so their deps are kept to a minimum.
 libraries = [
-	'kvargs', # eal depends on kvargs
-	'telemetry', # basic info querying
-	'eal', # everything depends on eal
-	'ring',
-	'rcu', # rcu depends on ring
-	'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
-	'cmdline',
-	'metrics', # bitrate/latency stats depends on this
-	'hash',    # efd depends on this
-	'timer',   # eventdev depends on this
-	'acl', 'bbdev', 'bitratestats', 'cfgfile',
-	'compressdev', 'cryptodev',
-	'distributor', 'efd', 'eventdev',
-	'gro', 'gso', 'ip_frag', 'jobstats',
-	'kni', 'latencystats', 'lpm', 'member',
-	'power', 'pdump', 'rawdev', 'regexdev',
-	'rib', 'reorder', 'sched', 'security', 'stack', 'vhost',
-	# ipsec lib depends on net, crypto and security
-	'ipsec',
-	#fib lib depends on rib
-	'fib',
-	# add pkt framework libs which use other libs from above
-	'port', 'table', 'pipeline',
-	# flow_classify lib depends on pkt framework table lib
-	'flow_classify', 'bpf', 'graph', 'node']
+    'kvargs', # eal depends on kvargs
+    'telemetry', # basic info querying
+    'eal', # everything depends on eal
+    'ring',
+    'rcu', # rcu depends on ring
+    'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
+    'cmdline',
+    'metrics', # bitrate/latency stats depends on this
+    'hash',    # efd depends on this
+    'timer',   # eventdev depends on this
+    'acl', 'bbdev', 'bitratestats', 'cfgfile',
+    'compressdev', 'cryptodev',
+    'distributor', 'efd', 'eventdev',
+    'gro', 'gso', 'ip_frag', 'jobstats',
+    'kni', 'latencystats', 'lpm', 'member',
+    'power', 'pdump', 'rawdev', 'regexdev',
+    'rib', 'reorder', 'sched', 'security', 'stack', 'vhost',
+    # ipsec lib depends on net, crypto and security
+    'ipsec',
+    #fib lib depends on rib
+    'fib',
+    # add pkt framework libs which use other libs from above
+    'port', 'table', 'pipeline',
+    # flow_classify lib depends on pkt framework table lib
+    'flow_classify', 'bpf', 'graph', 'node']
 
 if is_windows
-	libraries = [
-		'kvargs',
-		'telemetry',
-		'eal',
-		'ring',
-		'rcu',
-		'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
-		'cmdline',
-		'hash',
-		'cfgfile',
-	] # only supported libraries for windows
+    libraries = [
+        'kvargs',
+        'telemetry',
+        'eal',
+        'ring',
+        'rcu',
+        'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
+        'cmdline',
+        'hash',
+        'cfgfile',
+    ] # only supported libraries for windows
 endif
 
 default_cflags = machine_args
-- 
2.27.0

Re: [dpdk-dev] [RFC PATCH 03/14] build: correct indentation in list of libs

[Thomas Monjalon]

01/04/2021 13:49, Bruce Richardson:
> With the lib/meson.build file changed from C-style indentation to
> python-style indentation, we need to correct the indentation of the lists
> of libraries, since these libs were not modified in the previous patches.
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> +    'kvargs', # eal depends on kvargs
> +    'telemetry', # basic info querying
> +    'eal', # everything depends on eal
> +    'ring',
> +    'rcu', # rcu depends on ring
> +    'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
> +    'cmdline',
> +    'metrics', # bitrate/latency stats depends on this
> +    'hash',    # efd depends on this
> +    'timer',   # eventdev depends on this
> +    'acl', 'bbdev', 'bitratestats', 'cfgfile',
> +    'compressdev', 'cryptodev',
> +    'distributor', 'efd', 'eventdev',
> +    'gro', 'gso', 'ip_frag', 'jobstats',
> +    'kni', 'latencystats', 'lpm', 'member',
> +    'power', 'pdump', 'rawdev', 'regexdev',
> +    'rib', 'reorder', 'sched', 'security', 'stack', 'vhost',
> +    # ipsec lib depends on net, crypto and security
> +    'ipsec',
> +    #fib lib depends on rib

space missing

> +    'fib',
> +    # add pkt framework libs which use other libs from above
> +    'port', 'table', 'pipeline',
> +    # flow_classify lib depends on pkt framework table lib
> +    'flow_classify', 'bpf', 'graph', 'node']

Some may deserve to be on their own line.

Re: [dpdk-dev] [RFC PATCH 03/14] build: correct indentation in list of libs

[Bruce Richardson]

On Thu, Apr 01, 2021 at 03:30:24PM +0200, Thomas Monjalon wrote:
> 01/04/2021 13:49, Bruce Richardson:
> > With the lib/meson.build file changed from C-style indentation to
> > python-style indentation, we need to correct the indentation of the lists
> > of libraries, since these libs were not modified in the previous patches.
> > 
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> > +    'kvargs', # eal depends on kvargs
> > +    'telemetry', # basic info querying
> > +    'eal', # everything depends on eal
> > +    'ring',
> > +    'rcu', # rcu depends on ring
> > +    'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
> > +    'cmdline',
> > +    'metrics', # bitrate/latency stats depends on this
> > +    'hash',    # efd depends on this
> > +    'timer',   # eventdev depends on this
> > +    'acl', 'bbdev', 'bitratestats', 'cfgfile',
> > +    'compressdev', 'cryptodev',
> > +    'distributor', 'efd', 'eventdev',
> > +    'gro', 'gso', 'ip_frag', 'jobstats',
> > +    'kni', 'latencystats', 'lpm', 'member',
> > +    'power', 'pdump', 'rawdev', 'regexdev',
> > +    'rib', 'reorder', 'sched', 'security', 'stack', 'vhost',
> > +    # ipsec lib depends on net, crypto and security
> > +    'ipsec',
> > +    #fib lib depends on rib
> 
> space missing
> 
> > +    'fib',
> > +    # add pkt framework libs which use other libs from above
> > +    'port', 'table', 'pipeline',
> > +    # flow_classify lib depends on pkt framework table lib
> > +    'flow_classify', 'bpf', 'graph', 'node']
> 
> Some may deserve to be on their own line.
> 
Maybe put them all on their own line, or would just just be too long a
list?

[dpdk-dev] [RFC PATCH 04/14] build: simplify the driver build configuration file

[Bruce Richardson]

As with the library meson.build file, we can use the "continue" keyword to
reduce the level of indentation used for the majority of the build file.
Since we are changing the whitespace indentation level, we also update the
body of the foreach loop to use the meson standard, 4-space indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/meson.build | 361 ++++++++++++++++++++++----------------------
 1 file changed, 177 insertions(+), 184 deletions(-)

diff --git a/drivers/meson.build b/drivers/meson.build
index 9c8eded697..57b15bda03 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -31,188 +31,181 @@ if cc.has_argument('-Wno-format-truncation')
 endif
 
 foreach subpath:subdirs
-	drivers = []
-	std_deps = []
-
-	# subpath can be either "class" or "class/driver"
-	if subpath.contains('/')
-		driver_path = subpath.split('/')
-		class = driver_path[0]
-		drivers += driver_path[1]
-	else
-		class = subpath
-		subdir(class)
-	endif
-
-	# save class name on first occurrence
-	if not dpdk_driver_classes.contains(class)
-		dpdk_driver_classes += class
-	endif
-	# get already enabled drivers of the same class
-	enabled_drivers = get_variable(class + '_drivers', [])
-
-	foreach drv:drivers
-		drv_path = join_paths(class, drv)
-
-		# set up empty variables used for build
-		build = true # set to false to disable, e.g. missing deps
-		reason = '<unknown reason>' # set if build == false to explain
-		name = drv
-		sources = []
-		headers = []
-		objs = []
-		cflags = default_cflags
-		includes = [include_directories(drv_path)]
-		# set up internal deps. Drivers can append/override as necessary
-		deps = std_deps
-		# ext_deps: Stores external library dependency got
-		# using dependency() (preferred) or find_library().
-		# For the find_library() case (but not with dependency()) we also
-		# need to specify the "-l" flags in pkgconfig_extra_libs variable
-		# too, so that it can be reflected in the pkgconfig output for
-		# static builds.
-		ext_deps = []
-		pkgconfig_extra_libs = []
-
-		if disabled_drivers.contains(drv_path)
-			build = false
-			reason = 'explicitly disabled via build config'
-		else
-			# pull in driver directory which should update all the local variables
-			subdir(drv_path)
-		endif
-
-		if build
-			# get dependency objs from strings
-			shared_deps = ext_deps
-			static_deps = ext_deps
-			foreach d:deps
-				if not is_variable('shared_rte_' + d)
-					build = false
-					reason = 'missing internal dependency, "@0@"'.format(d)
-					message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
-							.format(d, name, 'drivers/' + drv_path))
-				else
-					shared_deps += [get_variable('shared_rte_' + d)]
-					static_deps += [get_variable('static_rte_' + d)]
-				endif
-			endforeach
-		endif
-
-		if not build
-			# some driver directories are placeholders which
-			# are never built, so we allow suppression of the
-			# component disable printout in those cases
-			if reason != ''
-				dpdk_drvs_disabled += drv_path
-				set_variable(drv_path.underscorify() +
-						'_disable_reason', reason)
-			endif
-		else
-			enabled_drivers += name
-			lib_name = '_'.join(['rte', class, name])
-			dpdk_conf.set(lib_name.to_upper(), 1)
-
-			dpdk_extra_ldflags += pkgconfig_extra_libs
-
-			install_headers(headers)
-
-			# generate pmdinfo sources by building a temporary
-			# lib and then running pmdinfogen on the contents of
-			# that lib. The final lib reuses the object files and
-			# adds in the new source file.
-			out_filename = lib_name + '.pmd.c'
-			tmp_lib = static_library('tmp_' + lib_name,
-					sources,
-					include_directories: includes,
-					dependencies: static_deps,
-					c_args: cflags)
-			objs += tmp_lib.extract_all_objects()
-			sources = custom_target(out_filename,
-					command: [pmdinfo, tmp_lib.full_path(),
-						'@OUTPUT@', pmdinfogen],
-					output: out_filename,
-					depends: [tmp_lib])
-
-			# now build the static driver
-			static_lib = static_library(lib_name,
-				sources,
-				objects: objs,
-				include_directories: includes,
-				dependencies: static_deps,
-				c_args: cflags,
-				install: true)
-
-			# now build the shared driver
-			version_map = '@0@/@1@/version.map'.format(
-					meson.current_source_dir(),
-					drv_path)
-			implib = 'lib' + lib_name + '.dll.a'
-
-			def_file = custom_target(lib_name + '_def',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_exports.def'.format(lib_name))
-
-			mingw_map = custom_target(lib_name + '_mingw',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_mingw.map'.format(lib_name))
-
-			lk_deps = [version_map, def_file, mingw_map]
-			if is_windows
-				if is_ms_linker
-					lk_args = ['-Wl,/def:' + def_file.full_path()]
-					if meson.version().version_compare('<0.54.0')
-						lk_args += ['-Wl,/implib:drivers\\' + implib]
-					endif
-				else
-					lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
-				endif
-			else
-				lk_args = ['-Wl,--version-script=' + version_map]
-				# on unix systems check the output of the
-				# check-symbols.sh script, using it as a
-				# dependency of the .so build
-				lk_deps += custom_target(lib_name + '.sym_chk',
-					command: [check_symbols,
-						version_map, '@INPUT@'],
-					capture: true,
-					input: static_lib,
-					output: lib_name + '.sym_chk')
-			endif
-
-			shared_lib = shared_library(lib_name,
-				sources,
-				objects: objs,
-				include_directories: includes,
-				dependencies: shared_deps,
-				c_args: cflags,
-				link_args: lk_args,
-				link_depends: lk_deps,
-				version: abi_version,
-				soversion: so_version,
-				install: true,
-				install_dir: driver_install_path)
-
-			# create a dependency object and add it to the global dictionary so
-			# testpmd or other built-in apps can find it if necessary
-			shared_dep = declare_dependency(link_with: shared_lib,
-					include_directories: includes,
-					dependencies: shared_deps)
-			static_dep = declare_dependency(
-					include_directories: includes,
-					dependencies: static_deps)
-
-			dpdk_drivers += static_lib
-
-			set_variable('shared_@0@'.format(lib_name), shared_dep)
-			set_variable('static_@0@'.format(lib_name), static_dep)
-			dependency_name = ''.join(lib_name.split('rte_'))
-			message('drivers/@0@: Defining dependency "@1@"'.format(
-					drv_path, dependency_name))
-		endif # build
-	endforeach
-
-	set_variable(class + '_drivers', enabled_drivers)
+    drivers = []
+    std_deps = []
+
+    # subpath can be either "class" or "class/driver"
+    if subpath.contains('/')
+        driver_path = subpath.split('/')
+        class = driver_path[0]
+        drivers += driver_path[1]
+    else
+        class = subpath
+        subdir(class)
+    endif
+
+    # save class name on first occurrence
+    if not dpdk_driver_classes.contains(class)
+        dpdk_driver_classes += class
+    endif
+    # get already enabled drivers of the same class
+    enabled_drivers = get_variable(class + '_drivers', [])
+
+    foreach drv:drivers
+        drv_path = join_paths(class, drv)
+
+        # set up empty variables used for build
+        build = true # set to false to disable, e.g. missing deps
+        reason = '<unknown reason>' # set if build == false to explain
+        name = drv
+        sources = []
+        headers = []
+        objs = []
+        cflags = default_cflags
+        includes = [include_directories(drv_path)]
+        # set up internal deps. Drivers can append/override as necessary
+        deps = std_deps
+        # ext_deps: Stores external library dependency got
+        # using dependency() (preferred) or find_library().
+        # For the find_library() case (but not with dependency()) we also
+        # need to specify the "-l" flags in pkgconfig_extra_libs variable
+        # too, so that it can be reflected in the pkgconfig output for
+        # static builds.
+        ext_deps = []
+        pkgconfig_extra_libs = []
+
+        if disabled_drivers.contains(drv_path)
+            build = false
+            reason = 'explicitly disabled via build config'
+        else
+            # pull in driver directory which should update all the local variables
+            subdir(drv_path)
+        endif
+
+        if build
+            # get dependency objs from strings
+            shared_deps = ext_deps
+            static_deps = ext_deps
+            foreach d:deps
+                if not is_variable('shared_rte_' + d)
+                    build = false
+                    reason = 'missing internal dependency, "@0@"'.format(d)
+                    message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
+                            .format(d, name, 'drivers/' + drv_path))
+                else
+                    shared_deps += [get_variable('shared_rte_' + d)]
+                    static_deps += [get_variable('static_rte_' + d)]
+                endif
+            endforeach
+        endif
+
+        if not build
+            # some driver directories are placeholders which
+            # are never built, so we allow suppression of the
+            # component disable printout in those cases
+            if reason != ''
+                dpdk_drvs_disabled += drv_path
+                set_variable(drv_path.underscorify() + '_disable_reason', reason)
+            endif
+            continue
+        endif
+
+        enabled_drivers += name
+        lib_name = '_'.join(['rte', class, name])
+        dpdk_conf.set(lib_name.to_upper(), 1)
+
+        dpdk_extra_ldflags += pkgconfig_extra_libs
+
+        install_headers(headers)
+
+        # generate pmdinfo sources by building a temporary
+        # lib and then running pmdinfogen on the contents of
+        # that lib. The final lib reuses the object files and
+        # adds in the new source file.
+        out_filename = lib_name + '.pmd.c'
+        tmp_lib = static_library('tmp_' + lib_name, sources,
+                include_directories: includes,
+                dependencies: static_deps,
+                c_args: cflags)
+        objs += tmp_lib.extract_all_objects()
+        sources = custom_target(out_filename,
+                command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
+                output: out_filename,
+                depends: [tmp_lib])
+
+        # now build the static driver
+        static_lib = static_library(lib_name,
+                sources,
+                objects: objs,
+                include_directories: includes,
+                dependencies: static_deps,
+                c_args: cflags,
+                install: true)
+
+        # now build the shared driver
+        version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path)
+        implib = 'lib' + lib_name + '.dll.a'
+
+        def_file = custom_target(lib_name + '_def',
+                command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+                input: version_map,
+                output: '@0@_exports.def'.format(lib_name))
+
+        mingw_map = custom_target(lib_name + '_mingw',
+                command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+                input: version_map,
+                output: '@0@_mingw.map'.format(lib_name))
+
+        lk_deps = [version_map, def_file, mingw_map]
+        if is_windows
+            if is_ms_linker
+                lk_args = ['-Wl,/def:' + def_file.full_path()]
+                if meson.version().version_compare('<0.54.0')
+                    lk_args += ['-Wl,/implib:drivers\\' + implib]
+                endif
+            else
+                lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
+            endif
+        else
+            lk_args = ['-Wl,--version-script=' + version_map]
+            # on unix systems check the output of the
+            # check-symbols.sh script, using it as a
+            # dependency of the .so build
+            lk_deps += custom_target(lib_name + '.sym_chk',
+                    command: [check_symbols, version_map, '@INPUT@'],
+                    capture: true,
+                    input: static_lib,
+                    output: lib_name + '.sym_chk')
+        endif
+
+        shared_lib = shared_library(lib_name, sources,
+                objects: objs,
+                include_directories: includes,
+                dependencies: shared_deps,
+                c_args: cflags,
+                link_args: lk_args,
+                link_depends: lk_deps,
+                version: abi_version,
+                soversion: so_version,
+                install: true,
+                install_dir: driver_install_path)
+
+        # create a dependency object and add it to the global dictionary so
+        # testpmd or other built-in apps can find it if necessary
+        shared_dep = declare_dependency(link_with: shared_lib,
+                include_directories: includes,
+                dependencies: shared_deps)
+        static_dep = declare_dependency(
+                include_directories: includes,
+                dependencies: static_deps)
+
+        dpdk_drivers += static_lib
+
+        set_variable('shared_@0@'.format(lib_name), shared_dep)
+        set_variable('static_@0@'.format(lib_name), static_dep)
+        dependency_name = ''.join(lib_name.split('rte_'))
+        message('drivers/@0@: Defining dependency "@1@"'.format(drv_path, dependency_name))
+    endforeach
+
+    set_variable(class + '_drivers', enabled_drivers)
 endforeach
-- 
2.27.0

[dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation

[Bruce Richardson]

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

Re: [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation

[Andrew Rybchenko]

On 4/1/21 2:50 PM, Bruce Richardson wrote:
> 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']

It looks like it is more than 4 spaces here (and many similar
cases below), but previous patch and longs lists below in the
file use 4 spaces alignment.

Re: [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation

[Bruce Richardson]

On Thu, Apr 01, 2021 at 03:14:40PM +0300, Andrew Rybchenko wrote:
> On 4/1/21 2:50 PM, Bruce Richardson wrote:
> > 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']
> 
> It looks like it is more than 4 spaces here (and many similar
> cases below), but previous patch and longs lists below in the
> file use 4 spaces alignment.

Yes, for indenting line continuations, I've tended to prefer to use a
double-indent, and save single indent for new blocks of code.

Re: [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation

[Andrew Rybchenko]

On 4/1/21 3:33 PM, Bruce Richardson wrote:
> On Thu, Apr 01, 2021 at 03:14:40PM +0300, Andrew Rybchenko wrote:
>> On 4/1/21 2:50 PM, Bruce Richardson wrote:
>>> 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']
>> It looks like it is more than 4 spaces here (and many similar
>> cases below), but previous patch and longs lists below in the
>> file use 4 spaces alignment.
> Yes, for indenting line continuations, I've tended to prefer to use a
> double-indent, and save single indent for new blocks of code.

I see. May be it is better to put the first 'null' and the last 'acc100' on
its own line with trailing comma?

Also shouldn't the list be alpha-numerically sorted?

[dpdk-dev] [RFC PATCH 06/14] build: reduce indentation in app build spec

[Bruce Richardson]

As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/meson.build | 100 ++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/app/meson.build b/app/meson.build
index 50a53dbde8..dcffda9d90 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -2,71 +2,71 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 if is_windows
-	subdir_done()
+    subdir_done()
 endif
 
 apps = [
-	'pdump',
-	'proc-info',
-	'test-acl',
-	'test-bbdev',
-	'test-cmdline',
-	'test-compress-perf',
-	'test-crypto-perf',
-	'test-eventdev',
-	'test-fib',
-	'test-flow-perf',
-	'test-pipeline',
-	'test-pmd',
-	'test-regex',
-	'test-sad']
+    'pdump',
+    'proc-info',
+    'test-acl',
+    'test-bbdev',
+    'test-cmdline',
+    'test-compress-perf',
+    'test-crypto-perf',
+    'test-eventdev',
+    'test-fib',
+    'test-flow-perf',
+    'test-pipeline',
+    'test-pmd',
+    'test-regex',
+    'test-sad']
 
 default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
 default_ldflags = []
 if get_option('default_library') == 'static' and not is_windows
-	default_ldflags += ['-Wl,--export-dynamic']
+    default_ldflags += ['-Wl,--export-dynamic']
 endif
 
 foreach app:apps
-	build = true
-	name = app
-	sources = []
-	includes = []
-	cflags = default_cflags
-	ldflags = default_ldflags
-	objs = [] # other object files to link against, used e.g. for
-	          # instruction-set optimized versions of code
+    build = true
+    name = app
+    sources = []
+    includes = []
+    cflags = default_cflags
+    ldflags = default_ldflags
+    objs = [] # other object files to link against, used e.g. for
+              # instruction-set optimized versions of code
 
-	# use "deps" for internal DPDK dependencies, and "ext_deps" for
-	# external package/library requirements
-	ext_deps = []
-	deps = []
+    # use "deps" for internal DPDK dependencies, and "ext_deps" for
+    # external package/library requirements
+    ext_deps = []
+    deps = []
 
-	subdir(name)
+    subdir(name)
 
-	if build
-		dep_objs = []
-		foreach d:deps
-			dep_objs += get_variable(get_option('default_library')
-				 + '_rte_' + d)
-		endforeach
+    if not build
+        continue
+    endif
 
-		link_libs = []
-		if get_option('default_library') == 'static'
-			link_libs = dpdk_static_libraries + dpdk_drivers
-		endif
+    dep_objs = []
+    foreach d:deps
+        dep_objs += get_variable(get_option('default_library') + '_rte_' + d)
+    endforeach
 
-		executable('dpdk-' + name,
-				sources,
-				c_args: cflags,
-				link_args: ldflags,
-				link_whole: link_libs,
-				dependencies: dep_objs,
-				include_directories: includes,
-				install_rpath: join_paths(get_option('prefix'),
-						 driver_install_path),
-				install: true)
-	endif
+    link_libs = []
+    if get_option('default_library') == 'static'
+        link_libs = dpdk_static_libraries + dpdk_drivers
+    endif
+
+    executable('dpdk-' + name,
+            sources,
+            c_args: cflags,
+            link_args: ldflags,
+            link_whole: link_libs,
+            dependencies: dep_objs,
+            include_directories: includes,
+            install_rpath: join_paths(get_option('prefix'), driver_install_path),
+            install: true)
 endforeach
 
 # special case the autotests
-- 
2.27.0

Re: [dpdk-dev] [RFC PATCH 06/14] build: reduce indentation in app build spec

[Thomas Monjalon]

01/04/2021 13:50, Bruce Richardson:
> As with the lib and drivers directories, we can use "continue" keyword to
> reduce the indentation level of the majority of the foreach block. At the
> same time, we can also replace tab indentation with spaces.
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> +    'pdump',
> +    'proc-info',
> +    'test-acl',
> +    'test-bbdev',
> +    'test-cmdline',
> +    'test-compress-perf',
> +    'test-crypto-perf',
> +    'test-eventdev',
> +    'test-fib',
> +    'test-flow-perf',
> +    'test-pipeline',
> +    'test-pmd',
> +    'test-regex',
> +    'test-sad']

Can we have an extra comma like this?

	'test-sad',
]

Re: [dpdk-dev] [RFC PATCH 06/14] build: reduce indentation in app build spec

[Bruce Richardson]

On Thu, Apr 01, 2021 at 03:32:14PM +0200, Thomas Monjalon wrote:
> 01/04/2021 13:50, Bruce Richardson:
> > As with the lib and drivers directories, we can use "continue" keyword to
> > reduce the indentation level of the majority of the foreach block. At the
> > same time, we can also replace tab indentation with spaces.
> > 
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> > +    'pdump',
> > +    'proc-info',
> > +    'test-acl',
> > +    'test-bbdev',
> > +    'test-cmdline',
> > +    'test-compress-perf',
> > +    'test-crypto-perf',
> > +    'test-eventdev',
> > +    'test-fib',
> > +    'test-flow-perf',
> > +    'test-pipeline',
> > +    'test-pmd',
> > +    'test-regex',
> > +    'test-sad']
> 
> Can we have an extra comma like this?
> 
> 	'test-sad',
> ]
> 

Not sure about changes of that magnitude. :-)

Will try and standardize on that on all lists for a V2.

[dpdk-dev] [RFC PATCH 07/14] build: reduce indentation in examples build spec

[Bruce Richardson]

As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/meson.build | 158 ++++++++++++++++++++++---------------------
 1 file changed, 80 insertions(+), 78 deletions(-)

diff --git a/examples/meson.build b/examples/meson.build
index d065a6a08b..b9518d687c 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -3,109 +3,111 @@
 
 link_whole_libs = []
 if get_option('default_library') == 'static'
-	link_whole_libs = dpdk_static_libraries + dpdk_drivers
+    link_whole_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 # list of all example apps. Keep 1-3 per line, in alphabetical order.
 all_examples = [
-	'bbdev_app', 'bond',
-	'cmdline',
-	'distributor', 'ethtool',
-	'eventdev_pipeline',
-	'fips_validation', 'flow_classify',
-	'flow_filtering', 'helloworld',
-	'ioat',
-	'ip_fragmentation', 'ip_pipeline',
-	'ip_reassembly', 'ipsec-secgw',
-	'ipv4_multicast', 'kni',
-	'l2fwd', 'l2fwd-cat', 'l2fwd-event',
-	'l2fwd-crypto', 'l2fwd-jobstats',
-	'l2fwd-keepalive', 'l3fwd',
-	'l3fwd-acl', 'l3fwd-power', 'l3fwd-graph',
-	'link_status_interrupt',
-	'multi_process/client_server_mp/mp_client',
-	'multi_process/client_server_mp/mp_server',
-	'multi_process/hotplug_mp',
-	'multi_process/simple_mp',
-	'multi_process/symmetric_mp',
-	'ntb', 'packet_ordering',
-	'performance-thread/l3fwd-thread',
-	'performance-thread/pthread_shim',
-	'pipeline',
-	'ptpclient',
-	'qos_meter', 'qos_sched',
-	'rxtx_callbacks',
-	'server_node_efd/node',
-	'server_node_efd/server',
-	'service_cores',
-	'skeleton',
-	'timer', 'vdpa',
-	'vhost', 'vhost_crypto',
-	'vhost_blk', 'vm_power_manager',
-	'vm_power_manager/guest_cli',
-	'vmdq', 'vmdq_dcb',
+    'bbdev_app', 'bond',
+    'cmdline',
+    'distributor', 'ethtool',
+    'eventdev_pipeline',
+    'fips_validation', 'flow_classify',
+    'flow_filtering', 'helloworld',
+    'ioat',
+    'ip_fragmentation', 'ip_pipeline',
+    'ip_reassembly', 'ipsec-secgw',
+    'ipv4_multicast', 'kni',
+    'l2fwd', 'l2fwd-cat', 'l2fwd-event',
+    'l2fwd-crypto', 'l2fwd-jobstats',
+    'l2fwd-keepalive', 'l3fwd',
+    'l3fwd-acl', 'l3fwd-power', 'l3fwd-graph',
+    'link_status_interrupt',
+    'multi_process/client_server_mp/mp_client',
+    'multi_process/client_server_mp/mp_server',
+    'multi_process/hotplug_mp',
+    'multi_process/simple_mp',
+    'multi_process/symmetric_mp',
+    'ntb', 'packet_ordering',
+    'performance-thread/l3fwd-thread',
+    'performance-thread/pthread_shim',
+    'pipeline',
+    'ptpclient',
+    'qos_meter', 'qos_sched',
+    'rxtx_callbacks',
+    'server_node_efd/node',
+    'server_node_efd/server',
+    'service_cores',
+    'skeleton',
+    'timer', 'vdpa',
+    'vhost', 'vhost_crypto',
+    'vhost_blk', 'vm_power_manager',
+    'vm_power_manager/guest_cli',
+    'vmdq', 'vmdq_dcb',
 ]
 
 # on install, skip copying all meson.build files
 ex_file_excludes = ['meson.build']
 foreach ex:all_examples
-	ex_file_excludes += [ex + '/meson.build']
+    ex_file_excludes += [ex + '/meson.build']
 endforeach
 
 if get_option('examples') == ''
-	subdir_done()
+    subdir_done()
 endif
 
 if get_option('examples').to_lower() == 'all'
-	examples = all_examples
-	allow_skips = true # don't flag an error if we can't build an app
+    examples = all_examples
+    allow_skips = true # don't flag an error if we can't build an app
 else
-	examples = get_option('examples').split(',')
-	allow_skips = false # error out if we can't build a requested app
+    examples = get_option('examples').split(',')
+    allow_skips = false # error out if we can't build a requested app
 endif
 default_cflags = machine_args
 if cc.has_argument('-Wno-format-truncation')
-	default_cflags += '-Wno-format-truncation'
+    default_cflags += '-Wno-format-truncation'
 endif
 default_ldflags = dpdk_extra_ldflags
 if get_option('default_library') == 'static' and not is_windows
-	default_ldflags += ['-Wl,--export-dynamic']
+    default_ldflags += ['-Wl,--export-dynamic']
 endif
 
 foreach example: examples
-	name = example.split('/')[-1]
-	build = true
-	sources = []
-	allow_experimental_apis = false
-	cflags = default_cflags
-	ldflags = default_ldflags
+    name = example.split('/')[-1]
+    build = true
+    sources = []
+    allow_experimental_apis = false
+    cflags = default_cflags
+    ldflags = default_ldflags
 
-	ext_deps = []
-	includes = [include_directories(example)]
-	deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
-	subdir(example)
+    ext_deps = []
+    includes = [include_directories(example)]
+    deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
+    subdir(example)
 
-	if build
-		dep_objs = ext_deps
-		foreach d:deps
-			var_name = get_option('default_library') + '_rte_' + d
-			if not is_variable(var_name)
-				error('Missing dependency "@0@" for example "@1@"'.format(d, name))
-			endif
-			dep_objs += [get_variable(var_name)]
-		endforeach
-		if allow_experimental_apis
-			cflags += '-DALLOW_EXPERIMENTAL_API'
-		endif
-		executable('dpdk-' + name, sources,
-			include_directories: includes,
-			link_whole: link_whole_libs,
-			link_args: ldflags,
-			c_args: cflags,
-			dependencies: dep_objs)
-	elif not allow_skips
-		error('Cannot build requested example "' + name + '"')
-	else
-		message('Skipping example "' + name + '"')
-	endif
+    if not build
+        if not allow_skips
+            error('Cannot build requested example "' + name + '"')
+        endif
+        message('Skipping example "' + name + '"')
+        continue
+    endif
+
+    dep_objs = ext_deps
+    foreach d:deps
+        var_name = get_option('default_library') + '_rte_' + d
+        if not is_variable(var_name)
+            error('Missing dependency "@0@" for example "@1@"'.format(d, name))
+        endif
+        dep_objs += [get_variable(var_name)]
+    endforeach
+    if allow_experimental_apis
+        cflags += '-DALLOW_EXPERIMENTAL_API'
+    endif
+    executable('dpdk-' + name, sources,
+            include_directories: includes,
+            link_whole: link_whole_libs,
+            link_args: ldflags,
+            c_args: cflags,
+            dependencies: dep_objs)
 endforeach
-- 
2.27.0

[dpdk-dev] [RFC PATCH 08/14] build: change infrastructure file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation, for the
basic infrastructure and tooling files, as well as doc and kernel
directories.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 buildtools/chkincs/meson.build    |  24 +-
 buildtools/meson.build            |  34 +--
 buildtools/pkg-config/meson.build |  34 +--
 config/arm/meson.build            | 448 +++++++++++++++---------------
 config/meson.build                | 278 +++++++++---------
 config/ppc/meson.build            |   8 +-
 config/x86/meson.build            |  64 ++---
 doc/api/meson.build               |  36 +--
 doc/guides/meson.build            |  24 +-
 doc/meson.build                   |   6 +-
 kernel/freebsd/meson.build        |  32 +--
 kernel/linux/kni/meson.build      |  40 +--
 kernel/linux/meson.build          | 112 ++++----
 meson.build                       |  82 +++---
 meson_options.txt                 |  34 +--
 usertools/meson.build             |   8 +-
 16 files changed, 632 insertions(+), 632 deletions(-)

diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index f28cfd3cd4..428e418ca2 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2021 Intel Corporation
 
 if not get_option('check_includes')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 if is_windows
-	# for windows, the shebang line in the script won't work.
-	error('option "check_includes" is not supported on windows')
+    # for windows, the shebang line in the script won't work.
+    error('option "check_includes" is not supported on windows')
 endif
 
 gen_c_file_for_header = find_program('gen_c_file_for_header.py')
 gen_c_files = generator(gen_c_file_for_header,
-	output: '@BASENAME@.c',
-	arguments: ['@INPUT@', '@OUTPUT@'])
+    output: '@BASENAME@.c',
+    arguments: ['@INPUT@', '@OUTPUT@'])
 
 cflags = machine_args
 cflags += '-DALLOW_EXPERIMENTAL_API'
@@ -24,12 +24,12 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
 
 deps = []
 foreach l:enabled_libs
-	deps += get_variable('static_rte_' + l)
+    deps += get_variable('static_rte_' + l)
 endforeach
 
 executable('chkincs', sources,
-	c_args: cflags,
-	include_directories: includes,
-	dependencies: deps,
-	link_whole: dpdk_static_libraries + dpdk_drivers,
-	install: false)
+    c_args: cflags,
+    include_directories: includes,
+    dependencies: deps,
+    link_whole: dpdk_static_libraries + dpdk_drivers,
+    install: false)
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 9c9347457a..c520896b4b 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -10,9 +10,9 @@ binutils_avx512_check = find_program('binutils-avx512-check.sh')
 # set up map-to-win script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
 if python3.found()
-	py3 = [python3]
+    py3 = [python3]
 else
-	py3 = ['meson', 'runpython']
+    py3 = ['meson', 'runpython']
 endif
 map_to_win_cmd = py3 + files('map_to_win.py')
 sphinx_wrapper = py3 + files('call-sphinx-build.py')
@@ -21,27 +21,27 @@ sphinx_wrapper = py3 + files('call-sphinx-build.py')
 pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
 pmdinfogen = py3 + files('pmdinfogen.py')
 if host_machine.system() == 'windows'
-	if cc.get_id() == 'gcc'
-		pmdinfo += 'ar'
-	else
-		pmdinfo += 'llvm-ar'
-	endif
-	pmdinfogen += 'coff'
+    if cc.get_id() == 'gcc'
+        pmdinfo += 'ar'
+    else
+        pmdinfo += 'llvm-ar'
+    endif
+    pmdinfogen += 'coff'
 else
-	pmdinfo += 'ar'
-	pmdinfogen += 'elf'
+    pmdinfo += 'ar'
+    pmdinfogen += 'elf'
 endif
 
 # TODO: starting from Meson 0.51.0 use
-# 	python3 = import('python').find_installation('python',
-#		modules : python3_required_modules)
+#     python3 = import('python').find_installation('python',
+#        modules : python3_required_modules)
 python3_required_modules = []
 if host_machine.system() != 'windows'
-	python3_required_modules = ['elftools']
+    python3_required_modules = ['elftools']
 endif
 foreach module : python3_required_modules
-	script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
-	if run_command(py3, '-c', script.format(module)).returncode() != 0
-		error('missing python module: @0@'.format(module))
-	endif
+    script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
+    if run_command(py3, '-c', script.format(module)).returncode() != 0
+        error('missing python module: @0@'.format(module))
+    endif
 endforeach
diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
index 39a8fd1c8e..79a6c29a3c 100644
--- a/buildtools/pkg-config/meson.build
+++ b/buildtools/pkg-config/meson.build
@@ -4,7 +4,7 @@
 pkg = import('pkgconfig')
 pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
 if is_freebsd
-	pkg_extra_cflags += ['-D__BSD_VISIBLE']
+    pkg_extra_cflags += ['-D__BSD_VISIBLE']
 endif
 
 # When calling pkg-config --static --libs, pkg-config will always output the
@@ -28,30 +28,30 @@ endif
 
 
 pkg.generate(name: 'dpdk-libs',
-	filebase: 'libdpdk-libs',
-	description: '''Internal-only DPDK pkgconfig file. Not for direct use.
+    filebase: 'libdpdk-libs',
+    description: '''Internal-only DPDK pkgconfig file. Not for direct use.
 Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
-	version: meson.project_version(),
-	subdirs: [get_option('include_subdir_arch'), '.'],
-	extra_cflags: pkg_extra_cflags,
-	libraries: ['-Wl,--as-needed'] + dpdk_libraries,
-	libraries_private: dpdk_extra_ldflags)
+    version: meson.project_version(),
+    subdirs: [get_option('include_subdir_arch'), '.'],
+    extra_cflags: pkg_extra_cflags,
+    libraries: ['-Wl,--as-needed'] + dpdk_libraries,
+    libraries_private: dpdk_extra_ldflags)
 
 platform_flags = []
 if not is_windows
-	platform_flags += ['-Wl,--export-dynamic'] # ELF only
+    platform_flags += ['-Wl,--export-dynamic'] # ELF only
 endif
 pkg.generate(name: 'DPDK', # main DPDK pkgconfig file
-	filebase: 'libdpdk',
-	version: meson.project_version(),
-	description: '''The Data Plane Development Kit (DPDK).
+    filebase: 'libdpdk',
+    version: meson.project_version(),
+    description: '''The Data Plane Development Kit (DPDK).
 Note that CFLAGS might contain an -march flag higher than typical baseline.
 This is required for a number of static inline functions in the public headers.''',
-	requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
-	                  # if libbsd is not enabled, then this is blank
-	libraries_private: ['-Wl,--whole-archive'] +
-			dpdk_drivers + dpdk_static_libraries +
-			['-Wl,--no-whole-archive'] + platform_flags
+    requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
+                      # if libbsd is not enabled, then this is blank
+    libraries_private: ['-Wl,--whole-archive'] +
+            dpdk_drivers + dpdk_static_libraries +
+            ['-Wl,--no-whole-archive'] + platform_flags
 )
 
 # For static linking with dependencies as shared libraries,
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 00bc4610a3..39f79b5f86 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -4,25 +4,25 @@
 
 # common flags to all aarch64 builds, with lowest priority
 flags_common = [
-	# Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
-	# to determine the best threshold in code. Refer to notes in source file
-	# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
-	['RTE_ARCH_ARM64_MEMCPY', false],
-	#	['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
-	#	['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
-	# Leave below RTE_ARM64_MEMCPY_xxx options commented out,
-	# unless there are strong reasons.
-	#	['RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK', false],
-	#	['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
-	#	['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
+    # Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
+    # to determine the best threshold in code. Refer to notes in source file
+    # (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
+    ['RTE_ARCH_ARM64_MEMCPY', false],
+    #    ['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
+    #    ['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
+    # Leave below RTE_ARM64_MEMCPY_xxx options commented out,
+    # unless there are strong reasons.
+    #    ['RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK', false],
+    #    ['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
+    #    ['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
 
-	['RTE_NET_FM10K', false],
-	['RTE_NET_AVP', false],
+    ['RTE_NET_FM10K', false],
+    ['RTE_NET_AVP', false],
 
-	['RTE_SCHED_VECTOR', false],
-	['RTE_ARM_USE_WFE', false],
-	['RTE_ARCH_ARM64', true],
-	['RTE_CACHE_LINE_SIZE', 128]
+    ['RTE_SCHED_VECTOR', false],
+    ['RTE_ARM_USE_WFE', false],
+    ['RTE_ARCH_ARM64', true],
+    ['RTE_CACHE_LINE_SIZE', 128]
 ]
 
 ## Part numbers are specific to Arm implementers
@@ -31,261 +31,261 @@ flags_common = [
 # part number specific aarch64 flags have the highest priority
 #     (will overwrite both common and implementer specific flags)
 implementer_generic = {
-	'description': 'Generic armv8',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_MAX_LCORE', 256],
-		['RTE_MAX_NUMA_NODES', 4]
-	],
-	'part_number_config': {
-		'generic': {'machine_args': ['-march=armv8-a+crc',
-					     '-moutline-atomics']}
-	}
+    'description': 'Generic armv8',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_MAX_LCORE', 256],
+        ['RTE_MAX_NUMA_NODES', 4]
+    ],
+    'part_number_config': {
+        'generic': {'machine_args': ['-march=armv8-a+crc',
+                         '-moutline-atomics']}
+    }
 }
 
 part_number_config_arm = {
-	'0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
-	'0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
-	'0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
-	'0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
-	'0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
-	'0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
-	'0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
-	'0xd0c': {
-		'machine_args':  ['-march=armv8.2-a+crypto',
-				  '-mcpu=neoverse-n1'],
-		'flags': [
-			['RTE_MACHINE', '"neoverse-n1"'],
-			['RTE_ARM_FEATURE_ATOMICS', true],
-			['RTE_MAX_MEM_MB', 1048576],
-			['RTE_MAX_LCORE', 80]
-		]
-	},
-	'0xd49': {
-		'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
-		'flags': [
-			['RTE_MACHINE', '"neoverse-n2"'],
-			['RTE_ARM_FEATURE_ATOMICS', true],
-			['RTE_MAX_LCORE', 64]
-		]
-	}
+    '0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
+    '0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
+    '0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
+    '0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
+    '0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
+    '0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
+    '0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
+    '0xd0c': {
+        'machine_args':  ['-march=armv8.2-a+crypto',
+                  '-mcpu=neoverse-n1'],
+        'flags': [
+            ['RTE_MACHINE', '"neoverse-n1"'],
+            ['RTE_ARM_FEATURE_ATOMICS', true],
+            ['RTE_MAX_MEM_MB', 1048576],
+            ['RTE_MAX_LCORE', 80]
+        ]
+    },
+    '0xd49': {
+        'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
+        'flags': [
+            ['RTE_MACHINE', '"neoverse-n2"'],
+            ['RTE_ARM_FEATURE_ATOMICS', true],
+            ['RTE_MAX_LCORE', 64]
+        ]
+    }
 }
 implementer_arm = {
-	'description': 'Arm',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': part_number_config_arm
+    'description': 'Arm',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': part_number_config_arm
 }
 
 flags_part_number_thunderx = [
-	['RTE_MACHINE', '"thunderx"'],
-	['RTE_USE_C11_MEM_MODEL', false]
+    ['RTE_MACHINE', '"thunderx"'],
+    ['RTE_USE_C11_MEM_MODEL', false]
 ]
 implementer_cavium = {
-	'description': 'Cavium',
-	'flags': [
-		['RTE_MAX_VFIO_GROUPS', 128],
-		['RTE_MAX_LCORE', 96],
-		['RTE_MAX_NUMA_NODES', 2]
-	],
-	'part_number_config': {
-		'0xa1': {
-			'machine_args': ['-mcpu=thunderxt88'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xa2': {
-			'machine_args': ['-mcpu=thunderxt81'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xa3': {
-			'machine_args': ['-mcpu=thunderxt83'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xaf': {
-			'machine_args': ['-march=armv8.1-a+crc+crypto',
-					 '-mcpu=thunderx2t99'],
-			'flags': [
-				['RTE_MACHINE', '"thunderx2"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_USE_C11_MEM_MODEL', true],
-				['RTE_CACHE_LINE_SIZE', 64],
-				['RTE_MAX_LCORE', 256]
-			]
-		},
-		'0xb2': {
-			'machine_args': ['-march=armv8.2-a+crc+crypto+lse',
-					 '-mcpu=octeontx2'],
-			'flags': [
-				['RTE_MACHINE', '"octeontx2"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_USE_C11_MEM_MODEL', true],
-				['RTE_EAL_IGB_UIO', false],
-				['RTE_MAX_LCORE', 36],
-				['RTE_MAX_NUMA_NODES', 1]
-			]
-		}
-	}
+    'description': 'Cavium',
+    'flags': [
+        ['RTE_MAX_VFIO_GROUPS', 128],
+        ['RTE_MAX_LCORE', 96],
+        ['RTE_MAX_NUMA_NODES', 2]
+    ],
+    'part_number_config': {
+        '0xa1': {
+            'machine_args': ['-mcpu=thunderxt88'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xa2': {
+            'machine_args': ['-mcpu=thunderxt81'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xa3': {
+            'machine_args': ['-mcpu=thunderxt83'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xaf': {
+            'machine_args': ['-march=armv8.1-a+crc+crypto',
+                     '-mcpu=thunderx2t99'],
+            'flags': [
+                ['RTE_MACHINE', '"thunderx2"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_USE_C11_MEM_MODEL', true],
+                ['RTE_CACHE_LINE_SIZE', 64],
+                ['RTE_MAX_LCORE', 256]
+            ]
+        },
+        '0xb2': {
+            'machine_args': ['-march=armv8.2-a+crc+crypto+lse',
+                     '-mcpu=octeontx2'],
+            'flags': [
+                ['RTE_MACHINE', '"octeontx2"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_USE_C11_MEM_MODEL', true],
+                ['RTE_EAL_IGB_UIO', false],
+                ['RTE_MAX_LCORE', 36],
+                ['RTE_MAX_NUMA_NODES', 1]
+            ]
+        }
+    }
 }
 
 implementer_ampere = {
-	'description': 'Ampere Computing',
-	'flags': [
-		['RTE_MACHINE', '"emag"'],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 32],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': {
-		'0x0': {'machine_args':  ['-march=armv8-a+crc+crypto',
-					  '-mtune=emag']}
-	}
+    'description': 'Ampere Computing',
+    'flags': [
+        ['RTE_MACHINE', '"emag"'],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 32],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': {
+        '0x0': {'machine_args':  ['-march=armv8-a+crc+crypto',
+                      '-mtune=emag']}
+    }
 }
 
 implementer_qualcomm = {
-	'description': 'Qualcomm',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 64],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': {
-		'0xc00': {'machine_args':  ['-march=armv8-a+crc']}
-	}
+    'description': 'Qualcomm',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 64],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': {
+        '0xc00': {'machine_args':  ['-march=armv8-a+crc']}
+    }
 }
 
 implementer_marvell = {
-	'description': 'Marvell ARMADA',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': part_number_config_arm
+    'description': 'Marvell ARMADA',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': part_number_config_arm
 }
 
 implementer_dpaa = {
-	'description': 'NXP DPAA',
-	'flags': [
-		['RTE_MACHINE', '"dpaa"'],
-		['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': part_number_config_arm
+    'description': 'NXP DPAA',
+    'flags': [
+        ['RTE_MACHINE', '"dpaa"'],
+        ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': part_number_config_arm
 }
 
 ## Arm implementers (ID from MIDR in Arm Architecture Reference Manual)
 implementers = {
-	'generic': implementer_generic,
-	'0x41': implementer_arm,
-	'0x43': implementer_cavium,
-	'0x50': implementer_ampere,
-	'0x51': implementer_qualcomm,
-	'0x56': implementer_marvell,
-	'dpaa': implementer_dpaa
+    'generic': implementer_generic,
+    '0x41': implementer_arm,
+    '0x43': implementer_cavium,
+    '0x50': implementer_ampere,
+    '0x51': implementer_qualcomm,
+    '0x56': implementer_marvell,
+    'dpaa': implementer_dpaa
 }
 
 dpdk_conf.set('RTE_ARCH_ARM', 1)
 dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
 
 if dpdk_conf.get('RTE_ARCH_32')
-	# armv7 build
-	dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
-	dpdk_conf.set('RTE_ARCH_ARMv7', 1)
-	# the minimum architecture supported, armv7-a, needs the following,
-	machine_args += '-mfpu=neon'
+    # armv7 build
+    dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
+    dpdk_conf.set('RTE_ARCH_ARMv7', 1)
+    # the minimum architecture supported, armv7-a, needs the following,
+    machine_args += '-mfpu=neon'
 else
-	# aarch64 build
-	if not meson.is_cross_build()
-		if machine == 'default'
-			# default build
-			implementer_id = 'generic'
-			part_number = 'generic'
-		else
-			# native build
-			# The script returns ['Implementer', 'Variant', 'Architecture',
-			# 'Primary Part number', 'Revision']
-			detect_vendor = find_program(join_paths(
-					meson.current_source_dir(), 'armv8_machine.py'))
-			cmd = run_command(detect_vendor.path())
-			if cmd.returncode() == 0
-				cmd_output = cmd.stdout().to_lower().strip().split(' ')
-				implementer_id = cmd_output[0]
-				part_number = cmd_output[3]
-			else
-				error('Error when getting Arm Implementer ID and part number.')
-			endif
-		endif
-	else
-		# cross build
-		implementer_id = meson.get_cross_property('implementer_id')
-		part_number = meson.get_cross_property('part_number')
-	endif
+    # aarch64 build
+    if not meson.is_cross_build()
+        if machine == 'default'
+            # default build
+            implementer_id = 'generic'
+            part_number = 'generic'
+        else
+            # native build
+            # The script returns ['Implementer', 'Variant', 'Architecture',
+            # 'Primary Part number', 'Revision']
+            detect_vendor = find_program(join_paths(
+                    meson.current_source_dir(), 'armv8_machine.py'))
+            cmd = run_command(detect_vendor.path())
+            if cmd.returncode() == 0
+                cmd_output = cmd.stdout().to_lower().strip().split(' ')
+                implementer_id = cmd_output[0]
+                part_number = cmd_output[3]
+            else
+                error('Error when getting Arm Implementer ID and part number.')
+            endif
+        endif
+    else
+        # cross build
+        implementer_id = meson.get_cross_property('implementer_id')
+        part_number = meson.get_cross_property('part_number')
+    endif
 
-	if implementers.has_key(implementer_id)
-		implementer_config = implementers[implementer_id]
-	else
-		error('Unsupported Arm implementer: @0@. '.format(implementer_id) +
-		      'Please add support for it or use the generic ' +
-		      '(-Dmachine=generic) build.')
-	endif
+    if implementers.has_key(implementer_id)
+        implementer_config = implementers[implementer_id]
+    else
+        error('Unsupported Arm implementer: @0@. '.format(implementer_id) +
+              'Please add support for it or use the generic ' +
+              '(-Dmachine=generic) build.')
+    endif
 
-	message('Arm implementer: ' + implementer_config['description'])
-	message('Arm part number: ' + part_number)
+    message('Arm implementer: ' + implementer_config['description'])
+    message('Arm part number: ' + part_number)
 
-	part_number_config = implementer_config['part_number_config']
-	if part_number_config.has_key(part_number)
-		# use the specified part_number machine args if found
-		part_number_config = part_number_config[part_number]
-	else
-		# unknown part number
-		error('Unsupported part number @0@ of implementer @1@. '
-		      .format(part_number, implementer_id) +
-		      'Please add support for it or use the generic ' +
-		      '(-Dmachine=generic) build.')
-	endif
+    part_number_config = implementer_config['part_number_config']
+    if part_number_config.has_key(part_number)
+        # use the specified part_number machine args if found
+        part_number_config = part_number_config[part_number]
+    else
+        # unknown part number
+        error('Unsupported part number @0@ of implementer @1@. '
+              .format(part_number, implementer_id) +
+              'Please add support for it or use the generic ' +
+              '(-Dmachine=generic) build.')
+    endif
 
-	# use default flags with implementer flags
-	dpdk_flags = flags_common + implementer_config['flags'] + part_number_config.get('flags', [])
+    # use default flags with implementer flags
+    dpdk_flags = flags_common + implementer_config['flags'] + part_number_config.get('flags', [])
 
-	# apply supported machine args
-	machine_args = [] # Clear previous machine args
-	foreach flag: part_number_config['machine_args']
-		if cc.has_argument(flag)
-			machine_args += flag
-		endif
-	endforeach
+    # apply supported machine args
+    machine_args = [] # Clear previous machine args
+    foreach flag: part_number_config['machine_args']
+        if cc.has_argument(flag)
+            machine_args += flag
+        endif
+    endforeach
 
-	# apply flags
-	foreach flag: dpdk_flags
-		if flag.length() > 0
-			dpdk_conf.set(flag[0], flag[1])
-		endif
-	endforeach
+    # apply flags
+    foreach flag: dpdk_flags
+        if flag.length() > 0
+            dpdk_conf.set(flag[0], flag[1])
+        endif
+    endforeach
 endif
 message('Using machine args: @0@'.format(machine_args))
 
 if (cc.get_define('__ARM_NEON', args: machine_args) != '' or
     cc.get_define('__aarch64__', args: machine_args) != '')
-	compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
+    compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
 endif
 
 if cc.get_define('__ARM_FEATURE_CRC32', args: machine_args) != ''
-	compile_time_cpuflags += ['RTE_CPUFLAG_CRC32']
+    compile_time_cpuflags += ['RTE_CPUFLAG_CRC32']
 endif
 
 if cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != ''
-	compile_time_cpuflags += ['RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',
-	'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2']
+    compile_time_cpuflags += ['RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',
+    'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2']
 endif
diff --git a/config/meson.build b/config/meson.build
index 66a2edcc47..b748e57bde 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -5,13 +5,13 @@
 supported_exec_envs = ['freebsd', 'linux', 'windows']
 exec_env = host_machine.system()
 if not supported_exec_envs.contains(exec_env)
-	error('unsupported system type "@0@"'.format(exec_env))
+    error('unsupported system type "@0@"'.format(exec_env))
 endif
 
 # define a handy variable for checking which OS we have.
 # gives us "is_windows", "is_freebsd" and "is_linux"
 foreach env:supported_exec_envs
-	set_variable('is_' + env, exec_env == env)
+    set_variable('is_' + env, exec_env == env)
 endforeach
 
 # MS linker requires special treatment.
@@ -23,7 +23,7 @@ is_ms_linker = is_windows and (cc.get_id() == 'clang')
 pver = meson.project_version().split('.')
 major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
 abi_version = run_command(find_program('cat', 'more'),
-	abi_version_file).stdout().strip()
+    abi_version_file).stdout().strip()
 
 # Libraries have the abi_version as the filename extension
 # and have the soname be all but the final part of the abi_version.
@@ -35,21 +35,21 @@ so_version = abi_version.split('.')[0]
 dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
 dpdk_conf.set('RTE_VER_MONTH', pver.get(1).to_int())
 if pver.get(2).contains('-rc')
-	rc_ver = pver.get(2).split('-rc')
-	dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0).to_int())
-	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
-	dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1).to_int())
+    rc_ver = pver.get(2).split('-rc')
+    dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0).to_int())
+    dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
+    dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1).to_int())
 else
-	dpdk_conf.set('RTE_VER_MINOR', pver.get(2).to_int())
-	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
+    dpdk_conf.set('RTE_VER_MINOR', pver.get(2).to_int())
+    dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
 # for actual, non-rc releases, set the release value to 99 to ensure releases
 # have higher version numbers than their respective release candidates
-	dpdk_conf.set('RTE_VER_RELEASE', 99)
+    dpdk_conf.set('RTE_VER_RELEASE', 99)
 endif
 
 pmd_subdir_opt = get_option('drivers_install_subdir')
 if pmd_subdir_opt.contains('<VERSION>')
-	pmd_subdir_opt = abi_version.join(pmd_subdir_opt.split('<VERSION>'))
+    pmd_subdir_opt = abi_version.join(pmd_subdir_opt.split('<VERSION>'))
 endif
 driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
 eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
@@ -58,16 +58,16 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
 # to be in the library path, so symlink the drivers from the main lib directory.
 if not is_windows
-	meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
-			get_option('libdir'),
-			pmd_subdir_opt)
+    meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
+            get_option('libdir'),
+            pmd_subdir_opt)
 endif
 
 # set the machine type and cflags for it
 if meson.is_cross_build()
-	machine = host_machine.cpu()
+    machine = host_machine.cpu()
 else
-	machine = get_option('machine')
+    machine = get_option('machine')
 endif
 
 # machine type 'default' is special, it defaults to the per arch agreed common
@@ -77,17 +77,17 @@ endif
 # This can be bumped up by the DPDK project, but it can never be an
 # invariant like 'native'
 if machine == 'default'
-	if host_machine.cpu_family().startswith('x86')
-		# matches the old pre-meson build systems default
-		machine = 'corei7'
-	elif host_machine.cpu_family().startswith('arm')
-		machine = 'armv7-a'
-	elif host_machine.cpu_family().startswith('aarch')
-		# arm64 manages defaults in config/arm/meson.build
-		machine = 'default'
-	elif host_machine.cpu_family().startswith('ppc')
-		machine = 'power8'
-	endif
+    if host_machine.cpu_family().startswith('x86')
+        # matches the old pre-meson build systems default
+        machine = 'corei7'
+    elif host_machine.cpu_family().startswith('arm')
+        machine = 'armv7-a'
+    elif host_machine.cpu_family().startswith('aarch')
+        # arm64 manages defaults in config/arm/meson.build
+        machine = 'default'
+    elif host_machine.cpu_family().startswith('ppc')
+        machine = 'power8'
+    endif
 endif
 
 dpdk_conf.set('RTE_MACHINE', machine)
@@ -95,10 +95,10 @@ machine_args = []
 
 # ppc64 does not support -march= at all, use -mcpu and -mtune for that
 if host_machine.cpu_family().startswith('ppc')
-	machine_args += '-mcpu=' + machine
-	machine_args += '-mtune=' + machine
+    machine_args += '-mcpu=' + machine
+    machine_args += '-mtune=' + machine
 else
-	machine_args += '-march=' + machine
+    machine_args += '-march=' + machine
 endif
 
 toolchain = cc.get_id()
@@ -109,88 +109,88 @@ dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8)
 dpdk_conf.set('RTE_ARCH_32', cc.sizeof('void *') == 4)
 
 if not is_windows
-	add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
+    add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
 endif
 
 # use pthreads if available for the platform
 if not is_windows
-	add_project_link_arguments('-pthread', language: 'c')
-	dpdk_extra_ldflags += '-pthread'
+    add_project_link_arguments('-pthread', language: 'c')
+    dpdk_extra_ldflags += '-pthread'
 endif
 
 # on some OS, maths functions are in a separate library
 if cc.find_library('m', required : false).found()
-	# some libs depend on maths lib
-	add_project_link_arguments('-lm', language: 'c')
-	dpdk_extra_ldflags += '-lm'
+    # some libs depend on maths lib
+    add_project_link_arguments('-lm', language: 'c')
+    dpdk_extra_ldflags += '-lm'
 endif
 
 if is_linux
-	link_lib = 'dl'
+    link_lib = 'dl'
 else
-	link_lib = ''
+    link_lib = ''
 endif
 
 # if link_lib is empty, do not add it to project properties
 if link_lib != ''
-	add_project_link_arguments('-l' + link_lib, language: 'c')
-	dpdk_extra_ldflags += '-l' + link_lib
+    add_project_link_arguments('-l' + link_lib, language: 'c')
+    dpdk_extra_ldflags += '-l' + link_lib
 endif
 
 # check for libraries used in multiple places in DPDK
 has_libnuma = 0
 find_libnuma = true
 if meson.is_cross_build() and not meson.get_cross_property('numa', true)
-	# don't look for libnuma if explicitly disabled in cross build
-	find_libnuma = false
+    # don't look for libnuma if explicitly disabled in cross build
+    find_libnuma = false
 endif
 if find_libnuma
-	numa_dep = cc.find_library('numa', required: false)
-	if numa_dep.found() and cc.has_header('numaif.h')
-		dpdk_conf.set10('RTE_HAS_LIBNUMA', true)
-		has_libnuma = 1
-		add_project_link_arguments('-lnuma', language: 'c')
-		dpdk_extra_ldflags += '-lnuma'
-	endif
+    numa_dep = cc.find_library('numa', required: false)
+    if numa_dep.found() and cc.has_header('numaif.h')
+        dpdk_conf.set10('RTE_HAS_LIBNUMA', true)
+        has_libnuma = 1
+        add_project_link_arguments('-lnuma', language: 'c')
+        dpdk_extra_ldflags += '-lnuma'
+    endif
 endif
 
 has_libfdt = 0
 fdt_dep = cc.find_library('libfdt', required: false)
 if fdt_dep.found() and cc.has_header('fdt.h')
-	dpdk_conf.set10('RTE_HAS_LIBFDT', true)
-	has_libfdt = 1
-	add_project_link_arguments('-lfdt', language: 'c')
-	dpdk_extra_ldflags += '-lfdt'
+    dpdk_conf.set10('RTE_HAS_LIBFDT', true)
+    has_libfdt = 1
+    add_project_link_arguments('-lfdt', language: 'c')
+    dpdk_extra_ldflags += '-lfdt'
 endif
 
 libexecinfo = cc.find_library('libexecinfo', required: false)
 if libexecinfo.found() and cc.has_header('execinfo.h')
-	add_project_link_arguments('-lexecinfo', language: 'c')
-	dpdk_extra_ldflags += '-lexecinfo'
+    add_project_link_arguments('-lexecinfo', language: 'c')
+    dpdk_extra_ldflags += '-lexecinfo'
 endif
 
 # check for libbsd
 libbsd = dependency('libbsd', required: false, method: 'pkg-config')
 if libbsd.found()
-	dpdk_conf.set('RTE_USE_LIBBSD', 1)
+    dpdk_conf.set('RTE_USE_LIBBSD', 1)
 endif
 
 # check for pcap
 pcap_dep = dependency('libpcap', required: false, method: 'pkg-config')
 if not pcap_dep.found()
-	# pcap got a pkg-config file only in 1.9.0
-	pcap_dep = cc.find_library('pcap', required: false)
+    # pcap got a pkg-config file only in 1.9.0
+    pcap_dep = cc.find_library('pcap', required: false)
 endif
 if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)
-	dpdk_conf.set('RTE_PORT_PCAP', 1)
-	dpdk_extra_ldflags += '-lpcap'
+    dpdk_conf.set('RTE_PORT_PCAP', 1)
+    dpdk_extra_ldflags += '-lpcap'
 endif
 
 # for clang 32-bit compiles we need libatomic for 64-bit atomic ops
 if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false
-	atomic_dep = cc.find_library('atomic', required: true)
-	add_project_link_arguments('-latomic', language: 'c')
-	dpdk_extra_ldflags += '-latomic'
+    atomic_dep = cc.find_library('atomic', required: true)
+    add_project_link_arguments('-latomic', language: 'c')
+    dpdk_extra_ldflags += '-latomic'
 endif
 
 # add -include rte_config to cflags
@@ -198,48 +198,48 @@ add_project_arguments('-include', 'rte_config.h', language: 'c')
 
 # enable extra warnings and disable any unwanted warnings
 warning_flags = [
-	# -Wall is added by meson by default, so add -Wextra only
-	'-Wextra',
-
-	# additional warnings in alphabetical order
-	'-Wcast-qual',
-	'-Wdeprecated',
-	'-Wformat',
-	'-Wformat-nonliteral',
-	'-Wformat-security',
-	'-Wmissing-declarations',
-	'-Wmissing-prototypes',
-	'-Wnested-externs',
-	'-Wold-style-definition',
-	'-Wpointer-arith',
-	'-Wsign-compare',
-	'-Wstrict-prototypes',
-	'-Wundef',
-	'-Wwrite-strings',
-
-	# globally disabled warnings
-	'-Wno-address-of-packed-member',
-	'-Wno-packed-not-aligned',
-	'-Wno-missing-field-initializers'
+    # -Wall is added by meson by default, so add -Wextra only
+    '-Wextra',
+
+    # additional warnings in alphabetical order
+    '-Wcast-qual',
+    '-Wdeprecated',
+    '-Wformat',
+    '-Wformat-nonliteral',
+    '-Wformat-security',
+    '-Wmissing-declarations',
+    '-Wmissing-prototypes',
+    '-Wnested-externs',
+    '-Wold-style-definition',
+    '-Wpointer-arith',
+    '-Wsign-compare',
+    '-Wstrict-prototypes',
+    '-Wundef',
+    '-Wwrite-strings',
+
+    # globally disabled warnings
+    '-Wno-address-of-packed-member',
+    '-Wno-packed-not-aligned',
+    '-Wno-missing-field-initializers'
 ]
 if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0')
 # FIXME: Bugzilla 396
-	warning_flags += '-Wno-zero-length-bounds'
+    warning_flags += '-Wno-zero-length-bounds'
 endif
 if not dpdk_conf.get('RTE_ARCH_64')
 # for 32-bit, don't warn about casting a 32-bit pointer to 64-bit int - it's fine!!
-	warning_flags += '-Wno-pointer-to-int-cast'
+    warning_flags += '-Wno-pointer-to-int-cast'
 endif
 if cc.get_id() == 'intel'
-	warning_ids = [181, 188, 2203, 2279, 2557, 3179, 3656]
-	foreach i:warning_ids
-		warning_flags += '-diag-disable=@0@'.format(i)
-	endforeach
+    warning_ids = [181, 188, 2203, 2279, 2557, 3179, 3656]
+    foreach i:warning_ids
+        warning_flags += '-diag-disable=@0@'.format(i)
+    endforeach
 endif
 foreach arg: warning_flags
-	if cc.has_argument(arg)
-		add_project_arguments(arg, language: 'c')
-	endif
+    if cc.has_argument(arg)
+        add_project_arguments(arg, language: 'c')
+    endif
 endforeach
 
 # set other values pulled from the build options
@@ -253,9 +253,9 @@ dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
 dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
 dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
 if dpdk_conf.get('RTE_ARCH_64')
-	dpdk_conf.set('RTE_MAX_MEM_MB', 524288)
+    dpdk_conf.set('RTE_MAX_MEM_MB', 524288)
 else # for 32-bit we need smaller reserved memory areas
-	dpdk_conf.set('RTE_MAX_MEM_MB', 2048)
+    dpdk_conf.set('RTE_MAX_MEM_MB', 2048)
 endif
 
 
@@ -265,24 +265,24 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 
 # apply cross-specific options
 if meson.is_cross_build()
-	# configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
-	cross_max_lcores = meson.get_cross_property('max_lcores', 0)
-	if cross_max_lcores != 0
-		message('Setting RTE_MAX_LCORE from cross file')
-		dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
-	endif
-	cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
-	if cross_max_numa_nodes != 0
-		message('Setting RTE_MAX_NUMA_NODES from cross file')
-		dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
-	endif
+    # configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
+    cross_max_lcores = meson.get_cross_property('max_lcores', 0)
+    if cross_max_lcores != 0
+        message('Setting RTE_MAX_LCORE from cross file')
+        dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
+    endif
+    cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
+    if cross_max_numa_nodes != 0
+        message('Setting RTE_MAX_NUMA_NODES from cross file')
+        dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
+    endif
 endif
 
 # set the install path for the drivers
 dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
 
 install_headers(['rte_config.h'],
-		subdir: get_option('include_subdir_arch'))
+        subdir: get_option('include_subdir_arch'))
 
 # enable VFIO only if it is linux OS
 dpdk_conf.set('RTE_EAL_VFIO', is_linux)
@@ -292,50 +292,50 @@ add_project_arguments('-D_GNU_SOURCE', language: 'c')
 
 # specify -D__BSD_VISIBLE for FreeBSD
 if is_freebsd
-	add_project_arguments('-D__BSD_VISIBLE', language: 'c')
+    add_project_arguments('-D__BSD_VISIBLE', language: 'c')
 endif
 
 if is_windows
-	# VirtualAlloc2() is available since Windows 10 / Server 2016.
-	add_project_arguments('-D_WIN32_WINNT=0x0A00', language: 'c')
+    # VirtualAlloc2() is available since Windows 10 / Server 2016.
+    add_project_arguments('-D_WIN32_WINNT=0x0A00', language: 'c')
 
-	# Use MinGW-w64 stdio, because DPDK assumes ANSI-compliant formatting.
-	if cc.get_id() == 'gcc'
-		add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
-	endif
+    # Use MinGW-w64 stdio, because DPDK assumes ANSI-compliant formatting.
+    if cc.get_id() == 'gcc'
+        add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
+    endif
 
-	# Disable secure CRT deprecated warnings for clang
-	if cc.get_id() == 'clang'
-		add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
-	endif
+    # Disable secure CRT deprecated warnings for clang
+    if cc.get_id() == 'clang'
+        add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
+    endif
 
-	add_project_link_arguments('-lws2_32', language: 'c')
+    add_project_link_arguments('-lws2_32', language: 'c')
 
-	# Contrary to docs, VirtualAlloc2() is exported by mincore.lib
-	# in Windows SDK, while MinGW exports it by advapi32.a.
-	if is_ms_linker
-		add_project_link_arguments('-lmincore', language: 'c')
-	endif
+    # Contrary to docs, VirtualAlloc2() is exported by mincore.lib
+    # in Windows SDK, while MinGW exports it by advapi32.a.
+    if is_ms_linker
+        add_project_link_arguments('-lmincore', language: 'c')
+    endif
 
-	add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
-	add_project_link_arguments('-ldbghelp', language: 'c')
+    add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
+    add_project_link_arguments('-ldbghelp', language: 'c')
 endif
 
 if get_option('b_lto')
-	if cc.has_argument('-ffat-lto-objects')
-		add_project_arguments('-ffat-lto-objects', language: 'c')
-	else
-		error('compiler does not support fat LTO objects - please turn LTO off')
-	endif
-	# workaround for gcc bug 81440
-	if cc.get_id() == 'gcc' and cc.version().version_compare('<8.0')
-		add_project_arguments('-Wno-lto-type-mismatch', language: 'c')
-		add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c')
-	endif
+    if cc.has_argument('-ffat-lto-objects')
+        add_project_arguments('-ffat-lto-objects', language: 'c')
+    else
+        error('compiler does not support fat LTO objects - please turn LTO off')
+    endif
+    # workaround for gcc bug 81440
+    if cc.get_id() == 'gcc' and cc.version().version_compare('<8.0')
+        add_project_arguments('-Wno-lto-type-mismatch', language: 'c')
+        add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c')
+    endif
 endif
 
 if get_option('default_library') == 'both'
-	error( '''
+    error( '''
     Unsupported value "both" for "default_library" option.
 
     NOTE: DPDK always builds both shared and static libraries.  Please set
diff --git a/config/ppc/meson.build b/config/ppc/meson.build
index 0d8da87e6f..1c196b8db5 100644
--- a/config/ppc/meson.build
+++ b/config/ppc/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	error('Only 64-bit compiles are supported for this platform type')
+    error('Only 64-bit compiles are supported for this platform type')
 endif
 dpdk_conf.set('RTE_ARCH', 'ppc_64')
 dpdk_conf.set('RTE_ARCH_PPC_64', 1)
@@ -12,9 +12,9 @@ dpdk_conf.set('RTE_ARCH_PPC_64', 1)
 # is used, resulting in a build failure.
 power9_supported = cc.has_argument('-mcpu=power9')
 if not power9_supported
-	machine = 'power8'
-	machine_args = ['-mcpu=power8', '-mtune=power8']
-	dpdk_conf.set('RTE_MACHINE','power8')
+    machine = 'power8'
+    machine_args = ['-mcpu=power8', '-mtune=power8']
+    dpdk_conf.set('RTE_MACHINE','power8')
 endif
 
 # overrides specific to ppc64
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 31bfa63b1c..34b1164810 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -3,57 +3,57 @@
 
 # get binutils version for the workaround of Bug 97
 if not is_windows
-	binutils_ok = run_command(binutils_avx512_check)
-	if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
-		machine_args += '-mno-avx512f'
-		warning('Binutils error with AVX512 assembly, disabling AVX512 support')
-	endif
+    binutils_ok = run_command(binutils_avx512_check)
+    if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
+        machine_args += '-mno-avx512f'
+        warning('Binutils error with AVX512 assembly, disabling AVX512 support')
+    endif
 endif
 
 # we require SSE4.2 for DPDK
 if cc.get_define('__SSE4_2__', args: machine_args) == ''
-	message('SSE 4.2 not enabled by default, explicitly enabling')
-	machine_args += '-msse4'
+    message('SSE 4.2 not enabled by default, explicitly enabling')
+    machine_args += '-msse4'
 endif
 
 base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2']
 foreach f:base_flags
-	compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
 endforeach
 
 optional_flags = [
-	'AES',
-	'AVX',
-	'AVX2',
-	'AVX512BW',
-	'AVX512CD',
-	'AVX512DQ',
-	'AVX512F',
-	'AVX512VL',
-	'PCLMUL',
-	'RDRND',
-	'RDSEED',
-	'VPCLMULQDQ',
+    'AES',
+    'AVX',
+    'AVX2',
+    'AVX512BW',
+    'AVX512CD',
+    'AVX512DQ',
+    'AVX512F',
+    'AVX512VL',
+    'PCLMUL',
+    'RDRND',
+    'RDSEED',
+    'VPCLMULQDQ',
 ]
 foreach f:optional_flags
-	if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
-		if f == 'PCLMUL' # special case flags with different defines
-			f = 'PCLMULQDQ'
-		elif f == 'RDRND'
-			f = 'RDRAND'
-		endif
-		compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
-	endif
+    if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
+        if f == 'PCLMUL' # special case flags with different defines
+            f = 'PCLMULQDQ'
+        elif f == 'RDRND'
+            f = 'RDRAND'
+        endif
+        compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    endif
 endforeach
 
 
 dpdk_conf.set('RTE_ARCH_X86', 1)
 if dpdk_conf.get('RTE_ARCH_64')
-	dpdk_conf.set('RTE_ARCH_X86_64', 1)
-	dpdk_conf.set('RTE_ARCH', 'x86_64')
+    dpdk_conf.set('RTE_ARCH_X86_64', 1)
+    dpdk_conf.set('RTE_ARCH', 'x86_64')
 else
-	dpdk_conf.set('RTE_ARCH_I686', 1)
-	dpdk_conf.set('RTE_ARCH', 'i686')
+    dpdk_conf.set('RTE_ARCH_I686', 1)
+    dpdk_conf.set('RTE_ARCH', 'i686')
 endif
 
 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index dfdefdc924..2366322311 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -23,12 +23,12 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 # false it would be impossible to install the docs.
 # So use a configure option for now.
 example = custom_target('examples.dox',
-	output: 'examples.dox',
-	command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
-	depfile: 'examples.dox.d',
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+    output: 'examples.dox',
+    command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
+    depfile: 'examples.dox.d',
+    install: get_option('enable_docs'),
+    install_dir: htmldir,
+    build_by_default: get_option('enable_docs'))
 
 cdata = configuration_data()
 cdata.set('VERSION', meson.project_version())
@@ -39,23 +39,23 @@ cdata.set('TOPDIR', meson.source_root())
 cdata.set('STRIP_FROM_PATH', meson.source_root())
 cdata.set('WARN_AS_ERROR', 'NO')
 if get_option('werror')
-	cdata.set('WARN_AS_ERROR', 'YES')
+    cdata.set('WARN_AS_ERROR', 'YES')
 endif
 
 doxy_conf = configure_file(input: 'doxy-api.conf.in',
-	output: 'doxy-api.conf',
-	configuration: cdata)
+    output: 'doxy-api.conf',
+    configuration: cdata)
 
 doxy_build = custom_target('doxygen',
-	depends: example,
-	depend_files: 'doxy-api-index.md',
-	input: doxy_conf,
-	output: 'html',
-	depfile: 'html.d',
-	command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+    depends: example,
+    depend_files: 'doxy-api-index.md',
+    input: doxy_conf,
+    output: 'html',
+    depfile: 'html.d',
+    command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
+    install: get_option('enable_docs'),
+    install_dir: htmldir,
+    build_by_default: get_option('enable_docs'))
 
 doc_targets += doxy_build
 doc_target_names += 'Doxygen_API'
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
index 9c35efb5b2..35956e8d4b 100644
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -4,28 +4,28 @@
 sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
 
 if not sphinx.found()
-	subdir_done()
+    subdir_done()
 endif
 
 extra_sphinx_args = []
 if get_option('werror')
-	extra_sphinx_args += '-W'
+    extra_sphinx_args += '-W'
 endif
 
 htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 html_guides = custom_target('html_guides',
-	input: files('index.rst'),
-	output: 'html',
-	command: [sphinx_wrapper, sphinx, meson.project_version(),
-		meson.current_source_dir(), meson.current_build_dir(),
-		extra_sphinx_args],
-	depfile: '.html.d',
-	build_by_default: get_option('enable_docs'),
-	install: get_option('enable_docs'),
-	install_dir: htmldir)
+    input: files('index.rst'),
+    output: 'html',
+    command: [sphinx_wrapper, sphinx, meson.project_version(),
+        meson.current_source_dir(), meson.current_build_dir(),
+        extra_sphinx_args],
+    depfile: '.html.d',
+    build_by_default: get_option('enable_docs'),
+    install: get_option('enable_docs'),
+    install_dir: htmldir)
 
 install_data(files('custom.css'),
-			install_dir: join_paths(htmldir,'_static', 'css'))
+            install_dir: join_paths(htmldir,'_static', 'css'))
 
 doc_targets += html_guides
 doc_target_names += 'HTML_Guides'
diff --git a/doc/meson.build b/doc/meson.build
index c5410d85d6..959606b965 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -7,9 +7,9 @@ subdir('api')
 subdir('guides')
 
 if doc_targets.length() == 0
-	message = 'No docs targets found'
+    message = 'No docs targets found'
 else
-	message = 'Building docs:'
+    message = 'Building docs:'
 endif
 run_target('doc', command: ['echo', message, doc_target_names],
-	depends: doc_targets)
+    depends: doc_targets)
diff --git a/kernel/freebsd/meson.build b/kernel/freebsd/meson.build
index dc156a43fd..e72d2621e6 100644
--- a/kernel/freebsd/meson.build
+++ b/kernel/freebsd/meson.build
@@ -10,26 +10,26 @@ kmods = ['contigmem', 'nic_uio']
 # files from the individual meson.build files, and then use a custom
 # target to call make, passing in the values as env parameters.
 kmod_cflags = ['-I' + meson.build_root(),
-		'-I' + join_paths(meson.source_root(), 'config'),
-		'-include rte_config.h']
+        '-I' + join_paths(meson.source_root(), 'config'),
+        '-include rte_config.h']
 
 # to avoid warnings due to race conditions with creating the dev_if.h, etc.
 # files, serialize the kernel module builds. Each module will depend on
 # previous ones
 built_kmods = []
 foreach k:kmods
-	subdir(k)
-	built_kmods += custom_target(k,
-		input: [files('BSDmakefile.meson'), sources],
-		output: k + '.ko',
-		command: ['make', '-f', '@INPUT0@',
-			'KMOD_OBJDIR=@OUTDIR@',
-			'KMOD_SRC=@INPUT1@',
-			'KMOD=' + k,
-			'KMOD_CFLAGS=' + ' '.join(kmod_cflags),
-			'CC=clang'],
-		depends: built_kmods, # make each module depend on prev
-		build_by_default: get_option('enable_kmods'),
-		install: get_option('enable_kmods'),
-		install_dir: '/boot/modules/')
+    subdir(k)
+    built_kmods += custom_target(k,
+        input: [files('BSDmakefile.meson'), sources],
+        output: k + '.ko',
+        command: ['make', '-f', '@INPUT0@',
+            'KMOD_OBJDIR=@OUTDIR@',
+            'KMOD_SRC=@INPUT1@',
+            'KMOD=' + k,
+            'KMOD_CFLAGS=' + ' '.join(kmod_cflags),
+            'CC=clang'],
+        depends: built_kmods, # make each module depend on prev
+        build_by_default: get_option('enable_kmods'),
+        install: get_option('enable_kmods'),
+        install_dir: '/boot/modules/')
 endforeach
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index 46b71c7418..15d848b28d 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -2,27 +2,27 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 kni_mkfile = custom_target('rte_kni_makefile',
-	output: 'Makefile',
-	command: ['touch', '@OUTPUT@'])
+    output: 'Makefile',
+    command: ['touch', '@OUTPUT@'])
 
 kni_sources = files(
-	'kni_misc.c',
-	'kni_net.c',
-	'Kbuild')
+    'kni_misc.c',
+    'kni_net.c',
+    'Kbuild')
 
 custom_target('rte_kni',
-	input: kni_sources,
-	output: 'rte_kni.ko',
-	command: ['make', '-j4', '-C', kernel_build_dir,
-		'M=' + meson.current_build_dir(),
-		'src=' + meson.current_source_dir(),
-		'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
-		' -I' + meson.source_root() + '/lib/librte_eal/include' +
-		' -I' + meson.source_root() + '/lib/librte_kni' +
-		' -I' + meson.build_root() +
-		' -I' + meson.current_source_dir(),
-		'modules'] + cross_args,
-	depends: kni_mkfile,
-	install: install,
-	install_dir: kernel_install_dir,
-	build_by_default: get_option('enable_kmods'))
+    input: kni_sources,
+    output: 'rte_kni.ko',
+    command: ['make', '-j4', '-C', kernel_build_dir,
+        'M=' + meson.current_build_dir(),
+        'src=' + meson.current_source_dir(),
+        'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
+        ' -I' + meson.source_root() + '/lib/librte_eal/include' +
+        ' -I' + meson.source_root() + '/lib/librte_kni' +
+        ' -I' + meson.build_root() +
+        ' -I' + meson.current_source_dir(),
+        'modules'] + cross_args,
+    depends: kni_mkfile,
+    install: install,
+    install_dir: kernel_install_dir,
+    build_by_default: get_option('enable_kmods'))
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index b434706796..cac33aef6c 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -9,84 +9,84 @@ install = not meson.is_cross_build()
 cross_args = []
 
 if not meson.is_cross_build()
-	# native build
-	kernel_version = run_command('uname', '-r').stdout().strip()
-	kernel_install_dir = '/lib/modules/' + kernel_version + '/extra/dpdk'
-	if kernel_build_dir == ''
-		# use default path for native builds
-		kernel_build_dir = '/lib/modules/' + kernel_version + '/build'
-	endif
+    # native build
+    kernel_version = run_command('uname', '-r').stdout().strip()
+    kernel_install_dir = '/lib/modules/' + kernel_version + '/extra/dpdk'
+    if kernel_build_dir == ''
+        # use default path for native builds
+        kernel_build_dir = '/lib/modules/' + kernel_version + '/build'
+    endif
 
-	# test running make in kernel directory, using "make kernelversion"
-	make_returncode = run_command('make', '-sC', kernel_build_dir,
-			'kernelversion').returncode()
-	if make_returncode != 0
-		# backward compatibility:
-		# the headers could still be in the 'build' subdir
-		if not kernel_build_dir.endswith('build') and not kernel_build_dir.endswith('build/')
-			kernel_build_dir = join_paths(kernel_build_dir, 'build')
-			make_returncode = run_command('make', '-sC', kernel_build_dir,
-					'kernelversion').returncode()
-		endif
-	endif
+    # test running make in kernel directory, using "make kernelversion"
+    make_returncode = run_command('make', '-sC', kernel_build_dir,
+            'kernelversion').returncode()
+    if make_returncode != 0
+        # backward compatibility:
+        # the headers could still be in the 'build' subdir
+        if not kernel_build_dir.endswith('build') and not kernel_build_dir.endswith('build/')
+            kernel_build_dir = join_paths(kernel_build_dir, 'build')
+            make_returncode = run_command('make', '-sC', kernel_build_dir,
+                    'kernelversion').returncode()
+        endif
+    endif
 
-	if make_returncode != 0
-		error('Cannot compile kernel modules as requested - are kernel headers installed?')
-	endif
+    if make_returncode != 0
+        error('Cannot compile kernel modules as requested - are kernel headers installed?')
+    endif
 
-	# DO ACTUAL MODULE BUILDING
-	foreach d:subdirs
-		subdir(d)
-	endforeach
+    # DO ACTUAL MODULE BUILDING
+    foreach d:subdirs
+        subdir(d)
+    endforeach
 
-	subdir_done()
+    subdir_done()
 endif
 
 # cross build
 # if we are cross-compiling we need kernel_build_dir specified
 if kernel_build_dir == ''
-	error('Need "kernel_dir" option for kmod compilation when cross-compiling')
+    error('Need "kernel_dir" option for kmod compilation when cross-compiling')
 endif
 cross_compiler = find_program('c').path()
 if cross_compiler.endswith('gcc')
-	cross_prefix = run_command([py3, '-c', 'print("' + cross_compiler + '"[:-3])']).stdout().strip()
+    cross_prefix = run_command([py3, '-c', 'print("' + cross_compiler + '"[:-3])']).stdout().strip()
 elif cross_compiler.endswith('clang')
-	cross_prefix = ''
-	found_target = false
-	# search for '-target' and use the arg that follows
-	# (i.e. the value of '-target') as cross_prefix
-	foreach cross_c_arg : meson.get_cross_property('c_args')
-		if found_target and cross_prefix == ''
-			cross_prefix = cross_c_arg
-		endif
-		if cross_c_arg == '-target'
-			found_target = true
-		endif
-	endforeach
-	if cross_prefix == ''
-		error('Didn\'t find -target and its value in' +
-		      ' c_args in input cross-file.')
-	endif
-	linker = 'lld'
-	foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
-		if cross_c_link_arg.startswith('-fuse-ld')
-			linker = cross_c_link_arg.split('=')[1]
-		endif
-	endforeach
-	cross_args += ['CC=@0@'.format(cross_compiler), 'LD=ld.@0@'.format(linker)]
+    cross_prefix = ''
+    found_target = false
+    # search for '-target' and use the arg that follows
+    # (i.e. the value of '-target') as cross_prefix
+    foreach cross_c_arg : meson.get_cross_property('c_args')
+        if found_target and cross_prefix == ''
+            cross_prefix = cross_c_arg
+        endif
+        if cross_c_arg == '-target'
+            found_target = true
+        endif
+    endforeach
+    if cross_prefix == ''
+        error('Didn\'t find -target and its value in' +
+              ' c_args in input cross-file.')
+    endif
+    linker = 'lld'
+    foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
+        if cross_c_link_arg.startswith('-fuse-ld')
+            linker = cross_c_link_arg.split('=')[1]
+        endif
+    endforeach
+    cross_args += ['CC=@0@'.format(cross_compiler), 'LD=ld.@0@'.format(linker)]
 else
-	error('Unsupported cross compiler: @0@'.format(cross_compiler))
+    error('Unsupported cross compiler: @0@'.format(cross_compiler))
 endif
 
 cross_arch = host_machine.cpu_family()
 if host_machine.cpu_family() == 'aarch64'
-	cross_arch = 'arm64'
+    cross_arch = 'arm64'
 endif
 
 cross_args += ['ARCH=@0@'.format(cross_arch),
-	'CROSS_COMPILE=@0@'.format(cross_prefix)]
+    'CROSS_COMPILE=@0@'.format(cross_prefix)]
 
 # DO ACTUAL MODULE BUILDING
 foreach d:subdirs
-	subdir(d)
+    subdir(d)
 endforeach
diff --git a/meson.build b/meson.build
index 7778e18200..30b5a43794 100644
--- a/meson.build
+++ b/meson.build
@@ -2,13 +2,13 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 project('DPDK', 'C',
-	# Get version number from file.
-	# Fallback to "more" for Windows compatibility.
-	version: run_command(find_program('cat', 'more'),
-		files('VERSION')).stdout().strip(),
-	license: 'BSD',
-	default_options: ['buildtype=release', 'default_library=static'],
-	meson_version: '>= 0.47.1'
+    # Get version number from file.
+    # Fallback to "more" for Windows compatibility.
+    version: run_command(find_program('cat', 'more'),
+        files('VERSION')).stdout().strip(),
+    license: 'BSD',
+    default_options: ['buildtype=release', 'default_library=static'],
+    meson_version: '>= 0.47.1'
 )
 
 # set up some global vars for compiler, platform, configuration, etc.
@@ -25,20 +25,20 @@ dpdk_drvs_disabled = []
 abi_version_file = files('ABI_VERSION')
 
 if host_machine.cpu_family().startswith('x86')
-	arch_subdir = 'x86'
+    arch_subdir = 'x86'
 elif host_machine.cpu_family().startswith('arm') or host_machine.cpu_family().startswith('aarch')
-	arch_subdir = 'arm'
+    arch_subdir = 'arm'
 elif host_machine.cpu_family().startswith('ppc')
-	arch_subdir = 'ppc'
+    arch_subdir = 'ppc'
 endif
 
 # configure the build, and make sure configs here and in config folder are
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
 global_inc = include_directories('.', 'config',
-	'lib/librte_eal/include',
-	'lib/librte_eal/@0@/include'.format(host_machine.system()),
-	'lib/librte_eal/@0@/include'.format(arch_subdir),
+    'lib/librte_eal/include',
+    'lib/librte_eal/@0@/include'.format(host_machine.system()),
+    'lib/librte_eal/@0@/include'.format(arch_subdir),
 )
 
 # do configuration and get tool paths
@@ -60,25 +60,25 @@ subdir('doc')
 # install any example code into the appropriate install path
 subdir('examples')
 install_subdir('examples',
-	install_dir: get_option('datadir') + '/dpdk',
-	exclude_files: ex_file_excludes)
+    install_dir: get_option('datadir') + '/dpdk',
+    exclude_files: ex_file_excludes)
 
 # build kernel modules if enabled
 if get_option('enable_kmods')
-	subdir('kernel')
+    subdir('kernel')
 endif
 
 # check header includes if requested
 if get_option('check_includes')
-	subdir('buildtools/chkincs')
+    subdir('buildtools/chkincs')
 endif
 
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
-		configuration: dpdk_conf,
-		install_dir: join_paths(get_option('includedir'),
-				get_option('include_subdir_arch')))
+        configuration: dpdk_conf,
+        install_dir: join_paths(get_option('includedir'),
+                get_option('include_subdir_arch')))
 
 # build pkg-config files for dpdk
 subdir('buildtools/pkg-config')
@@ -89,40 +89,40 @@ output_message = '\n=================\nLibraries Enabled\n=================\n'
 output_message += '\nlibs:\n\t'
 output_count = 0
 foreach lib:enabled_libs
-	output_message += lib + ', '
-	output_count += 1
-	if output_count == 8
-		output_message += '\n\t'
-		output_count = 0
-	endif
+    output_message += lib + ', '
+    output_count += 1
+    if output_count == 8
+        output_message += '\n\t'
+        output_count = 0
+    endif
 endforeach
 message(output_message + '\n')
 
 output_message = '\n===============\nDrivers Enabled\n===============\n'
 foreach class:dpdk_driver_classes
-	class_drivers = get_variable(class + '_drivers')
-	output_message += '\n' + class + ':\n\t'
-	output_count = 0
-	foreach drv:class_drivers
-		output_message += drv + ', '
-		output_count += 1
-		if output_count == 8
-			output_message += '\n\t'
-			output_count = 0
-		endif
-	endforeach
+    class_drivers = get_variable(class + '_drivers')
+    output_message += '\n' + class + ':\n\t'
+    output_count = 0
+    foreach drv:class_drivers
+        output_message += drv + ', '
+        output_count += 1
+        if output_count == 8
+            output_message += '\n\t'
+            output_count = 0
+        endif
+    endforeach
 endforeach
 message(output_message + '\n')
 
 output_message = '\n=================\nContent Skipped\n=================\n'
 output_message += '\nlibs:\n\t'
 foreach lib:dpdk_libs_disabled
-	reason = get_variable(lib.underscorify() + '_disable_reason')
-	output_message += lib + ':\t' + reason + '\n\t'
+    reason = get_variable(lib.underscorify() + '_disable_reason')
+    output_message += lib + ':\t' + reason + '\n\t'
 endforeach
 output_message += '\ndrivers:\n\t'
 foreach drv:dpdk_drvs_disabled
-	reason = get_variable(drv.underscorify() + '_disable_reason')
-	output_message += drv + ':\t' + reason + '\n\t'
+    reason = get_variable(drv.underscorify() + '_disable_reason')
+    output_message += drv + ':\t' + reason + '\n\t'
 endforeach
 message(output_message + '\n')
diff --git a/meson_options.txt b/meson_options.txt
index 3b8c5d316d..f22db9fb7d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,36 +1,36 @@
 # Please keep these options sorted alphabetically.
 
 option('check_includes', type: 'boolean', value: false,
-	description: 'build "chkincs" to verify each header file can compile alone')
+    description: 'build "chkincs" to verify each header file can compile alone')
 option('disable_drivers', type: 'string', value: '',
-	description: 'Comma-separated list of drivers to explicitly disable.')
+    description: 'Comma-separated list of drivers to explicitly disable.')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
-	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
+    description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
 option('enable_docs', type: 'boolean', value: false,
-	description: 'build documentation')
+    description: 'build documentation')
 option('enable_kmods', type: 'boolean', value: false,
-	description: 'build kernel modules')
+    description: 'build kernel modules')
 option('examples', type: 'string', value: '',
-	description: 'Comma-separated list of examples to build by default')
+    description: 'Comma-separated list of examples to build by default')
 option('flexran_sdk', type: 'string', value: '',
-	description: 'Path to FlexRAN SDK optional Libraries for BBDEV device')
+    description: 'Path to FlexRAN SDK optional Libraries for BBDEV device')
 option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared',
-	description: 'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
+    description: 'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
 option('include_subdir_arch', type: 'string', value: '',
-	description: 'subdirectory where to install arch-dependent headers')
+    description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
-	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
+    description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
 option('machine', type: 'string', value: 'native',
-	description: 'set the target machine type')
+    description: 'set the target machine type')
 option('max_ethports', type: 'integer', value: 32,
-	description: 'maximum number of Ethernet devices')
+    description: 'maximum number of Ethernet devices')
 option('max_lcores', type: 'integer', value: 128,
-	description: 'maximum number of cores/threads supported by EAL')
+    description: 'maximum number of cores/threads supported by EAL')
 option('max_numa_nodes', type: 'integer', value: 32,
-	description: 'maximum number of NUMA nodes supported by EAL')
+    description: 'maximum number of NUMA nodes supported by EAL')
 option('enable_trace_fp', type: 'boolean', value: false,
-	description: 'enable fast path trace points.')
+    description: 'enable fast path trace points.')
 option('tests', type: 'boolean', value: true,
-	description: 'build unit tests')
+    description: 'build unit tests')
 option('use_hpet', type: 'boolean', value: false,
-	description: 'use HPET timer in EAL')
+    description: 'use HPET timer in EAL')
diff --git a/usertools/meson.build b/usertools/meson.build
index 596eaefb0e..e52e2457c9 100644
--- a/usertools/meson.build
+++ b/usertools/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017 Intel Corporation
 
 install_data([
-	'dpdk-devbind.py',
-	'dpdk-pmdinfo.py',
-	'dpdk-telemetry.py',
-	'dpdk-hugepages.py'
+    'dpdk-devbind.py',
+    'dpdk-pmdinfo.py',
+    'dpdk-telemetry.py',
+    'dpdk-hugepages.py'
 ],install_dir: 'bin')
-- 
2.27.0

[dpdk-dev] [RFC PATCH 09/14] lib: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_acl/meson.build             | 122 ++++++++--------
 lib/librte_bbdev/meson.build           |   4 +-
 lib/librte_bpf/meson.build             |  22 +--
 lib/librte_cmdline/meson.build         |  44 +++---
 lib/librte_compressdev/meson.build     |  10 +-
 lib/librte_cryptodev/meson.build       |  12 +-
 lib/librte_distributor/meson.build     |   4 +-
 lib/librte_eal/arm/include/meson.build |  54 +++----
 lib/librte_eal/arm/meson.build         |   8 +-
 lib/librte_eal/common/meson.build      | 146 +++++++++----------
 lib/librte_eal/freebsd/meson.build     |  24 ++--
 lib/librte_eal/include/meson.build     | 114 +++++++--------
 lib/librte_eal/linux/meson.build       |  32 ++---
 lib/librte_eal/meson.build             |   8 +-
 lib/librte_eal/ppc/include/meson.build |  30 ++--
 lib/librte_eal/ppc/meson.build         |   8 +-
 lib/librte_eal/unix/meson.build        |   8 +-
 lib/librte_eal/windows/meson.build     |  32 ++---
 lib/librte_eal/x86/include/meson.build |  40 +++---
 lib/librte_eal/x86/meson.build         |  10 +-
 lib/librte_ethdev/meson.build          |  36 ++---
 lib/librte_eventdev/meson.build        |  32 ++---
 lib/librte_fib/meson.build             |  88 ++++++------
 lib/librte_gso/meson.build             |   2 +-
 lib/librte_hash/meson.build            |   8 +-
 lib/librte_ip_frag/meson.build         |  10 +-
 lib/librte_kni/meson.build             |   4 +-
 lib/librte_mbuf/meson.build            |   6 +-
 lib/librte_mempool/meson.build         |  10 +-
 lib/librte_metrics/meson.build         |   4 +-
 lib/librte_net/meson.build             | 186 ++++++++++++-------------
 lib/librte_node/meson.build            |   2 +-
 lib/librte_pipeline/meson.build        |  20 +--
 lib/librte_port/meson.build            |  68 ++++-----
 lib/librte_power/meson.build           |  18 +--
 lib/librte_regexdev/meson.build        |   2 +-
 lib/librte_ring/meson.build            |  24 ++--
 lib/librte_sched/meson.build           |   2 +-
 lib/librte_stack/meson.build           |   8 +-
 lib/librte_table/meson.build           |  56 ++++----
 lib/librte_vhost/meson.build           |  20 +--
 41 files changed, 669 insertions(+), 669 deletions(-)

diff --git a/lib/librte_acl/meson.build b/lib/librte_acl/meson.build
index ee4e229e59..fbb1318230 100644
--- a/lib/librte_acl/meson.build
+++ b/lib/librte_acl/meson.build
@@ -2,82 +2,82 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
-		'rte_acl.c', 'tb_mem.c')
+        'rte_acl.c', 'tb_mem.c')
 headers = files('rte_acl.h', 'rte_acl_osdep.h')
 
 if dpdk_conf.has('RTE_ARCH_X86')
-	sources += files('acl_run_sse.c')
+    sources += files('acl_run_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	#
-	# in former case, just add avx2 C file to files list
-	# in latter case, compile c file to static lib, using correct compiler
-	# flags, and then have the .o file from static lib linked into main lib.
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		sources += files('acl_run_avx2.c')
-		cflags += '-DCC_AVX2_SUPPORT'
-	elif cc.has_argument('-mavx2')
-		avx2_tmplib = static_library('avx2_tmp',
-				'acl_run_avx2.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx2'])
-		objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
-		cflags += '-DCC_AVX2_SUPPORT'
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    #
+    # in former case, just add avx2 C file to files list
+    # in latter case, compile c file to static lib, using correct compiler
+    # flags, and then have the .o file from static lib linked into main lib.
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        sources += files('acl_run_avx2.c')
+        cflags += '-DCC_AVX2_SUPPORT'
+    elif cc.has_argument('-mavx2')
+        avx2_tmplib = static_library('avx2_tmp',
+                'acl_run_avx2.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx2'])
+        objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
+        cflags += '-DCC_AVX2_SUPPORT'
+    endif
 
-	# compile AVX512 version if:
-	# we are building 64-bit binary AND binutils can generate proper code
+    # compile AVX512 version if:
+    # we are building 64-bit binary AND binutils can generate proper code
 
-	if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
+    if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
 
-		# compile AVX512 version if either:
-		# a. we have AVX512 supported in minimum instruction set
-		#    baseline
-		# b. it's not minimum instruction set, but supported by
-		#    compiler
-		#
-		# in former case, just add avx512 C file to files list
-		# in latter case, compile c file to static lib, using correct
-		# compiler flags, and then have the .o file from static lib
-		# linked into main lib.
+        # compile AVX512 version if either:
+        # a. we have AVX512 supported in minimum instruction set
+        #    baseline
+        # b. it's not minimum instruction set, but supported by
+        #    compiler
+        #
+        # in former case, just add avx512 C file to files list
+        # in latter case, compile c file to static lib, using correct
+        # compiler flags, and then have the .o file from static lib
+        # linked into main lib.
 
-		# check if all required flags already enabled (variant a).
-		acl_avx512_flags = ['__AVX512F__', '__AVX512VL__',
-			'__AVX512CD__', '__AVX512BW__']
+        # check if all required flags already enabled (variant a).
+        acl_avx512_flags = ['__AVX512F__', '__AVX512VL__',
+            '__AVX512CD__', '__AVX512BW__']
 
-		acl_avx512_on = true
-		foreach f:acl_avx512_flags
+        acl_avx512_on = true
+        foreach f:acl_avx512_flags
 
-			if cc.get_define(f, args: machine_args) == ''
-				acl_avx512_on = false
-			endif
-		endforeach
+            if cc.get_define(f, args: machine_args) == ''
+                acl_avx512_on = false
+            endif
+        endforeach
 
-		if acl_avx512_on == true
+        if acl_avx512_on == true
 
-			sources += files('acl_run_avx512.c')
-			cflags += '-DCC_AVX512_SUPPORT'
+            sources += files('acl_run_avx512.c')
+            cflags += '-DCC_AVX512_SUPPORT'
 
-		elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
-					'-mavx512cd', '-mavx512bw')
+        elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
+                    '-mavx512cd', '-mavx512bw')
 
-			avx512_tmplib = static_library('avx512_tmp',
-				'acl_run_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags +
-					['-mavx512f', '-mavx512vl',
-					 '-mavx512cd', '-mavx512bw'])
-			objs += avx512_tmplib.extract_objects(
-					'acl_run_avx512.c')
-			cflags += '-DCC_AVX512_SUPPORT'
-		endif
-	endif
+            avx512_tmplib = static_library('avx512_tmp',
+                'acl_run_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags +
+                    ['-mavx512f', '-mavx512vl',
+                     '-mavx512cd', '-mavx512bw'])
+            objs += avx512_tmplib.extract_objects(
+                    'acl_run_avx512.c')
+            cflags += '-DCC_AVX512_SUPPORT'
+        endif
+    endif
 
 elif dpdk_conf.has('RTE_ARCH_ARM')
-	cflags += '-flax-vector-conversions'
-	sources += files('acl_run_neon.c')
+    cflags += '-flax-vector-conversions'
+    sources += files('acl_run_neon.c')
 elif dpdk_conf.has('RTE_ARCH_PPC_64')
-	sources += files('acl_run_altivec.c')
+    sources += files('acl_run_altivec.c')
 endif
diff --git a/lib/librte_bbdev/meson.build b/lib/librte_bbdev/meson.build
index 1267782203..2969cab26b 100644
--- a/lib/librte_bbdev/meson.build
+++ b/lib/librte_bbdev/meson.build
@@ -3,6 +3,6 @@
 
 sources = files('rte_bbdev.c')
 headers = files('rte_bbdev.h',
-		'rte_bbdev_pmd.h',
-		'rte_bbdev_op.h')
+        'rte_bbdev_pmd.h',
+        'rte_bbdev_op.h')
 deps += ['mbuf']
diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build
index 614277effd..63cbd60185 100644
--- a/lib/librte_bpf/meson.build
+++ b/lib/librte_bpf/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('bpf.c',
-		'bpf_exec.c',
-		'bpf_load.c',
-		'bpf_pkt.c',
-		'bpf_validate.c')
+        'bpf_exec.c',
+        'bpf_load.c',
+        'bpf_pkt.c',
+        'bpf_validate.c')
 
 if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('bpf_jit_x86.c')
+    sources += files('bpf_jit_x86.c')
 elif dpdk_conf.has('RTE_ARCH_ARM64')
-	sources += files('bpf_jit_arm64.c')
+    sources += files('bpf_jit_arm64.c')
 endif
 
 headers = files('bpf_def.h',
-		'rte_bpf.h',
-		'rte_bpf_ethdev.h')
+        'rte_bpf.h',
+        'rte_bpf_ethdev.h')
 
 deps += ['mbuf', 'net', 'ethdev']
 
 dep = dependency('libelf', required: false, method: 'pkg-config')
 if dep.found()
-	dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1)
-	sources += files('bpf_load_elf.c')
-	ext_deps += dep
+    dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1)
+    sources += files('bpf_load_elf.c')
+    ext_deps += dep
 endif
diff --git a/lib/librte_cmdline/meson.build b/lib/librte_cmdline/meson.build
index 5009b33542..63fb69100d 100644
--- a/lib/librte_cmdline/meson.build
+++ b/lib/librte_cmdline/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('cmdline.c',
-	'cmdline_cirbuf.c',
-	'cmdline_parse.c',
-	'cmdline_parse_etheraddr.c',
-	'cmdline_parse_ipaddr.c',
-	'cmdline_parse_num.c',
-	'cmdline_parse_portlist.c',
-	'cmdline_parse_string.c',
-	'cmdline_rdline.c',
-	'cmdline_socket.c',
-	'cmdline_vt100.c')
+    'cmdline_cirbuf.c',
+    'cmdline_parse.c',
+    'cmdline_parse_etheraddr.c',
+    'cmdline_parse_ipaddr.c',
+    'cmdline_parse_num.c',
+    'cmdline_parse_portlist.c',
+    'cmdline_parse_string.c',
+    'cmdline_rdline.c',
+    'cmdline_socket.c',
+    'cmdline_vt100.c')
 
 headers = files('cmdline.h',
-	'cmdline_parse.h',
-	'cmdline_parse_num.h',
-	'cmdline_parse_ipaddr.h',
-	'cmdline_parse_etheraddr.h',
-	'cmdline_parse_string.h',
-	'cmdline_rdline.h',
-	'cmdline_vt100.h',
-	'cmdline_socket.h',
-	'cmdline_cirbuf.h',
-	'cmdline_parse_portlist.h')
+    'cmdline_parse.h',
+    'cmdline_parse_num.h',
+    'cmdline_parse_ipaddr.h',
+    'cmdline_parse_etheraddr.h',
+    'cmdline_parse_string.h',
+    'cmdline_rdline.h',
+    'cmdline_vt100.h',
+    'cmdline_socket.h',
+    'cmdline_cirbuf.h',
+    'cmdline_parse_portlist.h')
 
 if is_windows
-	sources += files('cmdline_os_windows.c')
+    sources += files('cmdline_os_windows.c')
 else
-	sources += files('cmdline_os_unix.c')
+    sources += files('cmdline_os_unix.c')
 endif
 
 deps += ['net']
diff --git a/lib/librte_compressdev/meson.build b/lib/librte_compressdev/meson.build
index 7d95cd4f30..663ceec0b9 100644
--- a/lib/librte_compressdev/meson.build
+++ b/lib/librte_compressdev/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('rte_compressdev.c',
-	'rte_compressdev_pmd.c',
-	'rte_comp.c')
+    'rte_compressdev_pmd.c',
+    'rte_comp.c')
 headers = files('rte_compressdev.h',
-	'rte_compressdev_pmd.h',
-	'rte_compressdev_internal.h',
-	'rte_comp.h')
+    'rte_compressdev_pmd.h',
+    'rte_compressdev_internal.h',
+    'rte_comp.h')
 deps += ['kvargs', 'mbuf']
diff --git a/lib/librte_cryptodev/meson.build b/lib/librte_cryptodev/meson.build
index 8c5493f4cf..b206039cb6 100644
--- a/lib/librte_cryptodev/meson.build
+++ b/lib/librte_cryptodev/meson.build
@@ -3,10 +3,10 @@
 
 sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c', 'cryptodev_trace_points.c')
 headers = files('rte_cryptodev.h',
-	'rte_cryptodev_pmd.h',
-	'rte_cryptodev_trace.h',
-	'rte_cryptodev_trace_fp.h',
-	'rte_crypto.h',
-	'rte_crypto_sym.h',
-	'rte_crypto_asym.h')
+    'rte_cryptodev_pmd.h',
+    'rte_cryptodev_trace.h',
+    'rte_cryptodev_trace_fp.h',
+    'rte_crypto.h',
+    'rte_crypto_sym.h',
+    'rte_crypto_asym.h')
 deps += ['kvargs', 'mbuf', 'rcu']
diff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build
index bd12ddb2f1..cefe1b9f19 100644
--- a/lib/librte_distributor/meson.build
+++ b/lib/librte_distributor/meson.build
@@ -3,9 +3,9 @@
 
 sources = files('rte_distributor.c', 'rte_distributor_single.c')
 if arch_subdir == 'x86'
-	sources += files('rte_distributor_match_sse.c')
+    sources += files('rte_distributor_match_sse.c')
 else
-	sources += files('rte_distributor_match_generic.c')
+    sources += files('rte_distributor_match_generic.c')
 endif
 headers = files('rte_distributor.h')
 deps += ['mbuf']
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 770766de1a..9f498ced2e 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -2,32 +2,32 @@
 # Copyright(c) 2017 Intel Corporation.
 
 arch_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags_32.h',
-	'rte_cpuflags_64.h',
-	'rte_cpuflags.h',
-	'rte_cycles_32.h',
-	'rte_cycles_64.h',
-	'rte_cycles.h',
-	'rte_io_64.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy_32.h',
-	'rte_memcpy_64.h',
-	'rte_memcpy.h',
-	'rte_pause_32.h',
-	'rte_pause_64.h',
-	'rte_pause.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch_32.h',
-	'rte_prefetch_64.h',
-	'rte_prefetch.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+    'rte_atomic_32.h',
+    'rte_atomic_64.h',
+    'rte_atomic.h',
+    'rte_byteorder.h',
+    'rte_cpuflags_32.h',
+    'rte_cpuflags_64.h',
+    'rte_cpuflags.h',
+    'rte_cycles_32.h',
+    'rte_cycles_64.h',
+    'rte_cycles.h',
+    'rte_io_64.h',
+    'rte_io.h',
+    'rte_mcslock.h',
+    'rte_memcpy_32.h',
+    'rte_memcpy_64.h',
+    'rte_memcpy.h',
+    'rte_pause_32.h',
+    'rte_pause_64.h',
+    'rte_pause.h',
+    'rte_power_intrinsics.h',
+    'rte_prefetch_32.h',
+    'rte_prefetch_64.h',
+    'rte_prefetch.h',
+    'rte_rwlock.h',
+    'rte_spinlock.h',
+    'rte_ticketlock.h',
+    'rte_vect.h',
 )
 install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/arm/meson.build b/lib/librte_eal/arm/meson.build
index 6ec53ea03a..990ac508fb 100644
--- a/lib/librte_eal/arm/meson.build
+++ b/lib/librte_eal/arm/meson.build
@@ -4,8 +4,8 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_power_intrinsics.c',
+    'rte_cpuflags.c',
+    'rte_cycles.c',
+    'rte_hypervisor.c',
+    'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 70bd854fec..84767cfe3c 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -6,83 +6,83 @@ includes += include_directories('.')
 cflags += [ '-DABI_VERSION="@0@"'.format(abi_version) ]
 
 if is_windows
-	sources += files(
-		'eal_common_bus.c',
-		'eal_common_class.c',
-		'eal_common_config.c',
-		'eal_common_debug.c',
-		'eal_common_dev.c',
-		'eal_common_devargs.c',
-		'eal_common_dynmem.c',
-		'eal_common_errno.c',
-		'eal_common_fbarray.c',
-		'eal_common_hexdump.c',
-		'eal_common_launch.c',
-		'eal_common_lcore.c',
-		'eal_common_log.c',
-		'eal_common_mcfg.c',
-		'eal_common_memalloc.c',
-		'eal_common_memory.c',
-		'eal_common_memzone.c',
-		'eal_common_options.c',
-		'eal_common_string_fns.c',
-		'eal_common_tailqs.c',
-		'eal_common_thread.c',
-		'eal_common_trace_points.c',
-		'malloc_elem.c',
-		'malloc_heap.c',
-		'rte_malloc.c',
-		'eal_common_timer.c',
-		'rte_random.c',
-		'rte_reciprocal.c',
-		'rte_service.c',
-		'rte_version.c',
-	)
-	subdir_done()
+    sources += files(
+        'eal_common_bus.c',
+        'eal_common_class.c',
+        'eal_common_config.c',
+        'eal_common_debug.c',
+        'eal_common_dev.c',
+        'eal_common_devargs.c',
+        'eal_common_dynmem.c',
+        'eal_common_errno.c',
+        'eal_common_fbarray.c',
+        'eal_common_hexdump.c',
+        'eal_common_launch.c',
+        'eal_common_lcore.c',
+        'eal_common_log.c',
+        'eal_common_mcfg.c',
+        'eal_common_memalloc.c',
+        'eal_common_memory.c',
+        'eal_common_memzone.c',
+        'eal_common_options.c',
+        'eal_common_string_fns.c',
+        'eal_common_tailqs.c',
+        'eal_common_thread.c',
+        'eal_common_trace_points.c',
+        'malloc_elem.c',
+        'malloc_heap.c',
+        'rte_malloc.c',
+        'eal_common_timer.c',
+        'rte_random.c',
+        'rte_reciprocal.c',
+        'rte_service.c',
+        'rte_version.c',
+    )
+    subdir_done()
 endif
 
 sources += files(
-	'eal_common_bus.c',
-	'eal_common_cpuflags.c',
-	'eal_common_class.c',
-	'eal_common_config.c',
-	'eal_common_debug.c',
-	'eal_common_devargs.c',
-	'eal_common_dev.c',
-	'eal_common_errno.c',
-	'eal_common_fbarray.c',
-	'eal_common_hexdump.c',
-	'eal_common_hypervisor.c',
-	'eal_common_launch.c',
-	'eal_common_lcore.c',
-	'eal_common_log.c',
-	'eal_common_mcfg.c',
-	'eal_common_memalloc.c',
-	'eal_common_memory.c',
-	'eal_common_memzone.c',
-	'eal_common_options.c',
-	'eal_common_proc.c',
-	'eal_common_string_fns.c',
-	'eal_common_tailqs.c',
-	'eal_common_thread.c',
-	'eal_common_timer.c',
-	'eal_common_trace.c',
-	'eal_common_trace_ctf.c',
-	'eal_common_trace_points.c',
-	'eal_common_trace_utils.c',
-	'eal_common_uuid.c',
-	'hotplug_mp.c',
-	'malloc_elem.c',
-	'malloc_heap.c',
-	'malloc_mp.c',
-	'rte_keepalive.c',
-	'rte_malloc.c',
-	'rte_random.c',
-	'rte_reciprocal.c',
-	'rte_service.c',
-	'rte_version.c',
+    'eal_common_bus.c',
+    'eal_common_cpuflags.c',
+    'eal_common_class.c',
+    'eal_common_config.c',
+    'eal_common_debug.c',
+    'eal_common_devargs.c',
+    'eal_common_dev.c',
+    'eal_common_errno.c',
+    'eal_common_fbarray.c',
+    'eal_common_hexdump.c',
+    'eal_common_hypervisor.c',
+    'eal_common_launch.c',
+    'eal_common_lcore.c',
+    'eal_common_log.c',
+    'eal_common_mcfg.c',
+    'eal_common_memalloc.c',
+    'eal_common_memory.c',
+    'eal_common_memzone.c',
+    'eal_common_options.c',
+    'eal_common_proc.c',
+    'eal_common_string_fns.c',
+    'eal_common_tailqs.c',
+    'eal_common_thread.c',
+    'eal_common_timer.c',
+    'eal_common_trace.c',
+    'eal_common_trace_ctf.c',
+    'eal_common_trace_points.c',
+    'eal_common_trace_utils.c',
+    'eal_common_uuid.c',
+    'hotplug_mp.c',
+    'malloc_elem.c',
+    'malloc_heap.c',
+    'malloc_mp.c',
+    'rte_keepalive.c',
+    'rte_malloc.c',
+    'rte_random.c',
+    'rte_reciprocal.c',
+    'rte_service.c',
+    'rte_version.c',
 )
 
 if is_linux
-	sources += files('eal_common_dynmem.c')
+    sources += files('eal_common_dynmem.c')
 endif
diff --git a/lib/librte_eal/freebsd/meson.build b/lib/librte_eal/freebsd/meson.build
index e10fd8a16d..0c1b69fa88 100644
--- a/lib/librte_eal/freebsd/meson.build
+++ b/lib/librte_eal/freebsd/meson.build
@@ -4,18 +4,18 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_cpuflags.c',
-	'eal_debug.c',
-	'eal_dev.c',
-	'eal_hugepage_info.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_thread.c',
-	'eal_timer.c',
+    'eal.c',
+    'eal_alarm.c',
+    'eal_cpuflags.c',
+    'eal_debug.c',
+    'eal_dev.c',
+    'eal_hugepage_info.c',
+    'eal_interrupts.c',
+    'eal_lcore.c',
+    'eal_memalloc.c',
+    'eal_memory.c',
+    'eal_thread.c',
+    'eal_timer.c',
 )
 
 deps += ['kvargs', 'telemetry']
diff --git a/lib/librte_eal/include/meson.build b/lib/librte_eal/include/meson.build
index 3969cf4ac7..1f8f096113 100644
--- a/lib/librte_eal/include/meson.build
+++ b/lib/librte_eal/include/meson.build
@@ -4,67 +4,67 @@
 includes += include_directories('.')
 
 headers += files(
-	'rte_alarm.h',
-	'rte_bitmap.h',
-	'rte_bitops.h',
-	'rte_branch_prediction.h',
-	'rte_bus.h',
-	'rte_class.h',
-	'rte_common.h',
-	'rte_compat.h',
-	'rte_debug.h',
-	'rte_dev.h',
-	'rte_devargs.h',
-	'rte_eal.h',
-	'rte_eal_memconfig.h',
-	'rte_eal_trace.h',
-	'rte_errno.h',
-	'rte_fbarray.h',
-	'rte_hexdump.h',
-	'rte_hypervisor.h',
-	'rte_interrupts.h',
-	'rte_keepalive.h',
-	'rte_launch.h',
-	'rte_lcore.h',
-	'rte_log.h',
-	'rte_malloc.h',
-	'rte_memory.h',
-	'rte_memzone.h',
-	'rte_pci_dev_feature_defs.h',
-	'rte_pci_dev_features.h',
-	'rte_per_lcore.h',
-	'rte_random.h',
-	'rte_reciprocal.h',
-	'rte_service.h',
-	'rte_service_component.h',
-	'rte_string_fns.h',
-	'rte_tailq.h',
-	'rte_thread.h',
-	'rte_time.h',
-	'rte_trace.h',
-	'rte_trace_point.h',
-	'rte_trace_point_register.h',
-	'rte_uuid.h',
-	'rte_version.h',
-	'rte_vfio.h',
+    'rte_alarm.h',
+    'rte_bitmap.h',
+    'rte_bitops.h',
+    'rte_branch_prediction.h',
+    'rte_bus.h',
+    'rte_class.h',
+    'rte_common.h',
+    'rte_compat.h',
+    'rte_debug.h',
+    'rte_dev.h',
+    'rte_devargs.h',
+    'rte_eal.h',
+    'rte_eal_memconfig.h',
+    'rte_eal_trace.h',
+    'rte_errno.h',
+    'rte_fbarray.h',
+    'rte_hexdump.h',
+    'rte_hypervisor.h',
+    'rte_interrupts.h',
+    'rte_keepalive.h',
+    'rte_launch.h',
+    'rte_lcore.h',
+    'rte_log.h',
+    'rte_malloc.h',
+    'rte_memory.h',
+    'rte_memzone.h',
+    'rte_pci_dev_feature_defs.h',
+    'rte_pci_dev_features.h',
+    'rte_per_lcore.h',
+    'rte_random.h',
+    'rte_reciprocal.h',
+    'rte_service.h',
+    'rte_service_component.h',
+    'rte_string_fns.h',
+    'rte_tailq.h',
+    'rte_thread.h',
+    'rte_time.h',
+    'rte_trace.h',
+    'rte_trace_point.h',
+    'rte_trace_point_register.h',
+    'rte_uuid.h',
+    'rte_version.h',
+    'rte_vfio.h',
 )
 indirect_headers += files('rte_eal_interrupts.h')
 
 # special case install the generic headers, since they go in a subdir
 generic_headers = files(
-	'generic/rte_atomic.h',
-	'generic/rte_byteorder.h',
-	'generic/rte_cpuflags.h',
-	'generic/rte_cycles.h',
-	'generic/rte_io.h',
-	'generic/rte_mcslock.h',
-	'generic/rte_memcpy.h',
-	'generic/rte_pause.h',
-	'generic/rte_power_intrinsics.h',
-	'generic/rte_prefetch.h',
-	'generic/rte_rwlock.h',
-	'generic/rte_spinlock.h',
-	'generic/rte_ticketlock.h',
-	'generic/rte_vect.h',
+    'generic/rte_atomic.h',
+    'generic/rte_byteorder.h',
+    'generic/rte_cpuflags.h',
+    'generic/rte_cycles.h',
+    'generic/rte_io.h',
+    'generic/rte_mcslock.h',
+    'generic/rte_memcpy.h',
+    'generic/rte_pause.h',
+    'generic/rte_power_intrinsics.h',
+    'generic/rte_prefetch.h',
+    'generic/rte_rwlock.h',
+    'generic/rte_spinlock.h',
+    'generic/rte_ticketlock.h',
+    'generic/rte_vect.h',
 )
 install_headers(generic_headers, subdir: 'generic')
diff --git a/lib/librte_eal/linux/meson.build b/lib/librte_eal/linux/meson.build
index 7742aa4759..d741a4ac71 100644
--- a/lib/librte_eal/linux/meson.build
+++ b/lib/librte_eal/linux/meson.build
@@ -4,24 +4,24 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_cpuflags.c',
-	'eal_debug.c',
-	'eal_dev.c',
-	'eal_hugepage_info.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_log.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_thread.c',
-	'eal_timer.c',
-	'eal_vfio.c',
-	'eal_vfio_mp_sync.c',
+    'eal.c',
+    'eal_alarm.c',
+    'eal_cpuflags.c',
+    'eal_debug.c',
+    'eal_dev.c',
+    'eal_hugepage_info.c',
+    'eal_interrupts.c',
+    'eal_lcore.c',
+    'eal_log.c',
+    'eal_memalloc.c',
+    'eal_memory.c',
+    'eal_thread.c',
+    'eal_timer.c',
+    'eal_vfio.c',
+    'eal_vfio_mp_sync.c',
 )
 
 deps += ['kvargs', 'telemetry']
 if has_libnuma == 1
-	dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
+    dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
 endif
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 7d6222e781..1722924f67 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -7,7 +7,7 @@ subdir('include')
 subdir('common')
 
 if not is_windows
-	subdir('unix')
+    subdir('unix')
 endif
 
 dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
@@ -17,11 +17,11 @@ subdir(arch_subdir)
 
 deps += ['kvargs']
 if not is_windows
-	deps += ['telemetry']
+    deps += ['telemetry']
 endif
 if dpdk_conf.has('RTE_USE_LIBBSD')
-	ext_deps += libbsd
+    ext_deps += libbsd
 endif
 if cc.has_function('getentropy', prefix : '#include <unistd.h>')
-	cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
+    cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
 endif
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index dae40ede54..08925ec295 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -2,20 +2,20 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 arch_headers = files(
-	'rte_altivec.h',
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags.h',
-	'rte_cycles.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy.h',
-	'rte_pause.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+    'rte_altivec.h',
+    'rte_atomic.h',
+    'rte_byteorder.h',
+    'rte_cpuflags.h',
+    'rte_cycles.h',
+    'rte_io.h',
+    'rte_mcslock.h',
+    'rte_memcpy.h',
+    'rte_pause.h',
+    'rte_power_intrinsics.h',
+    'rte_prefetch.h',
+    'rte_rwlock.h',
+    'rte_spinlock.h',
+    'rte_ticketlock.h',
+    'rte_vect.h',
 )
 install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/ppc/meson.build b/lib/librte_eal/ppc/meson.build
index 43c46542fb..58bb8dd5b5 100644
--- a/lib/librte_eal/ppc/meson.build
+++ b/lib/librte_eal/ppc/meson.build
@@ -4,8 +4,8 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_power_intrinsics.c',
+    'rte_cpuflags.c',
+    'rte_cycles.c',
+    'rte_hypervisor.c',
+    'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_eal/unix/meson.build b/lib/librte_eal/unix/meson.build
index 71221b84a4..55a0fa27be 100644
--- a/lib/librte_eal/unix/meson.build
+++ b/lib/librte_eal/unix/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2020 Dmitry Kozlyuk
 
 sources += files(
-	'eal_file.c',
-	'eal_unix_memory.c',
-	'eal_unix_timer.c',
-	'rte_thread.c',
+    'eal_file.c',
+    'eal_unix_memory.c',
+    'eal_unix_timer.c',
+    'rte_thread.c',
 )
diff --git a/lib/librte_eal/windows/meson.build b/lib/librte_eal/windows/meson.build
index 42ff5c2d59..da490c698b 100644
--- a/lib/librte_eal/windows/meson.build
+++ b/lib/librte_eal/windows/meson.build
@@ -4,22 +4,22 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_debug.c',
-	'eal_file.c',
-	'eal_hugepages.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_log.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_mp.c',
-	'eal_thread.c',
-	'eal_timer.c',
-	'fnmatch.c',
-	'getopt.c',
-	'rte_thread.c',
+    'eal.c',
+    'eal_alarm.c',
+    'eal_debug.c',
+    'eal_file.c',
+    'eal_hugepages.c',
+    'eal_interrupts.c',
+    'eal_lcore.c',
+    'eal_log.c',
+    'eal_memalloc.c',
+    'eal_memory.c',
+    'eal_mp.c',
+    'eal_thread.c',
+    'eal_timer.c',
+    'fnmatch.c',
+    'getopt.c',
+    'rte_thread.c',
 )
 
 dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index 1a6ad0b173..832a512020 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -2,28 +2,28 @@
 # Copyright(c) 2017 Intel Corporation
 
 arch_headers = files(
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags.h',
-	'rte_cycles.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy.h',
-	'rte_pause.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch.h',
-	'rte_rtm.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+    'rte_atomic.h',
+    'rte_byteorder.h',
+    'rte_cpuflags.h',
+    'rte_cycles.h',
+    'rte_io.h',
+    'rte_mcslock.h',
+    'rte_memcpy.h',
+    'rte_pause.h',
+    'rte_power_intrinsics.h',
+    'rte_prefetch.h',
+    'rte_rtm.h',
+    'rte_rwlock.h',
+    'rte_spinlock.h',
+    'rte_ticketlock.h',
+    'rte_vect.h',
 )
 arch_indirect_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
-	'rte_byteorder_32.h',
-	'rte_byteorder_64.h',
+    'rte_atomic_32.h',
+    'rte_atomic_64.h',
+    'rte_byteorder_32.h',
+    'rte_byteorder_64.h',
 )
 install_headers(arch_headers + arch_indirect_headers,
-		subdir: get_option('include_subdir_arch'))
+        subdir: get_option('include_subdir_arch'))
 dpdk_chkinc_headers += arch_headers
diff --git a/lib/librte_eal/x86/meson.build b/lib/librte_eal/x86/meson.build
index dfd42dee0c..6cf438a9dc 100644
--- a/lib/librte_eal/x86/meson.build
+++ b/lib/librte_eal/x86/meson.build
@@ -4,9 +4,9 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_spinlock.c',
-	'rte_power_intrinsics.c',
+    'rte_cpuflags.c',
+    'rte_cycles.c',
+    'rte_hypervisor.c',
+    'rte_spinlock.c',
+    'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build
index c37b2e3772..9d906b2d98 100644
--- a/lib/librte_ethdev/meson.build
+++ b/lib/librte_ethdev/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('ethdev_private.c',
-	'ethdev_profile.c',
-	'ethdev_trace_points.c',
-	'rte_class_eth.c',
-	'rte_ethdev.c',
-	'rte_flow.c',
-	'rte_mtr.c',
-	'rte_tm.c')
+    'ethdev_profile.c',
+    'ethdev_trace_points.c',
+    'rte_class_eth.c',
+    'rte_ethdev.c',
+    'rte_flow.c',
+    'rte_mtr.c',
+    'rte_tm.c')
 
 headers = files('rte_ethdev.h',
-	'rte_ethdev_trace.h',
-	'rte_ethdev_trace_fp.h',
-	'rte_dev_info.h',
-	'rte_flow.h',
-	'rte_flow_driver.h',
-	'rte_mtr.h',
-	'rte_mtr_driver.h',
-	'rte_tm.h',
-	'rte_tm_driver.h')
+    'rte_ethdev_trace.h',
+    'rte_ethdev_trace_fp.h',
+    'rte_dev_info.h',
+    'rte_flow.h',
+    'rte_flow_driver.h',
+    'rte_mtr.h',
+    'rte_mtr_driver.h',
+    'rte_tm.h',
+    'rte_tm_driver.h')
 indirect_headers += files(
-	'rte_ethdev_core.h',
-	'rte_eth_ctrl.h')
+    'rte_ethdev_core.h',
+    'rte_eth_ctrl.h')
 
 deps += ['net', 'kvargs', 'meter', 'telemetry']
diff --git a/lib/librte_eventdev/meson.build b/lib/librte_eventdev/meson.build
index 79d36d37bb..3b6859e60f 100644
--- a/lib/librte_eventdev/meson.build
+++ b/lib/librte_eventdev/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_linux
-	cflags += '-DLINUX'
+    cflags += '-DLINUX'
 else
-	cflags += '-DBSD'
+    cflags += '-DBSD'
 endif
 
 sources = files('rte_eventdev.c',
-		'rte_event_ring.c',
-		'eventdev_trace_points.c',
-		'rte_event_eth_rx_adapter.c',
-		'rte_event_timer_adapter.c',
-		'rte_event_crypto_adapter.c',
-		'rte_event_eth_tx_adapter.c')
+        'rte_event_ring.c',
+        'eventdev_trace_points.c',
+        'rte_event_eth_rx_adapter.c',
+        'rte_event_timer_adapter.c',
+        'rte_event_crypto_adapter.c',
+        'rte_event_eth_tx_adapter.c')
 headers = files('rte_eventdev.h',
-		'rte_eventdev_trace.h',
-		'rte_eventdev_trace_fp.h',
-		'rte_event_ring.h',
-		'rte_event_eth_rx_adapter.h',
-		'rte_event_timer_adapter.h',
-		'rte_event_timer_adapter_pmd.h',
-		'rte_event_crypto_adapter.h',
-		'rte_event_eth_tx_adapter.h')
+        'rte_eventdev_trace.h',
+        'rte_eventdev_trace_fp.h',
+        'rte_event_ring.h',
+        'rte_event_eth_rx_adapter.h',
+        'rte_event_timer_adapter.h',
+        'rte_event_timer_adapter_pmd.h',
+        'rte_event_crypto_adapter.h',
+        'rte_event_eth_tx_adapter.h')
 deps += ['ring', 'ethdev', 'hash', 'mempool', 'mbuf', 'timer', 'cryptodev']
 deps += ['telemetry']
diff --git a/lib/librte_fib/meson.build b/lib/librte_fib/meson.build
index 18eadcc56c..5618c215a7 100644
--- a/lib/librte_fib/meson.build
+++ b/lib/librte_fib/meson.build
@@ -9,50 +9,50 @@ deps += ['rib']
 # compile AVX512 version if:
 # we are building 64-bit binary AND binutils can generate proper code
 if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
-	# compile AVX512 version if either:
-	# a. we have AVX512F supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	#
-	# in former case, just add avx512 C file to files list
-	# in latter case, compile c file to static lib, using correct
-	# compiler flags, and then have the .o file from static lib
-	# linked into main lib.
+    # compile AVX512 version if either:
+    # a. we have AVX512F supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    #
+    # in former case, just add avx512 C file to files list
+    # in latter case, compile c file to static lib, using correct
+    # compiler flags, and then have the .o file from static lib
+    # linked into main lib.
 
-	# check if all required flags already enabled (variant a).
-	acl_avx512_flags = ['__AVX512F__','__AVX512DQ__']
-	acl_avx512_on = true
-	foreach f:acl_avx512_flags
-		if cc.get_define(f, args: machine_args) == ''
-			acl_avx512_on = false
-		endif
-	endforeach
+    # check if all required flags already enabled (variant a).
+    acl_avx512_flags = ['__AVX512F__','__AVX512DQ__']
+    acl_avx512_on = true
+    foreach f:acl_avx512_flags
+        if cc.get_define(f, args: machine_args) == ''
+            acl_avx512_on = false
+        endif
+    endforeach
 
-	if acl_avx512_on == true
-		cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
-		sources += files('dir24_8_avx512.c')
-		# TRIE AVX512 implementation uses avx512bw intrinsics along with
-		# avx512f and avx512dq
-		if cc.get_define('__AVX512BW__', args: machine_args) != ''
-			cflags += ['-DCC_TRIE_AVX512_SUPPORT']
-			sources += files('trie_avx512.c')
-		endif
-	elif cc.has_multi_arguments('-mavx512f', '-mavx512dq')
-		dir24_8_avx512_tmp = static_library('dir24_8_avx512_tmp',
-				'dir24_8_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx512f', '-mavx512dq'])
-		objs += dir24_8_avx512_tmp.extract_objects('dir24_8_avx512.c')
-		cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
-		# TRIE AVX512 implementation uses avx512bw intrinsics along with
-		# avx512f and avx512dq
-		if cc.has_argument('-mavx512bw')
-			trie_avx512_tmp = static_library('trie_avx512_tmp',
-				'trie_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx512f', \
-					'-mavx512dq', '-mavx512bw'])
-			objs += trie_avx512_tmp.extract_objects('trie_avx512.c')
-			cflags += ['-DCC_TRIE_AVX512_SUPPORT']
-		endif
-	endif
+    if acl_avx512_on == true
+        cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
+        sources += files('dir24_8_avx512.c')
+        # TRIE AVX512 implementation uses avx512bw intrinsics along with
+        # avx512f and avx512dq
+        if cc.get_define('__AVX512BW__', args: machine_args) != ''
+            cflags += ['-DCC_TRIE_AVX512_SUPPORT']
+            sources += files('trie_avx512.c')
+        endif
+    elif cc.has_multi_arguments('-mavx512f', '-mavx512dq')
+        dir24_8_avx512_tmp = static_library('dir24_8_avx512_tmp',
+                'dir24_8_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx512f', '-mavx512dq'])
+        objs += dir24_8_avx512_tmp.extract_objects('dir24_8_avx512.c')
+        cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
+        # TRIE AVX512 implementation uses avx512bw intrinsics along with
+        # avx512f and avx512dq
+        if cc.has_argument('-mavx512bw')
+            trie_avx512_tmp = static_library('trie_avx512_tmp',
+                'trie_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx512f', \
+                    '-mavx512dq', '-mavx512bw'])
+            objs += trie_avx512_tmp.extract_objects('trie_avx512.c')
+            cflags += ['-DCC_TRIE_AVX512_SUPPORT']
+        endif
+    endif
 endif
diff --git a/lib/librte_gso/meson.build b/lib/librte_gso/meson.build
index 05904f2fea..ab128d5572 100644
--- a/lib/librte_gso/meson.build
+++ b/lib/librte_gso/meson.build
@@ -2,6 +2,6 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('gso_common.c', 'gso_tcp4.c', 'gso_udp4.c',
-		'gso_tunnel_tcp4.c', 'gso_tunnel_udp4.c', 'rte_gso.c')
+        'gso_tunnel_tcp4.c', 'gso_tunnel_udp4.c', 'rte_gso.c')
 headers = files('rte_gso.h')
 deps += ['ethdev']
diff --git a/lib/librte_hash/meson.build b/lib/librte_hash/meson.build
index 242859f5ad..fb3edd8ec0 100644
--- a/lib/librte_hash/meson.build
+++ b/lib/librte_hash/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2017 Intel Corporation
 
 headers = files('rte_fbk_hash.h',
-	'rte_hash_crc.h',
-	'rte_hash.h',
-	'rte_jhash.h',
-	'rte_thash.h')
+    'rte_hash_crc.h',
+    'rte_hash.h',
+    'rte_jhash.h',
+    'rte_thash.h')
 indirect_headers += files('rte_crc_arm64.h')
 
 sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c')
diff --git a/lib/librte_ip_frag/meson.build b/lib/librte_ip_frag/meson.build
index c5b9a45963..4f6d600cb7 100644
--- a/lib/librte_ip_frag/meson.build
+++ b/lib/librte_ip_frag/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_ipv4_fragmentation.c',
-		'rte_ipv6_fragmentation.c',
-		'rte_ipv4_reassembly.c',
-		'rte_ipv6_reassembly.c',
-		'rte_ip_frag_common.c',
-		'ip_frag_internal.c')
+        'rte_ipv6_fragmentation.c',
+        'rte_ipv4_reassembly.c',
+        'rte_ipv6_reassembly.c',
+        'rte_ip_frag_common.c',
+        'ip_frag_internal.c')
 headers = files('rte_ip_frag.h')
 deps += ['ethdev', 'hash']
diff --git a/lib/librte_kni/meson.build b/lib/librte_kni/meson.build
index 55e47df413..e2e4e44fc6 100644
--- a/lib/librte_kni/meson.build
+++ b/lib/librte_kni/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
+    build = false
+    reason = 'only supported on 64-bit Linux'
 endif
 sources = files('rte_kni.c')
 headers = files('rte_kni.h', 'rte_kni_common.h')
diff --git a/lib/librte_mbuf/meson.build b/lib/librte_mbuf/meson.build
index e95c770e5a..7a2ac02749 100644
--- a/lib/librte_mbuf/meson.build
+++ b/lib/librte_mbuf/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_mbuf.c', 'rte_mbuf_ptype.c', 'rte_mbuf_pool_ops.c',
-	'rte_mbuf_dyn.c')
+    'rte_mbuf_dyn.c')
 headers = files('rte_mbuf.h', 'rte_mbuf_core.h',
-		'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h',
-		'rte_mbuf_dyn.h')
+        'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h',
+        'rte_mbuf_dyn.h')
 deps += ['mempool']
diff --git a/lib/librte_mempool/meson.build b/lib/librte_mempool/meson.build
index a6e861cbfc..cf24a6436d 100644
--- a/lib/librte_mempool/meson.build
+++ b/lib/librte_mempool/meson.build
@@ -4,13 +4,13 @@
 extra_flags = []
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 sources = files('rte_mempool.c', 'rte_mempool_ops.c',
-		'rte_mempool_ops_default.c', 'mempool_trace_points.c')
+        'rte_mempool_ops_default.c', 'mempool_trace_points.c')
 headers = files('rte_mempool.h', 'rte_mempool_trace.h',
-		'rte_mempool_trace_fp.h')
+        'rte_mempool_trace_fp.h')
 deps += ['ring']
diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build
index d5be6a2145..3cb43d9ee7 100644
--- a/lib/librte_metrics/meson.build
+++ b/lib/librte_metrics/meson.build
@@ -6,8 +6,8 @@ headers = files('rte_metrics.h', 'rte_metrics_telemetry.h')
 
 jansson = dependency('jansson', required: false, method: 'pkg-config')
 if jansson.found()
-	dpdk_conf.set('RTE_HAS_JANSSON', 1)
-	ext_deps += jansson
+    dpdk_conf.set('RTE_HAS_JANSSON', 1)
+    ext_deps += jansson
 endif
 
 deps += ['ethdev', 'telemetry']
diff --git a/lib/librte_net/meson.build b/lib/librte_net/meson.build
index 94d816e79f..d47434f67c 100644
--- a/lib/librte_net/meson.build
+++ b/lib/librte_net/meson.build
@@ -2,109 +2,109 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 headers = files('rte_ip.h',
-	'rte_tcp.h',
-	'rte_udp.h',
-	'rte_esp.h',
-	'rte_sctp.h',
-	'rte_icmp.h',
-	'rte_arp.h',
-	'rte_ether.h',
-	'rte_vxlan.h',
-	'rte_gre.h',
-	'rte_gtp.h',
-	'rte_net.h',
-	'rte_net_crc.h',
-	'rte_mpls.h',
-	'rte_higig.h',
-	'rte_ecpri.h',
-	'rte_geneve.h')
+    'rte_tcp.h',
+    'rte_udp.h',
+    'rte_esp.h',
+    'rte_sctp.h',
+    'rte_icmp.h',
+    'rte_arp.h',
+    'rte_ether.h',
+    'rte_vxlan.h',
+    'rte_gre.h',
+    'rte_gtp.h',
+    'rte_net.h',
+    'rte_net_crc.h',
+    'rte_mpls.h',
+    'rte_higig.h',
+    'rte_ecpri.h',
+    'rte_geneve.h')
 
 sources = files('rte_arp.c', 'rte_ether.c', 'rte_net.c', 'rte_net_crc.c')
 deps += ['mbuf']
 
 if dpdk_conf.has('RTE_ARCH_X86_64')
-	net_crc_sse42_cpu_support = (
-		cc.get_define('__PCLMUL__', args: machine_args) != '')
-	net_crc_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '' and
-		cc.get_define('__AVX512DQ__', args: machine_args) != '' and
-		cc.get_define('__AVX512VL__', args: machine_args) != '' and
-		cc.get_define('__VPCLMULQDQ__', args: machine_args) != '')
+    net_crc_sse42_cpu_support = (
+        cc.get_define('__PCLMUL__', args: machine_args) != '')
+    net_crc_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '' and
+        cc.get_define('__AVX512DQ__', args: machine_args) != '' and
+        cc.get_define('__AVX512VL__', args: machine_args) != '' and
+        cc.get_define('__VPCLMULQDQ__', args: machine_args) != '')
 
-	net_crc_sse42_cc_support = (
-		cc.has_argument('-mpclmul') and cc.has_argument('-maes'))
-	net_crc_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw') and
-		cc.has_argument('-mavx512dq') and
-		cc.has_argument('-mavx512vl') and
-		cc.has_argument('-mvpclmulqdq') and
-		cc.has_argument('-mavx2') and
-		cc.has_argument('-mavx'))
+    net_crc_sse42_cc_support = (
+        cc.has_argument('-mpclmul') and cc.has_argument('-maes'))
+    net_crc_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw') and
+        cc.has_argument('-mavx512dq') and
+        cc.has_argument('-mavx512vl') and
+        cc.has_argument('-mvpclmulqdq') and
+        cc.has_argument('-mavx2') and
+        cc.has_argument('-mavx'))
 
-	build_static_net_crc_sse42_lib = 0
-	build_static_net_crc_avx512_lib = 0
+    build_static_net_crc_sse42_lib = 0
+    build_static_net_crc_avx512_lib = 0
 
-	if net_crc_sse42_cpu_support == true
-		sources += files('net_crc_sse.c')
-		cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
-		if net_crc_avx512_cpu_support == true
-			sources += files('net_crc_avx512.c')
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		elif net_crc_avx512_cc_support == true
-			build_static_net_crc_avx512_lib = 1
-			net_crc_avx512_lib_cflags = ['-mavx512f',
-							'-mavx512bw',
-							'-mavx512dq',
-							'-mavx512vl',
-							'-mvpclmulqdq',
-							'-mavx2',
-							'-mavx']
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		endif
-	elif net_crc_sse42_cc_support == true
-		build_static_net_crc_sse42_lib = 1
-		net_crc_sse42_lib_cflags = ['-mpclmul', '-maes']
-		cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
-		if net_crc_avx512_cc_support == true
-			build_static_net_crc_avx512_lib = 1
-			net_crc_avx512_lib_cflags = ['-mpclmul',
-							'-maes',
-							'-mavx512f',
-							'-mavx512bw',
-							'-mavx512dq',
-							'-mavx512vl',
-							'-mvpclmulqdq',
-							'-mavx2',
-							'-mavx']
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		endif
-	endif
+    if net_crc_sse42_cpu_support == true
+        sources += files('net_crc_sse.c')
+        cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
+        if net_crc_avx512_cpu_support == true
+            sources += files('net_crc_avx512.c')
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        elif net_crc_avx512_cc_support == true
+            build_static_net_crc_avx512_lib = 1
+            net_crc_avx512_lib_cflags = ['-mavx512f',
+                            '-mavx512bw',
+                            '-mavx512dq',
+                            '-mavx512vl',
+                            '-mvpclmulqdq',
+                            '-mavx2',
+                            '-mavx']
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        endif
+    elif net_crc_sse42_cc_support == true
+        build_static_net_crc_sse42_lib = 1
+        net_crc_sse42_lib_cflags = ['-mpclmul', '-maes']
+        cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
+        if net_crc_avx512_cc_support == true
+            build_static_net_crc_avx512_lib = 1
+            net_crc_avx512_lib_cflags = ['-mpclmul',
+                            '-maes',
+                            '-mavx512f',
+                            '-mavx512bw',
+                            '-mavx512dq',
+                            '-mavx512vl',
+                            '-mvpclmulqdq',
+                            '-mavx2',
+                            '-mavx']
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        endif
+    endif
 
-	if build_static_net_crc_sse42_lib == 1
-		net_crc_sse42_lib = static_library(
-					'net_crc_sse42_lib',
-					'net_crc_sse.c',
-					dependencies: static_rte_eal,
-					c_args: [cflags,
-						net_crc_sse42_lib_cflags])
-		objs += net_crc_sse42_lib.extract_objects('net_crc_sse.c')
-	endif
+    if build_static_net_crc_sse42_lib == 1
+        net_crc_sse42_lib = static_library(
+                    'net_crc_sse42_lib',
+                    'net_crc_sse.c',
+                    dependencies: static_rte_eal,
+                    c_args: [cflags,
+                        net_crc_sse42_lib_cflags])
+        objs += net_crc_sse42_lib.extract_objects('net_crc_sse.c')
+    endif
 
-	if build_static_net_crc_avx512_lib == 1
-		net_crc_avx512_lib = static_library(
-					'net_crc_avx512_lib',
-					'net_crc_avx512.c',
-					dependencies: static_rte_eal,
-					c_args: [cflags,
-						net_crc_avx512_lib_cflags])
-		objs += net_crc_avx512_lib.extract_objects('net_crc_avx512.c')
-	endif
+    if build_static_net_crc_avx512_lib == 1
+        net_crc_avx512_lib = static_library(
+                    'net_crc_avx512_lib',
+                    'net_crc_avx512.c',
+                    dependencies: static_rte_eal,
+                    c_args: [cflags,
+                        net_crc_avx512_lib_cflags])
+        objs += net_crc_avx512_lib.extract_objects('net_crc_avx512.c')
+    endif
 
 elif (dpdk_conf.has('RTE_ARCH_ARM64') and
-		cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '')
-	sources += files('net_crc_neon.c')
-	cflags += ['-DCC_ARM64_NEON_PMULL_SUPPORT']
+        cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '')
+    sources += files('net_crc_neon.c')
+    cflags += ['-DCC_ARM64_NEON_PMULL_SUPPORT']
 endif
diff --git a/lib/librte_node/meson.build b/lib/librte_node/meson.build
index 3d582f616a..2fdec58100 100644
--- a/lib/librte_node/meson.build
+++ b/lib/librte_node/meson.build
@@ -2,7 +2,7 @@
 # Copyright(C) 2020 Marvell International Ltd.
 
 sources = files('null.c', 'log.c', 'ethdev_rx.c', 'ethdev_tx.c', 'ip4_lookup.c',
-		'ip4_rewrite.c', 'pkt_drop.c', 'ethdev_ctrl.c', 'pkt_cls.c')
+        'ip4_rewrite.c', 'pkt_drop.c', 'ethdev_ctrl.c', 'pkt_cls.c')
 headers = files('rte_node_ip4_api.h', 'rte_node_eth_api.h')
 # Strict-aliasing rules are violated by uint8_t[] to context size casts.
 cflags += '-fno-strict-aliasing'
diff --git a/lib/librte_pipeline/meson.build b/lib/librte_pipeline/meson.build
index 65c1a8d6a9..c4585e7d1b 100644
--- a/lib/librte_pipeline/meson.build
+++ b/lib/librte_pipeline/meson.build
@@ -2,15 +2,15 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_pipeline.c',
-	'rte_port_in_action.c',
-	'rte_table_action.c',
-	'rte_swx_pipeline.c',
-	'rte_swx_pipeline_spec.c',
-	'rte_swx_ctl.c',)
+    'rte_port_in_action.c',
+    'rte_table_action.c',
+    'rte_swx_pipeline.c',
+    'rte_swx_pipeline_spec.c',
+    'rte_swx_ctl.c',)
 headers = files('rte_pipeline.h',
-	'rte_port_in_action.h',
-	'rte_table_action.h',
-	'rte_swx_pipeline.h',
-	'rte_swx_extern.h',
-	'rte_swx_ctl.h',)
+    'rte_port_in_action.h',
+    'rte_table_action.h',
+    'rte_swx_pipeline.h',
+    'rte_swx_extern.h',
+    'rte_swx_ctl.h',)
 deps += ['port', 'table', 'meter', 'sched', 'cryptodev']
diff --git a/lib/librte_port/meson.build b/lib/librte_port/meson.build
index 435b64a131..d2ca313367 100644
--- a/lib/librte_port/meson.build
+++ b/lib/librte_port/meson.build
@@ -2,45 +2,45 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files(
-	'rte_port_ethdev.c',
-	'rte_port_fd.c',
-	'rte_port_frag.c',
-	'rte_port_ras.c',
-	'rte_port_ring.c',
-	'rte_port_sched.c',
-	'rte_port_source_sink.c',
-	'rte_port_sym_crypto.c',
-	'rte_port_eventdev.c',
-	'rte_swx_port_ethdev.c',
-	'rte_swx_port_fd.c',
-	'rte_swx_port_ring.c',
-	'rte_swx_port_source_sink.c',
-	)
+    'rte_port_ethdev.c',
+    'rte_port_fd.c',
+    'rte_port_frag.c',
+    'rte_port_ras.c',
+    'rte_port_ring.c',
+    'rte_port_sched.c',
+    'rte_port_source_sink.c',
+    'rte_port_sym_crypto.c',
+    'rte_port_eventdev.c',
+    'rte_swx_port_ethdev.c',
+    'rte_swx_port_fd.c',
+    'rte_swx_port_ring.c',
+    'rte_swx_port_source_sink.c',
+    )
 headers = files(
-	'rte_port_ethdev.h',
-	'rte_port_fd.h',
-	'rte_port_frag.h',
-	'rte_port_ras.h',
-	'rte_port.h',
-	'rte_port_ring.h',
-	'rte_port_sched.h',
-	'rte_port_source_sink.h',
-	'rte_port_sym_crypto.h',
-	'rte_port_eventdev.h',
-	'rte_swx_port.h',
-	'rte_swx_port_ethdev.h',
-	'rte_swx_port_fd.h',
-	'rte_swx_port_ring.h',
-	'rte_swx_port_source_sink.h',
-	)
+    'rte_port_ethdev.h',
+    'rte_port_fd.h',
+    'rte_port_frag.h',
+    'rte_port_ras.h',
+    'rte_port.h',
+    'rte_port_ring.h',
+    'rte_port_sched.h',
+    'rte_port_source_sink.h',
+    'rte_port_sym_crypto.h',
+    'rte_port_eventdev.h',
+    'rte_swx_port.h',
+    'rte_swx_port_ethdev.h',
+    'rte_swx_port_fd.h',
+    'rte_swx_port_ring.h',
+    'rte_swx_port_source_sink.h',
+    )
 deps += ['ethdev', 'sched', 'ip_frag', 'cryptodev', 'eventdev']
 
 if dpdk_conf.has('RTE_PORT_PCAP')
-	ext_deps += pcap_dep # dependency provided in config/meson.build
+    ext_deps += pcap_dep # dependency provided in config/meson.build
 endif
 
 if dpdk_conf.has('RTE_LIB_KNI')
-	sources += files('rte_port_kni.c')
-	headers += files('rte_port_kni.h')
-	deps += 'kni'
+    sources += files('rte_port_kni.c')
+    headers += files('rte_port_kni.h')
+    deps += 'kni'
 endif
diff --git a/lib/librte_power/meson.build b/lib/librte_power/meson.build
index 9a2dcbfc7a..75e6593e81 100644
--- a/lib/librte_power/meson.build
+++ b/lib/librte_power/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('rte_power.c', 'power_acpi_cpufreq.c',
-		'power_kvm_vm.c', 'guest_channel.c',
-		'rte_power_empty_poll.c',
-		'power_pstate_cpufreq.c',
-		'rte_power_pmd_mgmt.c',
-		'power_common.c')
+        'power_kvm_vm.c', 'guest_channel.c',
+        'rte_power_empty_poll.c',
+        'power_pstate_cpufreq.c',
+        'rte_power_pmd_mgmt.c',
+        'power_common.c')
 headers = files('rte_power.h','rte_power_empty_poll.h',
-	'rte_power_pmd_mgmt.h',
-	'rte_power_guest_channel.h')
+    'rte_power_pmd_mgmt.h',
+    'rte_power_guest_channel.h')
 deps += ['timer', 'ethdev']
diff --git a/lib/librte_regexdev/meson.build b/lib/librte_regexdev/meson.build
index 1b3b6db22a..7dc96f28c9 100644
--- a/lib/librte_regexdev/meson.build
+++ b/lib/librte_regexdev/meson.build
@@ -3,6 +3,6 @@
 
 sources = files('rte_regexdev.c')
 headers = files('rte_regexdev.h',
-	'rte_regexdev_driver.h')
+    'rte_regexdev_driver.h')
 indirect_headers += files('rte_regexdev_core.h')
 deps += ['mbuf']
diff --git a/lib/librte_ring/meson.build b/lib/librte_ring/meson.build
index ea050d564a..1f81e71d9a 100644
--- a/lib/librte_ring/meson.build
+++ b/lib/librte_ring/meson.build
@@ -5,15 +5,15 @@ sources = files('rte_ring.c')
 headers = files('rte_ring.h')
 # most sub-headers are not for direct inclusion
 indirect_headers += files (
-		'rte_ring_core.h',
-		'rte_ring_elem.h',
-		'rte_ring_elem_pvt.h',
-		'rte_ring_c11_pvt.h',
-		'rte_ring_generic_pvt.h',
-		'rte_ring_hts.h',
-		'rte_ring_hts_elem_pvt.h',
-		'rte_ring_peek.h',
-		'rte_ring_peek_elem_pvt.h',
-		'rte_ring_peek_zc.h',
-		'rte_ring_rts.h',
-		'rte_ring_rts_elem_pvt.h')
+        'rte_ring_core.h',
+        'rte_ring_elem.h',
+        'rte_ring_elem_pvt.h',
+        'rte_ring_c11_pvt.h',
+        'rte_ring_generic_pvt.h',
+        'rte_ring_hts.h',
+        'rte_ring_hts_elem_pvt.h',
+        'rte_ring_peek.h',
+        'rte_ring_peek_elem_pvt.h',
+        'rte_ring_peek_zc.h',
+        'rte_ring_rts.h',
+        'rte_ring_rts_elem_pvt.h')
diff --git a/lib/librte_sched/meson.build b/lib/librte_sched/meson.build
index f85d64df81..78f7a0436d 100644
--- a/lib/librte_sched/meson.build
+++ b/lib/librte_sched/meson.build
@@ -3,5 +3,5 @@
 
 sources = files('rte_sched.c', 'rte_red.c', 'rte_approx.c')
 headers = files('rte_sched.h', 'rte_sched_common.h',
-		'rte_red.h', 'rte_approx.h')
+        'rte_red.h', 'rte_approx.h')
 deps += ['mbuf', 'meter']
diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build
index 9ff33722b2..c34843bee7 100644
--- a/lib/librte_stack/meson.build
+++ b/lib/librte_stack/meson.build
@@ -5,7 +5,7 @@ sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c')
 headers = files('rte_stack.h')
 # subheaders, not for direct inclusion by apps
 indirect_headers += files(
-		'rte_stack_std.h',
-		'rte_stack_lf.h',
-		'rte_stack_lf_generic.h',
-		'rte_stack_lf_c11.h')
+        'rte_stack_std.h',
+        'rte_stack_lf.h',
+        'rte_stack_lf_generic.h',
+        'rte_stack_lf_c11.h')
diff --git a/lib/librte_table/meson.build b/lib/librte_table/meson.build
index 007ffe0130..6c542eccb6 100644
--- a/lib/librte_table/meson.build
+++ b/lib/librte_table/meson.build
@@ -2,35 +2,35 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_table_acl.c',
-		'rte_table_lpm.c',
-		'rte_table_lpm_ipv6.c',
-		'rte_table_hash_cuckoo.c',
-		'rte_table_hash_key8.c',
-		'rte_table_hash_key16.c',
-		'rte_table_hash_key32.c',
-		'rte_table_hash_ext.c',
-		'rte_table_hash_lru.c',
-		'rte_table_array.c',
-		'rte_table_stub.c',
-		'rte_swx_table_em.c',
-		'rte_swx_table_wm.c',
-		)
+        'rte_table_lpm.c',
+        'rte_table_lpm_ipv6.c',
+        'rte_table_hash_cuckoo.c',
+        'rte_table_hash_key8.c',
+        'rte_table_hash_key16.c',
+        'rte_table_hash_key32.c',
+        'rte_table_hash_ext.c',
+        'rte_table_hash_lru.c',
+        'rte_table_array.c',
+        'rte_table_stub.c',
+        'rte_swx_table_em.c',
+        'rte_swx_table_wm.c',
+        )
 headers = files('rte_table.h',
-		'rte_table_acl.h',
-		'rte_table_lpm.h',
-		'rte_table_lpm_ipv6.h',
-		'rte_table_hash.h',
-		'rte_table_hash_cuckoo.h',
-		'rte_table_hash_func.h',
-		'rte_lru.h',
-		'rte_table_array.h',
-		'rte_table_stub.h',
-		'rte_swx_table.h',
-		'rte_swx_table_em.h',
-		'rte_swx_table_wm.h',
-		)
+        'rte_table_acl.h',
+        'rte_table_lpm.h',
+        'rte_table_lpm_ipv6.h',
+        'rte_table_hash.h',
+        'rte_table_hash_cuckoo.h',
+        'rte_table_hash_func.h',
+        'rte_lru.h',
+        'rte_table_array.h',
+        'rte_table_stub.h',
+        'rte_swx_table.h',
+        'rte_swx_table_em.h',
+        'rte_swx_table_wm.h',
+        )
 deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 
 indirect_headers += files('rte_lru_x86.h',
-		'rte_lru_arm64.h',
-		'rte_table_hash_func_arm64.h')
+        'rte_lru_arm64.h',
+        'rte_table_hash_func_arm64.h')
diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
index 6185deab33..f4254320ac 100644
--- a/lib/librte_vhost/meson.build
+++ b/lib/librte_vhost/meson.build
@@ -2,25 +2,25 @@
 # Copyright(c) 2017-2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 if has_libnuma == 1
-	dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
+    dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
 endif
 if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-	cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
+    cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
 elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-	cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
+    cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
 elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-	cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
+    cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
 endif
 dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY',
-	      cc.has_header('linux/userfaultfd.h'))
+          cc.has_header('linux/userfaultfd.h'))
 cflags += '-fno-strict-aliasing'
 sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vdpa.c',
-		'vhost.c', 'vhost_user.c',
-		'virtio_net.c', 'vhost_crypto.c')
+        'vhost.c', 'vhost_user.c',
+        'virtio_net.c', 'vhost_crypto.c')
 headers = files('rte_vhost.h', 'rte_vdpa.h', 'rte_vdpa_dev.h',
-		'rte_vhost_crypto.h', 'rte_vhost_async.h')
+        'rte_vhost_crypto.h', 'rte_vhost_async.h')
 deps += ['ethdev', 'cryptodev', 'hash', 'pci']
-- 
2.27.0

[dpdk-dev] [RFC PATCH 10/14] drivers: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/baseband/turbo_sw/meson.build   |  46 ++--
 drivers/bus/dpaa/meson.build            |  28 +-
 drivers/bus/fslmc/meson.build           |  30 +-
 drivers/bus/ifpga/meson.build           |   6 +-
 drivers/bus/pci/meson.build             |  24 +-
 drivers/bus/vdev/meson.build            |   2 +-
 drivers/bus/vmbus/meson.build           |  22 +-
 drivers/common/cpt/meson.build          |   2 +-
 drivers/common/dpaax/meson.build        |   8 +-
 drivers/common/mlx5/linux/meson.build   | 350 ++++++++++++------------
 drivers/common/mlx5/meson.build         |  40 +--
 drivers/common/mlx5/windows/meson.build |  30 +-
 drivers/common/mvep/meson.build         |   6 +-
 drivers/common/octeontx2/meson.build    |  18 +-
 drivers/common/qat/meson.build          |  60 ++--
 drivers/common/sfc_efx/base/meson.build | 142 +++++-----
 drivers/common/sfc_efx/meson.build      |  24 +-
 drivers/compress/isal/meson.build       |   4 +-
 drivers/compress/mlx5/meson.build       |  24 +-
 drivers/compress/zlib/meson.build       |   4 +-
 drivers/crypto/aesni_gcm/meson.build    |  22 +-
 drivers/crypto/aesni_mb/meson.build     |  22 +-
 drivers/crypto/armv8/meson.build        |   6 +-
 drivers/crypto/bcmfs/meson.build        |  26 +-
 drivers/crypto/caam_jr/meson.build      |  10 +-
 drivers/crypto/ccp/meson.build          |  16 +-
 drivers/crypto/dpaa2_sec/meson.build    |   6 +-
 drivers/crypto/dpaa_sec/meson.build     |   4 +-
 drivers/crypto/kasumi/meson.build       |  20 +-
 drivers/crypto/mvsam/meson.build        |   6 +-
 drivers/crypto/nitrox/meson.build       |  20 +-
 drivers/crypto/octeontx/meson.build     |  12 +-
 drivers/crypto/octeontx2/meson.build    |  16 +-
 drivers/crypto/openssl/meson.build      |   4 +-
 drivers/crypto/qat/meson.build          |  20 +-
 drivers/crypto/scheduler/meson.build    |  18 +-
 drivers/crypto/snow3g/meson.build       |  18 +-
 drivers/crypto/virtio/meson.build       |   2 +-
 drivers/crypto/zuc/meson.build          |  20 +-
 drivers/event/dlb/meson.build           |  14 +-
 drivers/event/dlb2/meson.build          |  14 +-
 drivers/event/dpaa/meson.build          |   4 +-
 drivers/event/dpaa2/meson.build         |   8 +-
 drivers/event/dsw/meson.build           |   2 +-
 drivers/event/octeontx/meson.build      |  12 +-
 drivers/event/octeontx2/meson.build     |  24 +-
 drivers/event/opdl/meson.build          |  10 +-
 drivers/event/sw/meson.build            |   8 +-
 drivers/mempool/bucket/meson.build      |   4 +-
 drivers/mempool/dpaa/meson.build        |   4 +-
 drivers/mempool/dpaa2/meson.build       |   4 +-
 drivers/mempool/octeontx/meson.build    |   6 +-
 drivers/mempool/octeontx2/meson.build   |  20 +-
 drivers/mempool/stack/meson.build       |   4 +-
 drivers/net/af_packet/meson.build       |   4 +-
 drivers/net/af_xdp/meson.build          |  24 +-
 drivers/net/ark/meson.build             |  24 +-
 drivers/net/atlantic/meson.build        |  22 +-
 drivers/net/avp/meson.build             |   4 +-
 drivers/net/axgbe/meson.build           |  16 +-
 drivers/net/bnx2x/meson.build           |  18 +-
 drivers/net/bnxt/meson.build            | 124 ++++-----
 drivers/net/bonding/meson.build         |   8 +-
 drivers/net/cxgbe/meson.build           |  30 +-
 drivers/net/dpaa/meson.build            |  16 +-
 drivers/net/dpaa2/meson.build           |  26 +-
 drivers/net/e1000/base/meson.build      |  50 ++--
 drivers/net/e1000/meson.build           |  20 +-
 drivers/net/ena/meson.build             |  10 +-
 drivers/net/enetc/meson.build           |   6 +-
 drivers/net/enic/meson.build            |  46 ++--
 drivers/net/failsafe/meson.build        |  24 +-
 drivers/net/fm10k/base/meson.build      |  28 +-
 drivers/net/fm10k/meson.build           |  12 +-
 drivers/net/hinic/base/meson.build      |  26 +-
 drivers/net/hinic/meson.build           |  16 +-
 drivers/net/hns3/meson.build            |  46 ++--
 drivers/net/i40e/base/meson.build       |  32 +--
 drivers/net/i40e/meson.build            | 110 ++++----
 drivers/net/iavf/meson.build            |  94 +++----
 drivers/net/ice/base/meson.build        |  40 +--
 drivers/net/ice/meson.build             | 100 +++----
 drivers/net/igc/base/meson.build        |  20 +-
 drivers/net/igc/meson.build             |  16 +-
 drivers/net/ionic/meson.build           |  20 +-
 drivers/net/ipn3ke/meson.build          |  18 +-
 drivers/net/ixgbe/base/meson.build      |  42 +--
 drivers/net/ixgbe/meson.build           |  32 +--
 drivers/net/kni/meson.build             |   6 +-
 drivers/net/liquidio/meson.build        |  12 +-
 drivers/net/memif/meson.build           |   6 +-
 drivers/net/mlx4/meson.build            | 160 +++++------
 drivers/net/mlx5/linux/meson.build      |  14 +-
 drivers/net/mlx5/meson.build            |  78 +++---
 drivers/net/mlx5/windows/meson.build    |  10 +-
 drivers/net/mvneta/meson.build          |  16 +-
 drivers/net/mvpp2/meson.build           |  22 +-
 drivers/net/netvsc/meson.build          |   6 +-
 drivers/net/nfb/meson.build             |   6 +-
 drivers/net/nfp/meson.build             |  28 +-
 drivers/net/null/meson.build            |   6 +-
 drivers/net/octeontx/base/meson.build   |  18 +-
 drivers/net/octeontx/meson.build        |  12 +-
 drivers/net/octeontx2/meson.build       |  62 ++---
 drivers/net/pcap/meson.build            |  10 +-
 drivers/net/pfe/meson.build             |  12 +-
 drivers/net/qede/base/meson.build       |  78 +++---
 drivers/net/qede/meson.build            |  22 +-
 drivers/net/ring/meson.build            |   6 +-
 drivers/net/sfc/meson.build             |  64 ++---
 drivers/net/softnic/meson.build         |  32 +--
 drivers/net/szedata2/meson.build        |   6 +-
 drivers/net/tap/meson.build             |  42 +--
 drivers/net/thunderx/base/meson.build   |  10 +-
 drivers/net/thunderx/meson.build        |  14 +-
 drivers/net/txgbe/base/meson.build      |  26 +-
 drivers/net/txgbe/meson.build           |  24 +-
 drivers/net/vdev_netvsc/meson.build     |   4 +-
 drivers/net/vhost/meson.build           |   6 +-
 drivers/net/virtio/meson.build          |  78 +++---
 drivers/net/vmxnet3/meson.build         |  12 +-
 drivers/raw/ifpga/base/meson.build      |  54 ++--
 drivers/raw/ifpga/meson.build           |   8 +-
 drivers/raw/ioat/meson.build            |  18 +-
 drivers/raw/ntb/meson.build             |   2 +-
 drivers/raw/octeontx2_dma/meson.build   |   8 +-
 drivers/raw/octeontx2_ep/meson.build    |   6 +-
 drivers/regex/mlx5/meson.build          |  32 +--
 drivers/regex/octeontx2/meson.build     |  22 +-
 drivers/vdpa/mlx5/meson.build           |  38 +--
 130 files changed, 1748 insertions(+), 1748 deletions(-)

diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build
index 55ef4e4ec7..477b8b371f 100644
--- a/drivers/baseband/turbo_sw/meson.build
+++ b/drivers/baseband/turbo_sw/meson.build
@@ -6,34 +6,34 @@ path = get_option('flexran_sdk')
 # check for FlexRAN SDK libraries for AVX2
 lib4g = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false)
 if lib4g.found()
-	ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
-	ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
-	ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
-	ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
-	ext_deps += cc.find_library('libstdc++', required: true)
-	ext_deps += cc.find_library('libirc', required: true)
-	ext_deps += cc.find_library('libimf', required: true)
-	ext_deps += cc.find_library('libipps', required: true)
-	ext_deps += cc.find_library('libsvml', required: true)
-	includes += include_directories(path + '/lib_turbo')
-	includes += include_directories(path + '/lib_crc')
-	includes += include_directories(path + '/lib_rate_matching')
-	includes += include_directories(path + '/lib_common')
-	cflags += ['-DRTE_BBDEV_SDK_AVX2']
+    ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
+    ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
+    ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
+    ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
+    ext_deps += cc.find_library('libstdc++', required: true)
+    ext_deps += cc.find_library('libirc', required: true)
+    ext_deps += cc.find_library('libimf', required: true)
+    ext_deps += cc.find_library('libipps', required: true)
+    ext_deps += cc.find_library('libsvml', required: true)
+    includes += include_directories(path + '/lib_turbo')
+    includes += include_directories(path + '/lib_crc')
+    includes += include_directories(path + '/lib_rate_matching')
+    includes += include_directories(path + '/lib_common')
+    cflags += ['-DRTE_BBDEV_SDK_AVX2']
 endif
 
 # check for FlexRAN SDK libraries for AVX512
 lib5g = cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: false)
 if lib5g.found()
-	ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
-	ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
-	includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
-	includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
-	includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
-	includes += include_directories(path + '/lib_rate_dematching_5gnr')
-	cflags += ['-DRTE_BBDEV_SDK_AVX512']
+    ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
+    ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
+    includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
+    includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
+    includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
+    includes += include_directories(path + '/lib_rate_dematching_5gnr')
+    cflags += ['-DRTE_BBDEV_SDK_AVX512']
 endif
 
 deps += ['bbdev', 'bus_vdev', 'ring']
diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build
index a3471403e2..9ff7bf21de 100644
--- a/drivers/bus/dpaa/meson.build
+++ b/drivers/bus/dpaa/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev']
 sources = files('base/fman/fman.c',
-		'base/fman/fman_hw.c',
-		'base/fman/netcfg_layer.c',
-		'base/qbman/bman.c',
-		'base/qbman/bman_driver.c',
-		'base/qbman/dpaa_alloc.c',
-		'base/qbman/dpaa_sys.c',
-		'base/qbman/process.c',
-		'base/qbman/qman.c',
-		'base/qbman/qman_driver.c',
-		'dpaa_bus.c')
+        'base/fman/fman_hw.c',
+        'base/fman/netcfg_layer.c',
+        'base/qbman/bman.c',
+        'base/qbman/bman_driver.c',
+        'base/qbman/dpaa_alloc.c',
+        'base/qbman/dpaa_sys.c',
+        'base/qbman/process.c',
+        'base/qbman/qman.c',
+        'base/qbman/qman_driver.c',
+        'dpaa_bus.c')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('include', 'base/qbman')
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index 260e7ef712..90f3e5674a 100644
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -2,24 +2,24 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev', 'kvargs']
 sources = files('fslmc_bus.c',
-		'fslmc_vfio.c',
-		'mc/dpbp.c',
-		'mc/dpci.c',
-		'mc/dpcon.c',
-		'mc/dpdmai.c',
-		'mc/dpio.c',
-		'mc/dpmng.c',
-		'mc/mc_sys.c',
-		'portal/dpaa2_hw_dpbp.c',
-		'portal/dpaa2_hw_dpci.c',
-		'portal/dpaa2_hw_dpio.c',
-		'qbman/qbman_portal.c',
-		'qbman/qbman_debug.c')
+        'fslmc_vfio.c',
+        'mc/dpbp.c',
+        'mc/dpci.c',
+        'mc/dpcon.c',
+        'mc/dpdmai.c',
+        'mc/dpio.c',
+        'mc/dpmng.c',
+        'mc/mc_sys.c',
+        'portal/dpaa2_hw_dpbp.c',
+        'portal/dpaa2_hw_dpci.c',
+        'portal/dpaa2_hw_dpio.c',
+        'qbman/qbman_portal.c',
+        'qbman/qbman_debug.c')
 
 includes += include_directories('mc', 'qbman/include', 'portal')
diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build
index 4d0507f553..cc5047e3ce 100644
--- a/drivers/bus/ifpga/meson.build
+++ b/drivers/bus/ifpga/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2010-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
 
 deps += ['pci', 'kvargs', 'rawdev']
diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build
index 78ec830b25..800ef7eabe 100644
--- a/drivers/bus/pci/meson.build
+++ b/drivers/bus/pci/meson.build
@@ -4,23 +4,23 @@
 deps += ['pci']
 headers = files('rte_bus_pci.h')
 sources = files('pci_common.c',
-	'pci_params.c')
+    'pci_params.c')
 if is_linux
-	sources += files('pci_common_uio.c',
-			'linux/pci.c',
-			'linux/pci_uio.c',
-			'linux/pci_vfio.c')
-	includes += include_directories('linux')
+    sources += files('pci_common_uio.c',
+            'linux/pci.c',
+            'linux/pci_uio.c',
+            'linux/pci_vfio.c')
+    includes += include_directories('linux')
 endif
 if is_freebsd
-	sources += files('pci_common_uio.c',
-			'bsd/pci.c')
-	includes += include_directories('bsd')
+    sources += files('pci_common_uio.c',
+            'bsd/pci.c')
+    includes += include_directories('bsd')
 endif
 if is_windows
-	sources += files('windows/pci.c',
-			'windows/pci_netuio.c')
-	includes += include_directories('windows')
+    sources += files('windows/pci.c',
+            'windows/pci_netuio.c')
+    includes += include_directories('windows')
 endif
 
 deps += ['kvargs']
diff --git a/drivers/bus/vdev/meson.build b/drivers/bus/vdev/meson.build
index 44b2966baa..3537423346 100644
--- a/drivers/bus/vdev/meson.build
+++ b/drivers/bus/vdev/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('vdev.c',
-	'vdev_params.c')
+    'vdev_params.c')
 headers = files('rte_bus_vdev.h')
 
 deps += ['kvargs']
diff --git a/drivers/bus/vmbus/meson.build b/drivers/bus/vmbus/meson.build
index 47e26703aa..50a2409e0b 100644
--- a/drivers/bus/vmbus/meson.build
+++ b/drivers/bus/vmbus/meson.build
@@ -1,24 +1,24 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 
 headers = files('rte_bus_vmbus.h','rte_vmbus_reg.h')
 
 sources = files('vmbus_common.c',
-		'vmbus_channel.c',
-		'vmbus_bufring.c',
-		'vmbus_common_uio.c')
+        'vmbus_channel.c',
+        'vmbus_bufring.c',
+        'vmbus_common_uio.c')
 
 if is_linux
-	sources += files('linux/vmbus_bus.c',
-			'linux/vmbus_uio.c')
-	includes += include_directories('linux')
+    sources += files('linux/vmbus_bus.c',
+            'linux/vmbus_uio.c')
+    includes += include_directories('linux')
 else
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
diff --git a/drivers/common/cpt/meson.build b/drivers/common/cpt/meson.build
index beecf0da30..24efc93784 100644
--- a/drivers/common/cpt/meson.build
+++ b/drivers/common/cpt/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2018 Cavium, Inc
 
 sources = files('cpt_fpm_tables.c',
-		'cpt_pmd_ops_helper.c')
+        'cpt_pmd_ops_helper.c')
 
 deps = ['kvargs', 'pci', 'cryptodev']
 includes += include_directories('../../crypto/octeontx')
diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build
index b7f177a62e..a162779116 100644
--- a/drivers/common/dpaax/meson.build
+++ b/drivers/common/dpaax/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
@@ -11,8 +11,8 @@ sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
 includes += include_directories('caamflib')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 220de35420..a2b07fd23c 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -9,48 +9,48 @@ LIB_GLUE_BASE = 'librte_common_mlx5_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+        '-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
+        '-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx5', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs,
+            required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources += files('mlx5_nl.c')
 sources += files('mlx5_common_os.c')
 sources += files('mlx5_common_verbs.c')
 if not dlopen_ibverbs
-	sources += files('mlx5_glue.c')
+    sources += files('mlx5_glue.c')
 endif
 
 # To maintain the compatibility with the make build system
@@ -59,169 +59,169 @@ endif
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search", "struct member to search" ]
 has_member_args = [
-	[ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
-	'struct ibv_counter_set_init_attr', 'counter_set_id' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
-	'struct ibv_counters_init_attr', 'comp_mask' ],
-	[ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_devx_uar', 'mmap_off' ],
+    [ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
+    'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
+    [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
+    'struct ibv_counter_set_init_attr', 'counter_set_id' ],
+    [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
+    'struct ibv_counters_init_attr', 'comp_mask' ],
+    [ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
+    'struct mlx5dv_devx_uar', 'mmap_off' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
-	'IBV_ACCESS_RELAXED_ORDERING ' ],
-	[ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
-	[ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
-	[ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
-	[ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_create_flow_action_packet_reformat' ],
-	[ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
-	'IBV_FLOW_SPEC_MPLS' ],
-	[ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
-	[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAG_RX_END_PADDING' ],
-	[ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_query_devx_port' ],
-	[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_create' ],
-	[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
-	[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_query_async' ],
-	[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_qp_query' ],
-	[ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
-	'mlx5dv_pp_alloc' ],
-	[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_devx_tir' ],
-	[ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_get_event' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_meter' ],
-	[ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
-	'MLX5_MMAP_GET_NC_PAGES_CMD' ],
-	[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
-	[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
-	[ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_push_vlan' ],
-	[ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
-	[ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_ENHANCED_MPSW' ],
-	[ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_SEND_EN' ],
-	[ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_WAIT' ],
+    [ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
+    'IBV_ACCESS_RELAXED_ORDERING ' ],
+    [ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
+    'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
+    [ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
+    'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
+    [ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
+    'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
+    [ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
+    'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
+    [ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
+    'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
+    [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
+    'mlx5dv_create_flow_action_packet_reformat' ],
+    [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
+    'IBV_FLOW_SPEC_MPLS' ],
+    [ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
+    'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
+    [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
+    'IBV_WQ_FLAG_RX_END_PADDING' ],
+    [ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
+    'mlx5dv_query_devx_port' ],
+    [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
+    'mlx5dv_devx_obj_create' ],
+    [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
+    'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
+    [ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
+    'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
+    [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
+    'mlx5dv_devx_obj_query_async' ],
+    [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
+    'mlx5dv_devx_qp_query' ],
+    [ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
+    'mlx5dv_pp_alloc' ],
+    [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
+    'mlx5dv_dr_action_create_dest_devx_tir' ],
+    [ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
+    'mlx5dv_devx_get_event' ],
+    [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
+    'mlx5dv_dr_action_create_flow_meter' ],
+    [ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
+    'MLX5_MMAP_GET_NC_PAGES_CMD' ],
+    [ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
+    'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
+    [ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
+    'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
+    [ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
+    'mlx5dv_dr_action_create_push_vlan' ],
+    [ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
+    [ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
+    'MLX5_OPCODE_ENHANCED_MPSW' ],
+    [ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
+    'MLX5_OPCODE_SEND_EN' ],
+    [ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
+    'MLX5_OPCODE_WAIT' ],
         [ 'HAVE_MLX5_OPCODE_ACCESS_ASO', 'infiniband/mlx5dv.h',
         'MLX5_OPCODE_ACCESS_ASO' ],
-	[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseLR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseLR4_Full' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
-	[ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
-	'IFLA_NUM_VF' ],
-	[ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
-	'IFLA_EXT_MASK' ],
-	[ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
-	'IFLA_PHYS_SWITCH_ID' ],
-	[ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
-	'IFLA_PHYS_PORT_NAME' ],
-	[ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
-	'RDMA_NL_NLDEV' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_GET' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_PORT_GET' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_NAME' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_PORT_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
-	[ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
-	'mlx5dv_dump_dr_domain'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_sampler'],
-	[ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_domain_set_reclaim_device_memory'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_array'],
-	[ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_aso' ],
-	[ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
-	'INFINIBAND_VERBS_H' ],
+    [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_40000baseKR4_Full' ],
+    [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_40000baseCR4_Full' ],
+    [ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_40000baseSR4_Full' ],
+    [ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_40000baseLR4_Full' ],
+    [ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_56000baseKR4_Full' ],
+    [ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_56000baseCR4_Full' ],
+    [ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_56000baseSR4_Full' ],
+    [ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
+    'SUPPORTED_56000baseLR4_Full' ],
+    [ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
+    'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
+    [ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
+    'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
+    [ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
+    'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
+    [ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
+    'IFLA_NUM_VF' ],
+    [ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
+    'IFLA_EXT_MASK' ],
+    [ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
+    'IFLA_PHYS_SWITCH_ID' ],
+    [ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
+    'IFLA_PHYS_PORT_NAME' ],
+    [ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
+    'RDMA_NL_NLDEV' ],
+    [ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
+    'RDMA_NLDEV_CMD_GET' ],
+    [ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
+    'RDMA_NLDEV_CMD_PORT_GET' ],
+    [ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
+    'RDMA_NLDEV_ATTR_DEV_INDEX' ],
+    [ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
+    'RDMA_NLDEV_ATTR_DEV_NAME' ],
+    [ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
+    'RDMA_NLDEV_ATTR_PORT_INDEX' ],
+    [ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
+    'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
+    [ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
+    'mlx5dv_dump_dr_domain'],
+    [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
+    'mlx5dv_dr_action_create_flow_sampler'],
+    [ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
+    'mlx5dv_dr_domain_set_reclaim_device_memory'],
+    [ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
+    'mlx5dv_dr_action_create_dest_array'],
+    [ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
+    [ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
+    'mlx5dv_dr_action_create_aso' ],
+    [ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
+    'INFINIBAND_VERBS_H' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
+        dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix : file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3],
+        prefix : file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx5_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx5_glue'
-	dlopen_lib_name = 'rte_common_' + dlopen_name
-	dlopen_so_version = LIB_GLUE_VERSION
-	dlopen_sources = files('mlx5_glue.c')
-	dlopen_install_dir = [ eal_pmd_path + '-glue' ]
-	dlopen_includes = [global_inc]
-	dlopen_includes += include_directories(
-		'../../../../lib/librte_eal/include/generic',
-	)
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: dlopen_includes,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx5_glue'
+    dlopen_lib_name = 'rte_common_' + dlopen_name
+    dlopen_so_version = LIB_GLUE_VERSION
+    dlopen_sources = files('mlx5_glue.c')
+    dlopen_install_dir = [ eal_pmd_path + '-glue' ]
+    dlopen_includes = [global_inc]
+    dlopen_includes += include_directories(
+        '../../../../lib/librte_eal/include/generic',
+    )
+    shared_lib = shared_library(
+        dlopen_lib_name,
+        dlopen_sources,
+        include_directories: dlopen_includes,
+        c_args: cflags,
+        dependencies: libs,
+        link_args: [
+        '-Wl,-export-dynamic',
+        '-Wl,-h,@0@'.format(LIB_GLUE),
+        ],
+        soversion: dlopen_so_version,
+        install: true,
+        install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index b2efea4432..f8618a5518 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -2,38 +2,38 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not (is_linux or (is_windows and is_ms_linker))
-	build = false
-	reason = 'only supported on Linux and Windows build with clang'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows build with clang'
+    subdir_done()
 endif
 
 deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs']
 sources += files(
-	'mlx5_devx_cmds.c',
-	'mlx5_common.c',
-	'mlx5_common_mp.c',
-	'mlx5_common_mr.c',
-	'mlx5_malloc.c',
-	'mlx5_common_pci.c',
-	'mlx5_common_devx.c',
+    'mlx5_devx_cmds.c',
+    'mlx5_common.c',
+    'mlx5_common_mp.c',
+    'mlx5_common_mr.c',
+    'mlx5_malloc.c',
+    'mlx5_common_pci.c',
+    'mlx5_common_devx.c',
 )
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 subdir(exec_env)
diff --git a/drivers/common/mlx5/windows/meson.build b/drivers/common/mlx5/windows/meson.build
index 16349c34f1..062a4aa3c5 100644
--- a/drivers/common/mlx5/windows/meson.build
+++ b/drivers/common/mlx5/windows/meson.build
@@ -4,17 +4,17 @@
 includes += include_directories('.')
 
 sources += files(
-	'mlx5_glue.c',
-	'mlx5_common_os.c',
+    'mlx5_glue.c',
+    'mlx5_common_os.c',
 )
 
 res_lib = run_command(python3, '-c', 'import os; print(os.environ["DEVX_LIB_PATH"])')
 res_inc = run_command(python3, '-c', 'import os; print(os.environ["DEVX_INC_PATH"])')
 
 if (res_lib.returncode() != 0 or res_inc.returncode() != 0)
-	build = false
-	reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
-	subdir_done()
+    build = false
+    reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
+    subdir_done()
 endif
 
 devx_lib_dir = res_lib.stdout().strip()
@@ -23,21 +23,21 @@ devx_inc_dir = res_inc.stdout().strip()
 ext_deps += cc.find_library('mlx5devx', dirs: devx_lib_dir, required: true)
 includes += include_directories(devx_inc_dir)
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 # Generate an empty mlx5_autoconf.h file for compatibility with Linux
diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index 7cd968b382..e20407b861 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -6,9 +6,9 @@
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/common/octeontx2/meson.build b/drivers/common/octeontx2/meson.build
index 84fb11524d..8de99b6a34 100644
--- a/drivers/common/octeontx2/meson.build
+++ b/drivers/common/octeontx2/meson.build
@@ -3,18 +3,18 @@
 #
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources= files('otx2_dev.c',
-		'otx2_irq.c',
-		'otx2_mbox.c',
-		'otx2_common.c',
-		'otx2_sec_idev.c',
-	       )
+        'otx2_irq.c',
+        'otx2_mbox.c',
+        'otx2_common.c',
+        'otx2_sec_idev.c',
+           )
 
 deps = ['eal', 'pci', 'ethdev', 'kvargs']
 includes += include_directories('../../common/octeontx2',
-		'../../mempool/octeontx2', '../../bus/pci')
+        '../../mempool/octeontx2', '../../bus/pci')
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 67f7aca974..c9a6926419 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -9,55 +9,55 @@ qat_compress_path = 'compress/qat'
 qat_compress_relpath = '../../' + qat_compress_path
 
 if disabled_drivers.contains(qat_crypto_path)
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 if disabled_drivers.contains(qat_compress_path)
-	qat_compress = false
-	dpdk_drvs_disabled += qat_compress_path
-	set_variable(qat_compress_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_compress = false
+    dpdk_drvs_disabled += qat_compress_path
+    set_variable(qat_compress_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 
 libcrypto = dependency('libcrypto', required: false, method: 'pkg-config')
 if qat_crypto and not libcrypto.found()
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'missing dependency, libcrypto')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'missing dependency, libcrypto')
 endif
 
 # The driver should not build if both compression and crypto are disabled
 #FIXME common code depends on compression files so check only compress!
 if not qat_compress # and not qat_crypto
-	build = false
-	reason = '' # rely on reason for compress/crypto above
-	subdir_done()
+    build = false
+    reason = '' # rely on reason for compress/crypto above
+    subdir_done()
 endif
 
 deps += ['bus_pci', 'cryptodev', 'net', 'compressdev']
 sources += files('qat_common.c',
-		'qat_qp.c',
-		'qat_device.c',
-		'qat_logs.c')
+        'qat_qp.c',
+        'qat_device.c',
+        'qat_logs.c')
 includes += include_directories('qat_adf',
-		qat_crypto_relpath,
-		qat_compress_relpath)
+        qat_crypto_relpath,
+        qat_compress_relpath)
 
 if qat_compress
-	foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
-		sources += files(join_paths(qat_compress_relpath, f))
-	endforeach
+    foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
+        sources += files(join_paths(qat_compress_relpath, f))
+    endforeach
 endif
 
 if qat_crypto
-	foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
-			'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
-		sources += files(join_paths(qat_crypto_relpath, f))
-	endforeach
-	deps += ['security']
-	ext_deps += libcrypto
-	cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
+    foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
+            'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
+        sources += files(join_paths(qat_crypto_relpath, f))
+    endforeach
+    deps += ['security']
+    ext_deps += libcrypto
+    cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
 endif
diff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build
index 1a39418c65..f523204582 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -6,87 +6,87 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 sources = [
-	'efx_bootcfg.c',
-	'efx_crc32.c',
-	'efx_ev.c',
-	'efx_evb.c',
-	'efx_filter.c',
-	'efx_hash.c',
-	'efx_intr.c',
-	'efx_lic.c',
-	'efx_mac.c',
-	'efx_mae.c',
-	'efx_mcdi.c',
-	'efx_mon.c',
-	'efx_nic.c',
-	'efx_nvram.c',
-	'efx_pci.c',
-	'efx_phy.c',
-	'efx_port.c',
-	'efx_proxy.c',
-	'efx_rx.c',
-	'efx_sram.c',
-	'efx_tunnel.c',
-	'efx_tx.c',
-	'efx_vpd.c',
-	'efx_virtio.c',
-	'mcdi_mon.c',
-	'siena_mac.c',
-	'siena_mcdi.c',
-	'siena_nic.c',
-	'siena_nvram.c',
-	'siena_phy.c',
-	'siena_sram.c',
-	'siena_vpd.c',
-	'ef10_ev.c',
-	'ef10_evb.c',
-	'ef10_filter.c',
-	'ef10_image.c',
-	'ef10_intr.c',
-	'ef10_mac.c',
-	'ef10_mcdi.c',
-	'ef10_nic.c',
-	'ef10_nvram.c',
-	'ef10_phy.c',
-	'ef10_proxy.c',
-	'ef10_rx.c',
-	'ef10_tx.c',
-	'ef10_vpd.c',
-	'hunt_nic.c',
-	'medford_nic.c',
-	'medford2_nic.c',
-	'rhead_ev.c',
-	'rhead_intr.c',
-	'rhead_nic.c',
-	'rhead_pci.c',
-	'rhead_rx.c',
-	'rhead_tunnel.c',
-	'rhead_tx.c',
-	'rhead_virtio.c',
+    'efx_bootcfg.c',
+    'efx_crc32.c',
+    'efx_ev.c',
+    'efx_evb.c',
+    'efx_filter.c',
+    'efx_hash.c',
+    'efx_intr.c',
+    'efx_lic.c',
+    'efx_mac.c',
+    'efx_mae.c',
+    'efx_mcdi.c',
+    'efx_mon.c',
+    'efx_nic.c',
+    'efx_nvram.c',
+    'efx_pci.c',
+    'efx_phy.c',
+    'efx_port.c',
+    'efx_proxy.c',
+    'efx_rx.c',
+    'efx_sram.c',
+    'efx_tunnel.c',
+    'efx_tx.c',
+    'efx_vpd.c',
+    'efx_virtio.c',
+    'mcdi_mon.c',
+    'siena_mac.c',
+    'siena_mcdi.c',
+    'siena_nic.c',
+    'siena_nvram.c',
+    'siena_phy.c',
+    'siena_sram.c',
+    'siena_vpd.c',
+    'ef10_ev.c',
+    'ef10_evb.c',
+    'ef10_filter.c',
+    'ef10_image.c',
+    'ef10_intr.c',
+    'ef10_mac.c',
+    'ef10_mcdi.c',
+    'ef10_nic.c',
+    'ef10_nvram.c',
+    'ef10_phy.c',
+    'ef10_proxy.c',
+    'ef10_rx.c',
+    'ef10_tx.c',
+    'ef10_vpd.c',
+    'hunt_nic.c',
+    'medford_nic.c',
+    'medford2_nic.c',
+    'rhead_ev.c',
+    'rhead_intr.c',
+    'rhead_nic.c',
+    'rhead_pci.c',
+    'rhead_rx.c',
+    'rhead_tunnel.c',
+    'rhead_tx.c',
+    'rhead_virtio.c',
 ]
 
 extra_flags = [
-	'-Wno-sign-compare',
-	'-Wno-unused-parameter',
-	'-Wno-unused-variable',
-	'-Wno-empty-body',
-	'-Wno-unused-but-set-variable'
+    '-Wno-sign-compare',
+    '-Wno-unused-parameter',
+    '-Wno-unused-variable',
+    '-Wno-empty-body',
+    '-Wno-unused-but-set-variable'
 ]
 
 c_args = cflags
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 if build
-	base_lib = static_library('sfc_base', sources,
-		include_directories: includes,
-		dependencies: static_rte_eal,
-		c_args: c_args)
+    base_lib = static_library('sfc_base', sources,
+        include_directories: includes,
+        dependencies: static_rte_eal,
+        c_args: c_args)
 
-	base_objs = base_lib.extract_all_objects()
+    base_objs = base_lib.extract_all_objects()
 else
-	base_objs = []
+    base_objs = []
 endif
diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index 1ca9510733..e8bc1bc020 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -6,32 +6,32 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+    '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+    '-Waggregate-return',
+    '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 subdir('base')
@@ -39,8 +39,8 @@ objs = [base_objs]
 
 deps += ['bus_pci']
 sources = files(
-	'sfc_efx.c',
-	'sfc_efx_mcdi.c',
+    'sfc_efx.c',
+    'sfc_efx_mcdi.c',
 )
 
 includes += include_directories('base')
diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meson.build
index d847c2ea6f..4b3eaa2274 100644
--- a/drivers/compress/isal/meson.build
+++ b/drivers/compress/isal/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libisal', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libisal"'
+    build = false
+    reason = 'missing dependency, "libisal"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build
index 2a6dc3f7ca..f3b890f368 100644
--- a/drivers/compress/mlx5/meson.build
+++ b/drivers/compress/mlx5/meson.build
@@ -2,25 +2,25 @@
 # Copyright 2021 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 fmt_name = 'mlx5_compress'
 deps += ['common_mlx5', 'eal', 'compressdev']
 sources = files(
-	'mlx5_compress.c',
+    'mlx5_compress.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/compress/zlib/meson.build b/drivers/compress/zlib/meson.build
index 82cf0dddd6..f8937cad3e 100644
--- a/drivers/compress/zlib/meson.build
+++ b/drivers/compress/zlib/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "zlib"'
+    build = false
+    reason = 'missing dependency, "zlib"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build
index ea83e87740..0fcac2a8eb 100644
--- a/drivers/crypto/aesni_gcm/meson.build
+++ b/drivers/crypto/aesni_gcm/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.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('aesni_gcm_pmd.c', 'aesni_gcm_pmd_ops.c')
diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build
index 419b4743f5..ed6b9f53e4 100644
--- a/drivers/crypto/aesni_mb/meson.build
+++ b/drivers/crypto/aesni_mb/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.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
 
diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build
index 027173bc1e..40a4dbb7bb 100644
--- a/drivers/crypto/armv8/meson.build
+++ b/drivers/crypto/armv8/meson.build
@@ -3,9 +3,9 @@
 
 dep = dependency('libAArch64crypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libAArch64crypto"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libAArch64crypto"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 7aa0f05dbd..7801ab3480 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -5,16 +5,16 @@
 
 deps += ['eal', 'bus_vdev']
 sources = files(
-		'bcmfs_logs.c',
-		'bcmfs_device.c',
-		'bcmfs_vfio.c',
-		'bcmfs_qp.c',
-		'hw/bcmfs4_rm.c',
-		'hw/bcmfs5_rm.c',
-		'hw/bcmfs_rm_common.c',
-		'bcmfs_sym_pmd.c',
-		'bcmfs_sym_capabilities.c',
-		'bcmfs_sym_session.c',
-		'bcmfs_sym.c',
-		'bcmfs_sym_engine.c'
-		)
+        'bcmfs_logs.c',
+        'bcmfs_device.c',
+        'bcmfs_vfio.c',
+        'bcmfs_qp.c',
+        'hw/bcmfs4_rm.c',
+        'hw/bcmfs5_rm.c',
+        'hw/bcmfs_rm_common.c',
+        'bcmfs_sym_pmd.c',
+        'bcmfs_sym_capabilities.c',
+        'bcmfs_sym_session.c',
+        'bcmfs_sym.c',
+        'bcmfs_sym_engine.c'
+        )
diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build
index 68e6b1d44c..b28d5c66af 100644
--- a/drivers/crypto/caam_jr/meson.build
+++ b/drivers/crypto/caam_jr/meson.build
@@ -2,15 +2,15 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_vdev', 'bus_dpaa', 'security']
 sources = files('caam_jr_capabilities.c',
-		'caam_jr_hw.c',
-		'caam_jr_uio.c',
-		'caam_jr.c')
+        'caam_jr_hw.c',
+        'caam_jr_uio.c',
+        'caam_jr.c')
 
 includes += include_directories('../../bus/dpaa/include/')
 includes += include_directories('../../common/dpaax/')
diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index ff66427ae8..2d203fe729 100644
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build
@@ -2,21 +2,21 @@
 # Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 deps += 'bus_pci'
 
 sources = files('rte_ccp_pmd.c',
-		'ccp_crypto.c',
-		'ccp_dev.c',
-		'ccp_pci.c',
-		'ccp_pmd_ops.c')
+        'ccp_crypto.c',
+        'ccp_dev.c',
+        'ccp_pci.c',
+        'ccp_pmd_ops.c')
 
 ext_deps += dep
diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build
index 69c7264e5a..b007f06ba7 100644
--- a/drivers/crypto/dpaa2_sec/meson.build
+++ b/drivers/crypto/dpaa2_sec/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['security', 'mempool_dpaa2']
 sources = files('dpaa2_sec_dpseci.c',
-		'mc/dpseci.c')
+        'mc/dpseci.c')
 
 includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib')
diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build
index c391a26711..44fd60e5ae 100644
--- a/drivers/crypto/dpaa_sec/meson.build
+++ b/drivers/crypto/dpaa_sec/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa', 'mempool_dpaa', 'security']
diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build
index 7560fb7cfa..e6e0f08c3d 100644
--- a/drivers/crypto/kasumi/meson.build
+++ b/drivers/crypto/kasumi/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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
 
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index b4c55b5ff5..c0c828fbf8 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -5,9 +5,9 @@
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build
index 9c0e89c2c3..cef8379ba5 100644
--- a/drivers/crypto/nitrox/meson.build
+++ b/drivers/crypto/nitrox/meson.build
@@ -2,17 +2,17 @@
 # Copyright(C) 2019 Marvell International Ltd.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 sources = files(
-		'nitrox_device.c',
-		'nitrox_hal.c',
-		'nitrox_logs.c',
-		'nitrox_sym.c',
-		'nitrox_sym_capabilities.c',
-		'nitrox_sym_reqmgr.c',
-		'nitrox_qp.c'
-		)
+        'nitrox_device.c',
+        'nitrox_hal.c',
+        'nitrox_logs.c',
+        'nitrox_sym.c',
+        'nitrox_sym_capabilities.c',
+        'nitrox_sym_reqmgr.c',
+        'nitrox_qp.c'
+        )
diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build
index a353d37a10..f08801929d 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -1,17 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 deps += ['common_cpt']
 
 sources = files('otx_cryptodev.c',
-		'otx_cryptodev_capabilities.c',
-		'otx_cryptodev_hw_access.c',
-		'otx_cryptodev_mbox.c',
-		'otx_cryptodev_ops.c')
+        'otx_cryptodev_capabilities.c',
+        'otx_cryptodev_hw_access.c',
+        'otx_cryptodev_mbox.c',
+        'otx_cryptodev_ops.c')
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build
index 283818e5da..00b00df567 100644
--- a/drivers/crypto/octeontx2/meson.build
+++ b/drivers/crypto/octeontx2/meson.build
@@ -2,9 +2,9 @@
 # Copyright (C) 2019 Marvell International Ltd.
 
 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
 
 deps += ['bus_pci']
@@ -15,11 +15,11 @@ deps += ['eventdev']
 deps += ['security']
 
 sources = files('otx2_cryptodev.c',
-		'otx2_cryptodev_capabilities.c',
-		'otx2_cryptodev_hw_access.c',
-		'otx2_cryptodev_mbox.c',
-		'otx2_cryptodev_ops.c',
-		'otx2_cryptodev_sec.c')
+        'otx2_cryptodev_capabilities.c',
+        'otx2_cryptodev_hw_access.c',
+        'otx2_cryptodev_mbox.c',
+        'otx2_cryptodev_ops.c',
+        'otx2_cryptodev_sec.c')
 
 includes += include_directories('../../common/cpt')
 includes += include_directories('../../common/octeontx2')
diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index 47fb2bb751..b21fca0be3 100644
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index 92e0ed6565..523a901664 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -11,14 +11,14 @@ qat_deps += 'cryptodev'
 qat_deps += 'net'
 qat_deps += 'security'
 if dep.found()
-	# Add our sources files to the list
-	qat_sources += files('qat_sym_pmd.c',
-			     'qat_sym.c',
-			     'qat_sym_session.c',
-			     'qat_sym_hw_dp.c',
-			     'qat_asym_pmd.c',
-			     'qat_asym.c')
-	qat_ext_deps += dep
-	qat_cflags += '-DBUILD_QAT_SYM'
-	qat_cflags += '-DBUILD_QAT_ASYM'
+    # Add our sources files to the list
+    qat_sources += files('qat_sym_pmd.c',
+                 'qat_sym.c',
+                 'qat_sym_session.c',
+                 'qat_sym_hw_dp.c',
+                 'qat_asym_pmd.c',
+                 'qat_asym.c')
+    qat_ext_deps += dep
+    qat_cflags += '-DBUILD_QAT_SYM'
+    qat_cflags += '-DBUILD_QAT_ASYM'
 endif
diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build
index b67d9306e0..202577c085 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -3,16 +3,16 @@
 
 deps += ['bus_vdev', 'reorder']
 sources = files(
-	'rte_cryptodev_scheduler.c',
-	'scheduler_failover.c',
-	'scheduler_multicore.c',
-	'scheduler_pkt_size_distr.c',
-	'scheduler_pmd.c',
-	'scheduler_pmd_ops.c',
-	'scheduler_roundrobin.c',
+    'rte_cryptodev_scheduler.c',
+    'scheduler_failover.c',
+    'scheduler_multicore.c',
+    'scheduler_pkt_size_distr.c',
+    'scheduler_pmd.c',
+    'scheduler_pmd_ops.c',
+    'scheduler_roundrobin.c',
 )
 
 headers = files(
-	'rte_cryptodev_scheduler.h',
-	'rte_cryptodev_scheduler_operations.h',
+    'rte_cryptodev_scheduler.h',
+    'rte_cryptodev_scheduler_operations.h',
 )
diff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build
index c1c5fd37f7..0c087baa2a 100644
--- a/drivers/crypto/snow3g/meson.build
+++ b/drivers/crypto/snow3g/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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))
+    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
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 
 endif
 
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 20e9e9551e..950f411327 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -4,4 +4,4 @@
 includes += include_directories('../../../lib/librte_vhost')
 deps += 'bus_pci'
 sources = files('virtio_cryptodev.c', 'virtio_pci.c',
-		'virtio_rxtx.c', 'virtqueue.c')
+        'virtio_rxtx.c', 'virtqueue.c')
diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build
index c3454d799e..a5f77a22d8 100644
--- a/drivers/crypto/zuc/meson.build
+++ b/drivers/crypto/zuc/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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
 
diff --git a/drivers/event/dlb/meson.build b/drivers/event/dlb/meson.build
index bc158d2e0a..0ef923aced 100644
--- a/drivers/event/dlb/meson.build
+++ b/drivers/event/dlb/meson.build
@@ -8,13 +8,13 @@ if not is_linux or not dpdk_conf.has('RTE_ARCH_X86_64')
 endif
 
 sources = files('dlb.c',
-		'dlb_iface.c',
-		'dlb_xstats.c',
-		'pf/dlb_main.c',
-		'pf/dlb_pf.c',
-		'pf/base/dlb_resource.c',
-		'rte_pmd_dlb.c',
-		'dlb_selftest.c'
+        'dlb_iface.c',
+        'dlb_xstats.c',
+        'pf/dlb_main.c',
+        'pf/dlb_pf.c',
+        'pf/base/dlb_resource.c',
+        'rte_pmd_dlb.c',
+        'dlb_selftest.c'
 )
 
 headers = files('rte_pmd_dlb.h')
diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build
index f22638b8e4..5f2d7ccc8b 100644
--- a/drivers/event/dlb2/meson.build
+++ b/drivers/event/dlb2/meson.build
@@ -9,13 +9,13 @@ if not is_linux or not dpdk_conf.has('RTE_ARCH_X86_64')
 endif
 
 sources = files('dlb2.c',
-		'dlb2_iface.c',
-		'dlb2_xstats.c',
-		'pf/dlb2_main.c',
-		'pf/dlb2_pf.c',
-		'pf/base/dlb2_resource.c',
-		'rte_pmd_dlb2.c',
-		'dlb2_selftest.c'
+        'dlb2_iface.c',
+        'dlb2_xstats.c',
+        'pf/dlb2_main.c',
+        'pf/dlb2_pf.c',
+        'pf/base/dlb2_resource.c',
+        'rte_pmd_dlb2.c',
+        'dlb2_selftest.c'
 )
 
 headers = files('rte_pmd_dlb2.h')
diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build
index 85105a210b..4d7d0021ad 100644
--- a/drivers/event/dpaa/meson.build
+++ b/drivers/event/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['net_dpaa', 'crypto_dpaa_sec']
 sources = files('dpaa_eventdev.c')
diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build
index 21aff6276a..3553057788 100644
--- a/drivers/event/dpaa2/meson.build
+++ b/drivers/event/dpaa2/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec']
 sources = files('dpaa2_hw_dpcon.c',
-		'dpaa2_eventdev.c',
-		'dpaa2_eventdev_selftest.c')
+        'dpaa2_eventdev.c',
+        'dpaa2_eventdev_selftest.c')
 
 includes += include_directories('../../crypto/dpaa2_sec/')
diff --git a/drivers/event/dsw/meson.build b/drivers/event/dsw/meson.build
index 60ab13d906..2df0fac4ff 100644
--- a/drivers/event/dsw/meson.build
+++ b/drivers/event/dsw/meson.build
@@ -3,6 +3,6 @@
 
 deps += ['bus_vdev']
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
 sources = files('dsw_evdev.c', 'dsw_event.c', 'dsw_xstats.c')
diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build
index 41e367684c..c088554199 100644
--- a/drivers/event/octeontx/meson.build
+++ b/drivers/event/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = files('ssovf_worker.c',
-		'ssovf_evdev.c',
-		'ssovf_evdev_selftest.c',
-		'ssovf_probe.c',
-		'timvf_worker.c',
-		'timvf_evdev.c',
-		'timvf_probe.c'
+        'ssovf_evdev.c',
+        'ssovf_evdev_selftest.c',
+        'ssovf_probe.c',
+        'timvf_worker.c',
+        'timvf_evdev.c',
+        'timvf_probe.c'
 )
 
 deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx']
diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build
index 22e7e4cb63..f6f9e028ee 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -3,21 +3,21 @@
 #
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_worker.c',
-		'otx2_worker_dual.c',
-		'otx2_evdev.c',
-		'otx2_evdev_adptr.c',
-		'otx2_evdev_crypto_adptr.c',
-		'otx2_evdev_irq.c',
-		'otx2_evdev_selftest.c',
-		'otx2_tim_evdev.c',
-		'otx2_tim_worker.c'
-		)
+        'otx2_worker_dual.c',
+        'otx2_evdev.c',
+        'otx2_evdev_adptr.c',
+        'otx2_evdev_crypto_adptr.c',
+        'otx2_evdev_irq.c',
+        'otx2_evdev_selftest.c',
+        'otx2_tim_evdev.c',
+        'otx2_tim_worker.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'crypto_octeontx2', 'mempool_octeontx2', 'net_octeontx2']
 
diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build
index cc6029c6f0..e3ec3aaf71 100644
--- a/drivers/event/opdl/meson.build
+++ b/drivers/event/opdl/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = files(
-	'opdl_evdev.c',
-	'opdl_evdev_init.c',
-	'opdl_evdev_xstats.c',
-	'opdl_ring.c',
-	'opdl_test.c',
+    'opdl_evdev.c',
+    'opdl_evdev_init.c',
+    'opdl_evdev_xstats.c',
+    'opdl_ring.c',
+    'opdl_test.c',
 )
 deps += ['bus_vdev']
diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build
index 985012219b..db403b1b8f 100644
--- a/drivers/event/sw/meson.build
+++ b/drivers/event/sw/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('sw_evdev_scheduler.c',
-	'sw_evdev_selftest.c',
-	'sw_evdev_worker.c',
-	'sw_evdev_xstats.c',
-	'sw_evdev.c'
+    'sw_evdev_selftest.c',
+    'sw_evdev_worker.c',
+    'sw_evdev_xstats.c',
+    'sw_evdev.c'
 )
 deps += ['hash', 'bus_vdev']
diff --git a/drivers/mempool/bucket/meson.build b/drivers/mempool/bucket/meson.build
index 61de2dc9b9..0051b6ac3c 100644
--- a/drivers/mempool/bucket/meson.build
+++ b/drivers/mempool/bucket/meson.build
@@ -7,8 +7,8 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_bucket.c')
diff --git a/drivers/mempool/dpaa/meson.build b/drivers/mempool/dpaa/meson.build
index 09f5295d95..c4e9994b83 100644
--- a/drivers/mempool/dpaa/meson.build
+++ b/drivers/mempool/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa']
diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build
index 17ad0a8ea7..3d16d44158 100644
--- a/drivers/mempool/dpaa2/meson.build
+++ b/drivers/mempool/dpaa2/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_fslmc']
diff --git a/drivers/mempool/octeontx/meson.build b/drivers/mempool/octeontx/meson.build
index b5695a9329..2b8879d0c9 100644
--- a/drivers/mempool/octeontx/meson.build
+++ b/drivers/mempool/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('octeontx_fpavf.c',
-		'rte_mempool_octeontx.c'
+        'rte_mempool_octeontx.c'
 )
 
 deps += ['mbuf', 'bus_pci', 'common_octeontx']
diff --git a/drivers/mempool/octeontx2/meson.build b/drivers/mempool/octeontx2/meson.build
index 0586321abe..8a89288251 100644
--- a/drivers/mempool/octeontx2/meson.build
+++ b/drivers/mempool/octeontx2/meson.build
@@ -3,20 +3,20 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_mempool_ops.c',
-		'otx2_mempool.c',
-		'otx2_mempool_irq.c',
-		'otx2_mempool_debug.c'
-		)
+        'otx2_mempool.c',
+        'otx2_mempool_irq.c',
+        'otx2_mempool_debug.c'
+        )
 
 deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_octeontx2', 'mempool']
diff --git a/drivers/mempool/stack/meson.build b/drivers/mempool/stack/meson.build
index 8425772a42..371cf131b1 100644
--- a/drivers/mempool/stack/meson.build
+++ b/drivers/mempool/stack/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_stack.c')
diff --git a/drivers/net/af_packet/meson.build b/drivers/net/af_packet/meson.build
index 50a2f05d34..c014e9b61b 100644
--- a/drivers/net/af_packet/meson.build
+++ b/drivers/net/af_packet/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('rte_eth_af_packet.c')
diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index 60ccffabb9..3ed2b29784 100644
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -2,26 +2,26 @@
 # 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('rte_eth_af_xdp.c')
 
 bpf_dep = dependency('libbpf', required: false, method: 'pkg-config')
 if not bpf_dep.found()
-	bpf_dep = cc.find_library('bpf', required: false)
+    bpf_dep = cc.find_library('bpf', required: false)
 endif
 
 if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linux/if_xdp.h')
-	ext_deps += bpf_dep
-	bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
-			required: false, method: 'pkg-config')
-	if bpf_ver_dep.found()
-		dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
-	endif
+    ext_deps += bpf_dep
+    bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
+            required: false, method: 'pkg-config')
+    if bpf_ver_dep.found()
+        dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
+    endif
 else
-	build = false
-	reason = 'missing dependency, "libbpf"'
+    build = false
+    reason = 'missing dependency, "libbpf"'
 endif
diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build
index aea3ba493d..821e60ce23 100644
--- a/drivers/net/ark/meson.build
+++ b/drivers/net/ark/meson.build
@@ -2,20 +2,20 @@
 # 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
 
 headers = files('rte_pmd_ark.h')
 
 sources = files('ark_ddm.c',
-	'ark_ethdev.c',
-	'ark_ethdev_rx.c',
-	'ark_ethdev_tx.c',
-	'ark_mpu.c',
-	'ark_pktchkr.c',
-	'ark_pktdir.c',
-	'ark_pktgen.c',
-	'ark_rqp.c',
-	'ark_udm.c')
+    'ark_ethdev.c',
+    'ark_ethdev_rx.c',
+    'ark_ethdev_tx.c',
+    'ark_mpu.c',
+    'ark_pktchkr.c',
+    'ark_pktdir.c',
+    'ark_pktgen.c',
+    'ark_rqp.c',
+    'ark_udm.c')
diff --git a/drivers/net/atlantic/meson.build b/drivers/net/atlantic/meson.build
index 01373f868d..f26e09ab81 100644
--- a/drivers/net/atlantic/meson.build
+++ b/drivers/net/atlantic/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2018 Aquantia 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(
-	'atl_rxtx.c',
-	'atl_ethdev.c',
-	'atl_hw_regs.c',
-	'hw_atl/hw_atl_b0.c',
-	'hw_atl/hw_atl_llh.c',
-	'hw_atl/hw_atl_utils_fw2x.c',
-	'hw_atl/hw_atl_utils.c',
-	'rte_pmd_atlantic.c',
+    'atl_rxtx.c',
+    'atl_ethdev.c',
+    'atl_hw_regs.c',
+    'hw_atl/hw_atl_b0.c',
+    'hw_atl/hw_atl_llh.c',
+    'hw_atl/hw_atl_utils_fw2x.c',
+    'hw_atl/hw_atl_utils.c',
+    'rte_pmd_atlantic.c',
 )
diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
index 61c8d5b9f0..ea9dd1f20e 100644
--- a/drivers/net/avp/meson.build
+++ b/drivers/net/avp/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('avp_ethdev.c')
 headers = files('rte_avp_common.h', 'rte_avp_fifo.h')
diff --git a/drivers/net/axgbe/meson.build b/drivers/net/axgbe/meson.build
index 198e198767..cd2c747b13 100644
--- a/drivers/net/axgbe/meson.build
+++ b/drivers/net/axgbe/meson.build
@@ -2,19 +2,19 @@
 # Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('axgbe_ethdev.c',
-		'axgbe_dev.c',
-		'axgbe_mdio.c',
-		'axgbe_phy_impl.c',
-		'axgbe_i2c.c',
-		'axgbe_rxtx.c')
+        'axgbe_dev.c',
+        'axgbe_mdio.c',
+        'axgbe_phy_impl.c',
+        'axgbe_i2c.c',
+        'axgbe_rxtx.c')
 
 cflags += '-Wno-cast-qual'
 
 if arch_subdir == 'x86'
-	sources += files('axgbe_rxtx_vec_sse.c')
+    sources += files('axgbe_rxtx_vec_sse.c')
 endif
diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
index e260b75926..4714ec4935 100644
--- a/drivers/net/bnx2x/meson.build
+++ b/drivers/net/bnx2x/meson.build
@@ -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
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
@@ -13,9 +13,9 @@ reason = 'missing dependency, "zlib"'
 ext_deps += dep
 cflags += '-DZLIB_CONST'
 sources = files('bnx2x.c',
-	'bnx2x_ethdev.c',
-	'bnx2x_rxtx.c',
-	'bnx2x_stats.c',
-	'bnx2x_vfpf.c',
-	'ecore_sp.c',
-	'elink.c')
+    'bnx2x_ethdev.c',
+    'bnx2x_rxtx.c',
+    'bnx2x_stats.c',
+    'bnx2x_vfpf.c',
+    'ecore_sp.c',
+    'elink.c')
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 092655697f..0448e12bc3 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -3,9 +3,9 @@
 # Copyright(c) 2020 Broadcom
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 headers = files('rte_pmd_bnxt.h')
@@ -14,72 +14,72 @@ includes += include_directories('tf_ulp')
 includes += include_directories('tf_core')
 
 sources = files('bnxt_cpr.c',
-	'bnxt_ethdev.c',
-	'bnxt_filter.c',
-	'bnxt_flow.c',
-	'bnxt_hwrm.c',
-	'bnxt_irq.c',
-	'bnxt_ring.c',
-	'bnxt_rxq.c',
-	'bnxt_rxr.c',
-	'bnxt_stats.c',
-	'bnxt_txq.c',
-	'bnxt_txr.c',
-	'bnxt_util.c',
-	'bnxt_vnic.c',
-	'bnxt_reps.c',
+    'bnxt_ethdev.c',
+    'bnxt_filter.c',
+    'bnxt_flow.c',
+    'bnxt_hwrm.c',
+    'bnxt_irq.c',
+    'bnxt_ring.c',
+    'bnxt_rxq.c',
+    'bnxt_rxr.c',
+    'bnxt_stats.c',
+    'bnxt_txq.c',
+    'bnxt_txr.c',
+    'bnxt_util.c',
+    'bnxt_vnic.c',
+    'bnxt_reps.c',
 
-	'tf_core/tf_core.c',
-	'tf_core/bitalloc.c',
-	'tf_core/tf_msg.c',
-	'tf_core/rand.c',
-	'tf_core/stack.c',
+    'tf_core/tf_core.c',
+    'tf_core/bitalloc.c',
+    'tf_core/tf_msg.c',
+    'tf_core/rand.c',
+    'tf_core/stack.c',
         'tf_core/tf_em_common.c',
         'tf_core/tf_em_internal.c',
-	'tf_core/tf_rm.c',
-	'tf_core/tf_tbl.c',
-	'tf_core/tfp.c',
-	'tf_core/tf_session.c',
-	'tf_core/tf_device.c',
-	'tf_core/tf_device_p4.c',
-	'tf_core/tf_identifier.c',
-	'tf_core/tf_shadow_tbl.c',
-	'tf_core/tf_shadow_tcam.c',
-	'tf_core/tf_tcam.c',
-	'tf_core/tf_util.c',
-	'tf_core/tf_if_tbl.c',
-	'tf_core/ll.c',
-	'tf_core/tf_global_cfg.c',
-	'tf_core/tf_em_host.c',
-	'tf_core/tf_shadow_identifier.c',
-	'tf_core/tf_hash.c',
+    'tf_core/tf_rm.c',
+    'tf_core/tf_tbl.c',
+    'tf_core/tfp.c',
+    'tf_core/tf_session.c',
+    'tf_core/tf_device.c',
+    'tf_core/tf_device_p4.c',
+    'tf_core/tf_identifier.c',
+    'tf_core/tf_shadow_tbl.c',
+    'tf_core/tf_shadow_tcam.c',
+    'tf_core/tf_tcam.c',
+    'tf_core/tf_util.c',
+    'tf_core/tf_if_tbl.c',
+    'tf_core/ll.c',
+    'tf_core/tf_global_cfg.c',
+    'tf_core/tf_em_host.c',
+    'tf_core/tf_shadow_identifier.c',
+    'tf_core/tf_hash.c',
 
-	'hcapi/hcapi_cfa_p4.c',
+    'hcapi/hcapi_cfa_p4.c',
 
-	'tf_ulp/bnxt_ulp.c',
-	'tf_ulp/ulp_mark_mgr.c',
-	'tf_ulp/ulp_flow_db.c',
-	'tf_ulp/ulp_template_db_tbl.c',
-	'tf_ulp/ulp_template_db_class.c',
-	'tf_ulp/ulp_template_db_act.c',
-	'tf_ulp/ulp_utils.c',
-	'tf_ulp/ulp_mapper.c',
-	'tf_ulp/ulp_matcher.c',
-	'tf_ulp/ulp_rte_parser.c',
-	'tf_ulp/bnxt_ulp_flow.c',
-	'tf_ulp/ulp_port_db.c',
-	'tf_ulp/ulp_def_rules.c',
-	'tf_ulp/ulp_fc_mgr.c',
-	'tf_ulp/ulp_tun.c',
-	'tf_ulp/ulp_template_db_wh_plus_act.c',
-	'tf_ulp/ulp_template_db_wh_plus_class.c',
-	'tf_ulp/ulp_template_db_stingray_act.c',
-	'tf_ulp/ulp_template_db_stingray_class.c',
+    'tf_ulp/bnxt_ulp.c',
+    'tf_ulp/ulp_mark_mgr.c',
+    'tf_ulp/ulp_flow_db.c',
+    'tf_ulp/ulp_template_db_tbl.c',
+    'tf_ulp/ulp_template_db_class.c',
+    'tf_ulp/ulp_template_db_act.c',
+    'tf_ulp/ulp_utils.c',
+    'tf_ulp/ulp_mapper.c',
+    'tf_ulp/ulp_matcher.c',
+    'tf_ulp/ulp_rte_parser.c',
+    'tf_ulp/bnxt_ulp_flow.c',
+    'tf_ulp/ulp_port_db.c',
+    'tf_ulp/ulp_def_rules.c',
+    'tf_ulp/ulp_fc_mgr.c',
+    'tf_ulp/ulp_tun.c',
+    'tf_ulp/ulp_template_db_wh_plus_act.c',
+    'tf_ulp/ulp_template_db_wh_plus_class.c',
+    'tf_ulp/ulp_template_db_stingray_act.c',
+    'tf_ulp/ulp_template_db_stingray_class.c',
 
-	'rte_pmd_bnxt.c')
+    'rte_pmd_bnxt.c')
 
 if arch_subdir == 'x86'
-	sources += files('bnxt_rxtx_vec_sse.c')
+    sources += files('bnxt_rxtx_vec_sse.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('bnxt_rxtx_vec_neon.c')
+    sources += files('bnxt_rxtx_vec_neon.c')
 endif
diff --git a/drivers/net/bonding/meson.build b/drivers/net/bonding/meson.build
index 4682903a6f..67d7ab9d91 100644
--- a/drivers/net/bonding/meson.build
+++ b/drivers/net/bonding/meson.build
@@ -2,14 +2,14 @@
 # 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
 
 name = 'bond' #, james bond :-)
 sources = files('rte_eth_bond_api.c', 'rte_eth_bond_pmd.c', 'rte_eth_bond_flow.c',
-	'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
+    'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
 
 deps += 'sched' # needed for rte_bitmap.h
 deps += ['ip_frag']
diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
index 52896ea85c..5f6f7451a5 100644
--- a/drivers/net/cxgbe/meson.build
+++ b/drivers/net/cxgbe/meson.build
@@ -2,22 +2,22 @@
 # 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('cxgbe_ethdev.c',
-	'cxgbe_main.c',
-	'cxgbevf_ethdev.c',
-	'cxgbevf_main.c',
-	'sge.c',
-	'cxgbe_filter.c',
-	'cxgbe_flow.c',
-	'clip_tbl.c',
-	'mps_tcam.c',
-	'l2t.c',
-	'smt.c',
-	'base/t4_hw.c',
-	'base/t4vf_hw.c')
+    'cxgbe_main.c',
+    'cxgbevf_ethdev.c',
+    'cxgbevf_main.c',
+    'sge.c',
+    'cxgbe_filter.c',
+    'cxgbe_flow.c',
+    'clip_tbl.c',
+    'mps_tcam.c',
+    'l2t.c',
+    'smt.c',
+    'base/t4_hw.c',
+    'base/t4vf_hw.c')
 includes += include_directories('base')
diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build
index 0f72730b03..62989b24af 100644
--- a/drivers/net/dpaa/meson.build
+++ b/drivers/net/dpaa/meson.build
@@ -2,20 +2,20 @@
 # Copyright 2018-2020 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['mempool_dpaa']
 
 sources = files('dpaa_ethdev.c',
-		'fmlib/fm_lib.c',
-		'fmlib/fm_vsp.c',
-		'dpaa_flow.c',
-		'dpaa_rxtx.c',
-		'dpaa_fmc.c')
+        'fmlib/fm_lib.c',
+        'fmlib/fm_vsp.c',
+        'dpaa_flow.c',
+        'dpaa_rxtx.c',
+        'dpaa_fmc.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 headers = files('rte_pmd_dpaa.h')
diff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build
index f5f411d592..84319d2dbb 100644
--- a/drivers/net/dpaa2/meson.build
+++ b/drivers/net/dpaa2/meson.build
@@ -2,23 +2,23 @@
 # Copyright 2018-2021 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['mempool_dpaa2']
 sources = files('base/dpaa2_hw_dpni.c',
-		'dpaa2_tm.c',
-		'dpaa2_mux.c',
-		'dpaa2_ethdev.c',
-		'dpaa2_flow.c',
-		'dpaa2_rxtx.c',
-		'dpaa2_sparser.c',
-		'dpaa2_ptp.c',
-		'mc/dprtc.c',
-		'mc/dpkg.c',
-		'mc/dpdmux.c',
-		'mc/dpni.c')
+        'dpaa2_tm.c',
+        'dpaa2_mux.c',
+        'dpaa2_ethdev.c',
+        'dpaa2_flow.c',
+        'dpaa2_rxtx.c',
+        'dpaa2_sparser.c',
+        'dpaa2_ptp.c',
+        'mc/dprtc.c',
+        'mc/dpkg.c',
+        'mc/dpdmux.c',
+        'mc/dpni.c')
 
 includes += include_directories('base', 'mc')
 
diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index d13f693d3e..4d3a65fd7c 100644
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -2,37 +2,37 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'e1000_base.c',
-	'e1000_80003es2lan.c',
-	'e1000_82540.c',
-	'e1000_82541.c',
-	'e1000_82542.c',
-	'e1000_82543.c',
-	'e1000_82571.c',
-	'e1000_82575.c',
-	'e1000_api.c',
-	'e1000_i210.c',
-	'e1000_ich8lan.c',
-	'e1000_mac.c',
-	'e1000_manage.c',
-	'e1000_mbx.c',
-	'e1000_nvm.c',
-	'e1000_osdep.c',
-	'e1000_phy.c',
-	'e1000_vf.c'
+    'e1000_base.c',
+    'e1000_80003es2lan.c',
+    'e1000_82540.c',
+    'e1000_82541.c',
+    'e1000_82542.c',
+    'e1000_82543.c',
+    'e1000_82571.c',
+    'e1000_82575.c',
+    'e1000_api.c',
+    'e1000_i210.c',
+    'e1000_ich8lan.c',
+    'e1000_mac.c',
+    'e1000_manage.c',
+    'e1000_mbx.c',
+    'e1000_nvm.c',
+    'e1000_osdep.c',
+    'e1000_phy.c',
+    'e1000_vf.c'
 ]
 
 error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',
-	'-Wno-unused-variable', '-Wno-misleading-indentation',
-	'-Wno-implicit-fallthrough']
+    '-Wno-unused-variable', '-Wno-misleading-indentation',
+    '-Wno-implicit-fallthrough']
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('e1000_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/e1000/meson.build b/drivers/net/e1000/meson.build
index 43ad52cbc0..e2305c21a5 100644
--- a/drivers/net/e1000/meson.build
+++ b/drivers/net/e1000/meson.build
@@ -2,22 +2,22 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'e1000_logs.c',
-	'em_ethdev.c',
-	'em_rxtx.c',
-	'igb_ethdev.c',
-	'igb_flow.c',
-	'igb_pf.c',
-	'igb_rxtx.c'
+    'e1000_logs.c',
+    'em_ethdev.c',
+    'em_rxtx.c',
+    'igb_ethdev.c',
+    'igb_flow.c',
+    'igb_pf.c',
+    'igb_rxtx.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
index 772fbfc88e..d57b506a67 100644
--- a/drivers/net/ena/meson.build
+++ b/drivers/net/ena/meson.build
@@ -2,14 +2,14 @@
 # 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('ena_ethdev.c',
-	'base/ena_com.c',
-	'base/ena_eth_com.c')
+    'base/ena_com.c',
+    'base/ena_eth_com.c')
 
 deps += ['timer']
 
diff --git a/drivers/net/enetc/meson.build b/drivers/net/enetc/meson.build
index 850307c04e..1cfe6a089a 100644
--- a/drivers/net/enetc/meson.build
+++ b/drivers/net/enetc/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax']
 sources = files('enetc_ethdev.c',
-		'enetc_rxtx.c')
+        'enetc_rxtx.c')
 
 includes += include_directories('base')
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index 94fcc79c69..de520ff6f6 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -2,40 +2,40 @@
 # Copyright(c) 2018 Cisco Systems, 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(
-	'base/vnic_cq.c',
-	'base/vnic_dev.c',
-	'base/vnic_intr.c',
-	'base/vnic_rq.c',
-	'base/vnic_wq.c',
-	'enic_ethdev.c',
-	'enic_flow.c',
-	'enic_fm_flow.c',
-	'enic_main.c',
-	'enic_res.c',
-	'enic_rxtx.c',
-	'enic_vf_representor.c',
-	)
+    'base/vnic_cq.c',
+    'base/vnic_dev.c',
+    'base/vnic_intr.c',
+    'base/vnic_rq.c',
+    'base/vnic_wq.c',
+    'enic_ethdev.c',
+    'enic_flow.c',
+    'enic_fm_flow.c',
+    'enic_main.c',
+    'enic_res.c',
+    'enic_rxtx.c',
+    'enic_vf_representor.c',
+    )
 deps += ['hash']
 includes += include_directories('base')
 
 # The current implementation assumes 64-bit pointers
 if cc.get_define('__AVX2__', args: machine_args) != '' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('enic_rxtx_vec_avx2.c')
+    sources += files('enic_rxtx_vec_avx2.c')
 # Build the avx2 handler if the compiler supports it, even though 'machine'
 # does not. This is to support users who build for the min supported machine
 # and need to run the binary on newer CPUs too.
 # This part is from i40e meson.build
 elif cc.has_argument('-mavx2') and dpdk_conf.get('RTE_ARCH_64')
-	enic_avx2_lib = static_library('enic_avx2_lib',
-			'enic_rxtx_vec_avx2.c',
-			dependencies: [static_rte_ethdev, static_rte_bus_pci],
-			include_directories: includes,
-			c_args: [cflags, '-mavx2'])
-	objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
+    enic_avx2_lib = static_library('enic_avx2_lib',
+            'enic_rxtx_vec_avx2.c',
+            dependencies: [static_rte_ethdev, static_rte_bus_pci],
+            include_directories: includes,
+            c_args: [cflags, '-mavx2'])
+    objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
 endif
diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
index d8343be63c..5f6967bd8e 100644
--- a/drivers/net/failsafe/meson.build
+++ b/drivers/net/failsafe/meson.build
@@ -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
 
 cflags += '-std=gnu99'
@@ -12,16 +12,16 @@ cflags += '-D_DEFAULT_SOURCE'
 cflags += '-D_XOPEN_SOURCE=700'
 cflags += '-pedantic'
 if is_linux
-	cflags += '-DLINUX'
+    cflags += '-DLINUX'
 else
-	cflags += '-DBSD'
+    cflags += '-DBSD'
 endif
 
 sources = files('failsafe_args.c',
-	'failsafe.c',
-	'failsafe_eal.c',
-	'failsafe_ether.c',
-	'failsafe_flow.c',
-	'failsafe_intr.c',
-	'failsafe_ops.c',
-	'failsafe_rxtx.c')
+    'failsafe.c',
+    'failsafe_eal.c',
+    'failsafe_ether.c',
+    'failsafe_flow.c',
+    'failsafe_intr.c',
+    'failsafe_ops.c',
+    'failsafe_rxtx.c')
diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build
index 6ac11b2012..c6536558a9 100644
--- a/drivers/net/fm10k/base/meson.build
+++ b/drivers/net/fm10k/base/meson.build
@@ -2,27 +2,27 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'fm10k_api.c',
-	'fm10k_common.c',
-	'fm10k_mbx.c',
-	'fm10k_pf.c',
-	'fm10k_tlv.c',
-	'fm10k_vf.c'
+    'fm10k_api.c',
+    'fm10k_common.c',
+    'fm10k_mbx.c',
+    'fm10k_pf.c',
+    'fm10k_tlv.c',
+    'fm10k_vf.c'
 ]
 
 error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value',
-	'-Wno-strict-aliasing', '-Wno-format-extra-args',
-	'-Wno-unused-variable',
-	'-Wno-implicit-fallthrough'
+    '-Wno-strict-aliasing', '-Wno-format-extra-args',
+    '-Wno-unused-variable',
+    '-Wno-implicit-fallthrough'
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('fm10k_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/fm10k/meson.build b/drivers/net/fm10k/meson.build
index 299b9ffb58..2397b68a4b 100644
--- a/drivers/net/fm10k/meson.build
+++ b/drivers/net/fm10k/meson.build
@@ -2,20 +2,20 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'fm10k_ethdev.c',
-	'fm10k_rxtx.c',
+    'fm10k_ethdev.c',
+    'fm10k_rxtx.c',
 )
 if arch_subdir == 'x86'
-	sources += files('fm10k_rxtx_vec.c')
+    sources += files('fm10k_rxtx_vec.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/hinic/base/meson.build b/drivers/net/hinic/base/meson.build
index 6cf947f841..6b23d31574 100644
--- a/drivers/net/hinic/base/meson.build
+++ b/drivers/net/hinic/base/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 sources = [
-	'hinic_pmd_api_cmd.c',
-	'hinic_pmd_cfg.c',
-	'hinic_pmd_cmdq.c',
-	'hinic_pmd_eqs.c',
-	'hinic_pmd_hwdev.c',
-	'hinic_pmd_hwif.c',
-	'hinic_pmd_mgmt.c',
-	'hinic_pmd_niccfg.c',
-	'hinic_pmd_nicio.c',
-	'hinic_pmd_wq.c',
- 	'hinic_pmd_mbox.c',
+    'hinic_pmd_api_cmd.c',
+    'hinic_pmd_cfg.c',
+    'hinic_pmd_cmdq.c',
+    'hinic_pmd_eqs.c',
+    'hinic_pmd_hwdev.c',
+    'hinic_pmd_hwif.c',
+    'hinic_pmd_mgmt.c',
+    'hinic_pmd_niccfg.c',
+    'hinic_pmd_nicio.c',
+    'hinic_pmd_wq.c',
+     'hinic_pmd_mbox.c',
 ]
 
 extra_flags = []
@@ -32,6 +32,6 @@ deps += ['hash']
 c_args = cflags
 
 base_lib = static_library('hinic_base', sources,
-	dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
-	c_args: c_args)
+    dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index 61ea3954ca..8eac1542e9 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'hinic_pmd_ethdev.c',
-	'hinic_pmd_rx.c',
-	'hinic_pmd_tx.c',
- 	'hinic_pmd_flow.c',
-	)
+    'hinic_pmd_ethdev.c',
+    'hinic_pmd_rx.c',
+    'hinic_pmd_tx.c',
+     'hinic_pmd_flow.c',
+    )
 
 includes += include_directories('base')
diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build
index f6aac69a1a..6dc35fd7f1 100644
--- a/drivers/net/hns3/meson.build
+++ b/drivers/net/hns3/meson.build
@@ -2,37 +2,37 @@
 # Copyright(c) 2018-2019 Hisilicon Limited
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 if arch_subdir != 'x86' and arch_subdir != 'arm' or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
-	subdir_done()
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
+    subdir_done()
 endif
 
 sources = files('hns3_cmd.c',
-	'hns3_dcb.c',
-	'hns3_intr.c',
-	'hns3_ethdev.c',
-	'hns3_ethdev_vf.c',
-	'hns3_fdir.c',
-	'hns3_flow.c',
-	'hns3_mbx.c',
-	'hns3_regs.c',
-	'hns3_rss.c',
-	'hns3_rxtx.c',
-	'hns3_stats.c',
-	'hns3_mp.c',
-	'hns3_tm.c')
+    'hns3_dcb.c',
+    'hns3_intr.c',
+    'hns3_ethdev.c',
+    'hns3_ethdev_vf.c',
+    'hns3_fdir.c',
+    'hns3_flow.c',
+    'hns3_mbx.c',
+    'hns3_regs.c',
+    'hns3_rss.c',
+    'hns3_rxtx.c',
+    'hns3_stats.c',
+    'hns3_mp.c',
+    'hns3_tm.c')
 
 deps += ['hash']
 
 if arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('hns3_rxtx_vec.c')
-	if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
-		sources += files('hns3_rxtx_vec_sve.c')
-	endif
+    sources += files('hns3_rxtx_vec.c')
+    if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
+        sources += files('hns3_rxtx_vec_sve.c')
+    endif
 endif
diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 8bc6a0fa0b..4ee3b26e44 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -2,29 +2,29 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'i40e_adminq.c',
-	'i40e_common.c',
-	'i40e_dcb.c',
-	'i40e_diag.c',
-	'i40e_hmc.c',
-	'i40e_lan_hmc.c',
-	'i40e_nvm.c'
+    'i40e_adminq.c',
+    'i40e_common.c',
+    'i40e_dcb.c',
+    'i40e_diag.c',
+    'i40e_hmc.c',
+    'i40e_lan_hmc.c',
+    'i40e_nvm.c'
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-format-security',
-		'-Wno-format-nonliteral',
-		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
+        '-Wno-format', '-Wno-format-security',
+        '-Wno-format-nonliteral',
+        '-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('i40e_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index ce3cc658e9..187bfc1041 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -2,76 +2,76 @@
 # Copyright(c) 2017 Intel Corporation
 
 cflags += ['-DPF_DRIVER',
-	'-DVF_DRIVER',
-	'-DINTEGRATED_VF',
-	'-DX722_A0_SUPPORT']
+    '-DVF_DRIVER',
+    '-DINTEGRATED_VF',
+    '-DX722_A0_SUPPORT']
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'i40e_ethdev.c',
-	'i40e_rxtx.c',
-	'i40e_ethdev_vf.c',
-	'i40e_pf.c',
-	'i40e_fdir.c',
-	'i40e_flow.c',
-	'i40e_tm.c',
-	'i40e_hash.c',
-	'i40e_vf_representor.c',
-	'rte_pmd_i40e.c'
-	)
+    'i40e_ethdev.c',
+    'i40e_rxtx.c',
+    'i40e_ethdev_vf.c',
+    'i40e_pf.c',
+    'i40e_fdir.c',
+    'i40e_flow.c',
+    'i40e_tm.c',
+    'i40e_hash.c',
+    'i40e_vf_representor.c',
+    'rte_pmd_i40e.c'
+    )
 
 deps += ['hash']
 includes += include_directories('base')
 
 if arch_subdir == 'x86'
-	sources += files('i40e_rxtx_vec_sse.c')
+    sources += files('i40e_rxtx_vec_sse.c')
 
-	if is_windows and cc.get_id() != 'clang'
-		cflags += ['-fno-asynchronous-unwind-tables']
-	endif
+    if is_windows and cc.get_id() != 'clang'
+        cflags += ['-fno-asynchronous-unwind-tables']
+    endif
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('i40e_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		i40e_avx2_lib = static_library('i40e_avx2_lib',
-				'i40e_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('i40e_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        i40e_avx2_lib = static_library('i40e_avx2_lib',
+                'i40e_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
+    endif
 
-	i40e_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    i40e_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	i40e_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    i40e_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		i40e_avx512_lib = static_library('i40e_avx512_lib',
-				'i40e_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
-	endif
+    if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        i40e_avx512_lib = static_library('i40e_avx512_lib',
+                'i40e_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
+    endif
 elif arch_subdir == 'ppc'
        sources += files('i40e_rxtx_vec_altivec.c')
 elif arch_subdir == 'arm'
diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index ac2af81f75..b124af68d9 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 cflags += ['-Wno-strict-aliasing']
@@ -13,57 +13,57 @@ includes += include_directories('../../common/iavf')
 deps += ['common_iavf']
 
 sources = files(
-	'iavf_ethdev.c',
-	'iavf_rxtx.c',
-	'iavf_vchnl.c',
-	'iavf_generic_flow.c',
-	'iavf_fdir.c',
-	'iavf_hash.c',
+    'iavf_ethdev.c',
+    'iavf_rxtx.c',
+    'iavf_vchnl.c',
+    'iavf_generic_flow.c',
+    'iavf_fdir.c',
+    'iavf_hash.c',
 )
 
 if arch_subdir == 'x86'
-	sources += files('iavf_rxtx_vec_sse.c')
+    sources += files('iavf_rxtx_vec_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('iavf_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		iavf_avx2_lib = static_library('iavf_avx2_lib',
-				'iavf_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('iavf_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        iavf_avx2_lib = static_library('iavf_avx2_lib',
+                'iavf_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
+    endif
 
-	iavf_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    iavf_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	iavf_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    iavf_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		iavf_avx512_lib = static_library('iavf_avx512_lib',
-				'iavf_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
-	endif
+    if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        iavf_avx512_lib = static_library('iavf_avx512_lib',
+                'iavf_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
+    endif
 endif
 
 headers = files('rte_pmd_iavf.h')
diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build
index b82d05fe73..b3db171c25 100644
--- a/drivers/net/ice/base/meson.build
+++ b/drivers/net/ice/base/meson.build
@@ -2,34 +2,34 @@
 # Copyright(c) 2018-2021 Intel Corporation
 
 sources = [
-	'ice_controlq.c',
-	'ice_common.c',
-	'ice_sched.c',
-	'ice_switch.c',
-	'ice_nvm.c',
-	'ice_flex_pipe.c',
-	'ice_flow.c',
-	'ice_dcb.c',
-	'ice_fdir.c',
-	'ice_acl.c',
-	'ice_acl_ctrl.c',
-	'ice_vlan_mode.c',
+    'ice_controlq.c',
+    'ice_common.c',
+    'ice_sched.c',
+    'ice_switch.c',
+    'ice_nvm.c',
+    'ice_flex_pipe.c',
+    'ice_flow.c',
+    'ice_dcb.c',
+    'ice_fdir.c',
+    'ice_acl.c',
+    'ice_acl_ctrl.c',
+    'ice_vlan_mode.c',
 ]
 
 error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-variable',
-		'-Wno-unused-parameter',
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-variable',
+        '-Wno-unused-parameter',
 ]
 c_args = cflags
 
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ice_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build
index 9a67c8f7ba..682e3cc92c 100644
--- a/drivers/net/ice/meson.build
+++ b/drivers/net/ice/meson.build
@@ -2,73 +2,73 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ice_ethdev.c',
-	'ice_rxtx.c',
-	'ice_switch_filter.c',
-	'ice_generic_flow.c',
-	'ice_fdir_filter.c',
-	'ice_hash.c',
-	'ice_acl_filter.c'
-	)
+    'ice_ethdev.c',
+    'ice_rxtx.c',
+    'ice_switch_filter.c',
+    'ice_generic_flow.c',
+    'ice_fdir_filter.c',
+    'ice_hash.c',
+    'ice_acl_filter.c'
+    )
 
 deps += ['hash', 'net', 'common_iavf']
 includes += include_directories('base', '../../common/iavf')
 
 if arch_subdir == 'x86'
-	sources += files('ice_rxtx_vec_sse.c')
+    sources += files('ice_rxtx_vec_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		sources += files('ice_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		ice_avx2_lib = static_library('ice_avx2_lib',
-				'ice_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        sources += files('ice_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        ice_avx2_lib = static_library('ice_avx2_lib',
+                'ice_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
+    endif
 
-	ice_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    ice_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	ice_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    ice_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		ice_avx512_lib = static_library('ice_avx512_lib',
-				'ice_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
-	endif
+    if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        ice_avx512_lib = static_library('ice_avx512_lib',
+                'ice_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
+    endif
 endif
 
 sources += files('ice_dcf.c',
-		 'ice_dcf_vf_representor.c',
-		 'ice_dcf_ethdev.c',
-		 'ice_dcf_parent.c')
+         'ice_dcf_vf_representor.c',
+         'ice_dcf_ethdev.c',
+         'ice_dcf_parent.c')
 
 headers = files('rte_pmd_ice.h')
diff --git a/drivers/net/igc/base/meson.build b/drivers/net/igc/base/meson.build
index 690704fe02..e09c8b6c05 100644
--- a/drivers/net/igc/base/meson.build
+++ b/drivers/net/igc/base/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 sources = [
-	'igc_api.c',
-	'igc_base.c',
-	'igc_i225.c',
-	'igc_mac.c',
-	'igc_manage.c',
-	'igc_nvm.c',
-	'igc_osdep.c',
-	'igc_phy.c',
+    'igc_api.c',
+    'igc_base.c',
+    'igc_i225.c',
+    'igc_mac.c',
+    'igc_manage.c',
+    'igc_nvm.c',
+    'igc_osdep.c',
+    'igc_phy.c',
 ]
 
 base_lib = static_library('igc_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/igc/meson.build b/drivers/net/igc/meson.build
index b971e6f8c6..b62a5f7d38 100644
--- a/drivers/net/igc/meson.build
+++ b/drivers/net/igc/meson.build
@@ -2,20 +2,20 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'igc_logs.c',
-	'igc_ethdev.c',
-	'igc_txrx.c',
-	'igc_filter.c',
-	'igc_flow.c'
+    'igc_logs.c',
+    'igc_ethdev.c',
+    'igc_txrx.c',
+    'igc_filter.c',
+    'igc_flow.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build
index 631ea27f52..9b33d12a7f 100644
--- a/drivers/net/ionic/meson.build
+++ b/drivers/net/ionic/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2019 Pensando
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files(
-	'ionic_mac_api.c',
-	'ionic_rx_filter.c',
-	'ionic_rxtx.c',
-	'ionic_dev.c',
-	'ionic_ethdev.c',
-	'ionic_lif.c',
-	'ionic_main.c'
+    'ionic_mac_api.c',
+    'ionic_rx_filter.c',
+    'ionic_rxtx.c',
+    'ionic_dev.c',
+    'ionic_ethdev.c',
+    'ionic_lif.c',
+    'ionic_main.c'
 )
diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build
index 65de9d5172..6863cd9041 100644
--- a/drivers/net/ipn3ke/meson.build
+++ b/drivers/net/ipn3ke/meson.build
@@ -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
 
 #
@@ -16,15 +16,15 @@ endif
 #
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 includes += include_directories('../../raw/ifpga')
 
 sources += files('ipn3ke_ethdev.c',
-	'ipn3ke_representor.c',
-	'ipn3ke_tm.c',
-	'ipn3ke_flow.c')
+    'ipn3ke_representor.c',
+    'ipn3ke_tm.c',
+    'ipn3ke_flow.c')
 deps += ['bus_ifpga', 'ethdev', 'sched']
diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
index 48bbb86cb8..b7dfbc977b 100644
--- a/drivers/net/ixgbe/base/meson.build
+++ b/drivers/net/ixgbe/base/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'ixgbe_82598.c',
-	'ixgbe_82599.c',
-	'ixgbe_api.c',
-	'ixgbe_common.c',
-	'ixgbe_dcb_82598.c',
-	'ixgbe_dcb_82599.c',
-	'ixgbe_dcb.c',
-	'ixgbe_hv_vf.c',
-	'ixgbe_mbx.c',
-	'ixgbe_phy.c',
-	'ixgbe_vf.c',
-	'ixgbe_x540.c',
-	'ixgbe_x550.c'
+    'ixgbe_82598.c',
+    'ixgbe_82599.c',
+    'ixgbe_api.c',
+    'ixgbe_common.c',
+    'ixgbe_dcb_82598.c',
+    'ixgbe_dcb_82599.c',
+    'ixgbe_dcb.c',
+    'ixgbe_hv_vf.c',
+    'ixgbe_mbx.c',
+    'ixgbe_phy.c',
+    'ixgbe_vf.c',
+    'ixgbe_x540.c',
+    'ixgbe_x550.c'
 ]
 
 error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
-		]
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
+        ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ixgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build
index 76cbfb830b..e7ac0f2c7d 100644
--- a/drivers/net/ixgbe/meson.build
+++ b/drivers/net/ixgbe/meson.build
@@ -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
 
 cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
@@ -13,25 +13,25 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ixgbe_82599_bypass.c',
-	'ixgbe_bypass.c',
-	'ixgbe_ethdev.c',
-	'ixgbe_fdir.c',
-	'ixgbe_flow.c',
-	'ixgbe_ipsec.c',
-	'ixgbe_pf.c',
-	'ixgbe_rxtx.c',
-	'ixgbe_tm.c',
-	'ixgbe_vf_representor.c',
-	'rte_pmd_ixgbe.c'
+    'ixgbe_82599_bypass.c',
+    'ixgbe_bypass.c',
+    'ixgbe_ethdev.c',
+    'ixgbe_fdir.c',
+    'ixgbe_flow.c',
+    'ixgbe_ipsec.c',
+    'ixgbe_pf.c',
+    'ixgbe_rxtx.c',
+    'ixgbe_tm.c',
+    'ixgbe_vf_representor.c',
+    'rte_pmd_ixgbe.c'
 )
 
 deps += ['hash', 'security']
 
 if arch_subdir == 'x86'
-	sources += files('ixgbe_rxtx_vec_sse.c')
+    sources += files('ixgbe_rxtx_vec_sse.c')
 elif arch_subdir == 'arm'
-	sources += files('ixgbe_rxtx_vec_neon.c')
+    sources += files('ixgbe_rxtx_vec_neon.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
index 4d5e5fe368..c0751aeb59 100644
--- a/drivers/net/kni/meson.build
+++ b/drivers/net/kni/meson.build
@@ -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
 
 # this driver can be built if-and-only-if KNI library is buildable
diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build
index 4965ebe85f..e32029e853 100644
--- a/drivers/net/liquidio/meson.build
+++ b/drivers/net/liquidio/meson.build
@@ -2,13 +2,13 @@
 # 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('base/lio_23xx_vf.c',
-	'base/lio_mbox.c',
-	'lio_ethdev.c',
-	'lio_rxtx.c')
+    'base/lio_mbox.c',
+    'lio_ethdev.c',
+    'lio_rxtx.c')
 includes += include_directories('base')
diff --git a/drivers/net/memif/meson.build b/drivers/net/memif/meson.build
index 9c3ba432d0..3201f3babb 100644
--- a/drivers/net/memif/meson.build
+++ b/drivers/net/memif/meson.build
@@ -2,11 +2,11 @@
 # Copyright 2018-2019 Cisco Systems, Inc.  All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('rte_eth_memif.c',
-		'memif_socket.c')
+        'memif_socket.c')
 
 deps += ['hash']
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index d7602b748e..2ddfea51f0 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -3,9 +3,9 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 static_ibverbs = (get_option('ibverbs_link') == 'static')
@@ -14,74 +14,74 @@ LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+        '-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
+        '-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx4', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs,
+            required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources = files(
-	'mlx4.c',
-	'mlx4_ethdev.c',
-	'mlx4_flow.c',
-	'mlx4_intr.c',
-	'mlx4_mp.c',
-	'mlx4_mr.c',
-	'mlx4_rxq.c',
-	'mlx4_rxtx.c',
-	'mlx4_txq.c',
-	'mlx4_utils.c',
+    'mlx4.c',
+    'mlx4_ethdev.c',
+    'mlx4_flow.c',
+    'mlx4_intr.c',
+    'mlx4_mp.c',
+    'mlx4_mr.c',
+    'mlx4_rxq.c',
+    'mlx4_rxtx.c',
+    'mlx4_txq.c',
+    'mlx4_utils.c',
 )
 if not dlopen_ibverbs
-	sources += files('mlx4_glue.c')
+    sources += files('mlx4_glue.c')
 endif
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 # To maintain the compatibility with the make build system
 # mlx4_autoconf.h file is still generated.
@@ -90,49 +90,49 @@ endif
 #   "symbol to search", "struct member to search" ]
 #
 has_member_args = [
-	[ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
-	'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
+    [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
+    'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
-	'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
-	[ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
-	'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
+    [ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
+    'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
+    [ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
+    'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
+        dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix: file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3],
+        prefix: file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx4_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx4_glue'
-	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' ]
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: global_inc,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx4_glue'
+    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' ]
+    shared_lib = shared_library(
+        dlopen_lib_name,
+        dlopen_sources,
+        include_directories: global_inc,
+        c_args: cflags,
+        dependencies: libs,
+        link_args: [
+        '-Wl,-export-dynamic',
+        '-Wl,-h,@0@'.format(LIB_GLUE),
+        ],
+        soversion: dlopen_so_version,
+        install: true,
+        install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/net/mlx5/linux/meson.build b/drivers/net/mlx5/linux/meson.build
index 8412edce78..9eda20e822 100644
--- a/drivers/net/mlx5/linux/meson.build
+++ b/drivers/net/mlx5/linux/meson.build
@@ -3,12 +3,12 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_socket.c',
-	'mlx5_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_verbs.c',
-	'mlx5_mp_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+    'mlx5_socket.c',
+    'mlx5_os.c',
+    'mlx5_ethdev_os.c',
+    'mlx5_verbs.c',
+    'mlx5_mp_os.c',
+    'mlx5_vlan_os.c',
+    'mlx5_flow_os.c',
 )
 
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index f2fafbdd05..c071275d42 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -3,60 +3,60 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not (is_linux or is_windows)
-	build = false
-	reason = 'only supported on Linux and Windows'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5']
 sources = files(
-	'mlx5.c',
-	'mlx5_ethdev.c',
-	'mlx5_flow.c',
-	'mlx5_flow_meter.c',
-	'mlx5_flow_dv.c',
+    'mlx5.c',
+    'mlx5_ethdev.c',
+    'mlx5_flow.c',
+    'mlx5_flow_meter.c',
+    'mlx5_flow_dv.c',
         'mlx5_flow_age.c',
-	'mlx5_mac.c',
-	'mlx5_mr.c',
-	'mlx5_rss.c',
-	'mlx5_rxmode.c',
-	'mlx5_rxq.c',
-	'mlx5_rxtx.c',
-	'mlx5_stats.c',
-	'mlx5_trigger.c',
-	'mlx5_txq.c',
-	'mlx5_txpp.c',
-	'mlx5_vlan.c',
-	'mlx5_utils.c',
-	'mlx5_devx.c',
+    'mlx5_mac.c',
+    'mlx5_mr.c',
+    'mlx5_rss.c',
+    'mlx5_rxmode.c',
+    'mlx5_rxq.c',
+    'mlx5_rxtx.c',
+    'mlx5_stats.c',
+    'mlx5_trigger.c',
+    'mlx5_txq.c',
+    'mlx5_txpp.c',
+    'mlx5_vlan.c',
+    'mlx5_utils.c',
+    'mlx5_devx.c',
 )
 
 if is_linux
-	sources += files(
-		'mlx5_flow_verbs.c',
-	)
-	if (dpdk_conf.has('RTE_ARCH_X86_64')
-		or dpdk_conf.has('RTE_ARCH_ARM64')
-		or dpdk_conf.has('RTE_ARCH_PPC_64'))
-		sources += files('mlx5_rxtx_vec.c')
-	endif
+    sources += files(
+        'mlx5_flow_verbs.c',
+    )
+    if (dpdk_conf.has('RTE_ARCH_X86_64')
+        or dpdk_conf.has('RTE_ARCH_ARM64')
+        or dpdk_conf.has('RTE_ARCH_PPC_64'))
+        sources += files('mlx5_rxtx_vec.c')
+    endif
 endif
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 subdir(exec_env)
diff --git a/drivers/net/mlx5/windows/meson.build b/drivers/net/mlx5/windows/meson.build
index ddb6c6ca90..cb3460709c 100644
--- a/drivers/net/mlx5/windows/meson.build
+++ b/drivers/net/mlx5/windows/meson.build
@@ -3,9 +3,9 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_os.c',
-	'mlx5_mp_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+    'mlx5_os.c',
+    'mlx5_mp_os.c',
+    'mlx5_ethdev_os.c',
+    'mlx5_vlan_os.c',
+    'mlx5_flow_os.c',
 )
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 0be7b3d8ba..c0d516f5ed 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -4,23 +4,23 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mvneta_ethdev.c',
-	'mvneta_rxtx.c'
+    'mvneta_ethdev.c',
+    'mvneta_rxtx.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index bfda5439ba..8250c32544 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -4,26 +4,26 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mrvl_ethdev.c',
-	'mrvl_flow.c',
-	'mrvl_qos.c',
-	'mrvl_mtr.c',
-	'mrvl_tm.c'
+    'mrvl_ethdev.c',
+    'mrvl_flow.c',
+    'mrvl_qos.c',
+    'mrvl_mtr.c',
+    'mrvl_tm.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build
index c190124db0..1dac5e512b 100644
--- a/drivers/net/netvsc/meson.build
+++ b/drivers/net/netvsc/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Microsoft Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 build = dpdk_conf.has('RTE_BUS_VMBUS')
diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build
index f4a89b87d5..0af4ddf806 100644
--- a/drivers/net/nfb/meson.build
+++ b/drivers/net/nfb/meson.build
@@ -4,9 +4,9 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('netcope-common', required: false, method: 'pkg-config')
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 21b20c9ac9..766e9c737a 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
+    build = false
+    reason = 'only supported on 64-bit Linux'
 endif
 sources = files('nfpcore/nfp_cpp_pcie_ops.c',
-	'nfpcore/nfp_nsp.c',
-	'nfpcore/nfp_cppcore.c',
-	'nfpcore/nfp_resource.c',
-	'nfpcore/nfp_mip.c',
-	'nfpcore/nfp_nffw.c',
-	'nfpcore/nfp_rtsym.c',
-	'nfpcore/nfp_nsp_cmds.c',
-	'nfpcore/nfp_crc.c',
-	'nfpcore/nfp_mutex.c',
-	'nfpcore/nfp_nsp_eth.c',
-	'nfpcore/nfp_hwinfo.c',
-	'nfp_net.c')
+    'nfpcore/nfp_nsp.c',
+    'nfpcore/nfp_cppcore.c',
+    'nfpcore/nfp_resource.c',
+    'nfpcore/nfp_mip.c',
+    'nfpcore/nfp_nffw.c',
+    'nfpcore/nfp_rtsym.c',
+    'nfpcore/nfp_nsp_cmds.c',
+    'nfpcore/nfp_crc.c',
+    'nfpcore/nfp_mutex.c',
+    'nfpcore/nfp_nsp_eth.c',
+    'nfpcore/nfp_hwinfo.c',
+    'nfp_net.c')
diff --git a/drivers/net/null/meson.build b/drivers/net/null/meson.build
index d9fb88fd7d..0251578aab 100644
--- a/drivers/net/null/meson.build
+++ b/drivers/net/null/meson.build
@@ -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
 
 sources = files('rte_eth_null.c')
diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index b8fe4b3013..88dfca6e1b 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'octeontx_pkovf.c',
-	'octeontx_pkivf.c',
-	'octeontx_bgx.c'
+    'octeontx_pkovf.c',
+    'octeontx_pkivf.c',
+    'octeontx_bgx.c'
 ]
 
 depends = ['ethdev', 'mempool_octeontx']
 static_objs = []
 foreach d: depends
-	if not is_variable('shared_rte_' + d)
-		subdir_done()
-	endif
-	static_objs += get_variable('static_rte_' + d)
+    if not is_variable('shared_rte_' + d)
+        subdir_done()
+    endif
+    static_objs += get_variable('static_rte_' + d)
 endforeach
 
 c_args = cflags
 base_lib = static_library('octeontx_base', sources,
-	c_args: c_args,
-	dependencies: static_objs,
+    c_args: c_args,
+    dependencies: static_objs,
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 4e784b9484..1baac97688 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -2,18 +2,18 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('octeontx_rxtx.c',
-		'octeontx_ethdev.c',
-		'octeontx_ethdev_ops.c'
-		)
+        'octeontx_ethdev.c',
+        'octeontx_ethdev_ops.c'
+        )
 
 deps += ['mempool_octeontx', 'eventdev']
 
diff --git a/drivers/net/octeontx2/meson.build b/drivers/net/octeontx2/meson.build
index 779a75b5d0..fbcdd61e14 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,49 +3,49 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_rx.c',
-		'otx2_tx.c',
-		'otx2_tm.c',
-		'otx2_rss.c',
-		'otx2_mac.c',
-		'otx2_ptp.c',
-		'otx2_flow.c',
-		'otx2_link.c',
-		'otx2_vlan.c',
-		'otx2_stats.c',
-		'otx2_mcast.c',
-		'otx2_lookup.c',
-		'otx2_ethdev.c',
-		'otx2_flow_ctrl.c',
-		'otx2_flow_dump.c',
-		'otx2_flow_parse.c',
-		'otx2_flow_utils.c',
-		'otx2_ethdev_irq.c',
-		'otx2_ethdev_ops.c',
-		'otx2_ethdev_sec.c',
-		'otx2_ethdev_debug.c',
-		'otx2_ethdev_devargs.c'
-		)
+        'otx2_tx.c',
+        'otx2_tm.c',
+        'otx2_rss.c',
+        'otx2_mac.c',
+        'otx2_ptp.c',
+        'otx2_flow.c',
+        'otx2_link.c',
+        'otx2_vlan.c',
+        'otx2_stats.c',
+        'otx2_mcast.c',
+        'otx2_lookup.c',
+        'otx2_ethdev.c',
+        'otx2_flow_ctrl.c',
+        'otx2_flow_dump.c',
+        'otx2_flow_parse.c',
+        'otx2_flow_utils.c',
+        'otx2_ethdev_irq.c',
+        'otx2_ethdev_ops.c',
+        'otx2_ethdev_sec.c',
+        'otx2_ethdev_debug.c',
+        'otx2_ethdev_devargs.c'
+        )
 
 deps += ['bus_pci', 'cryptodev', 'eventdev', 'security']
 deps += ['common_octeontx2', 'mempool_octeontx2']
 
 extra_flags = ['-flax-vector-conversions']
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build
index b65d91e70a..61c0551582 100644
--- a/drivers/net/pcap/meson.build
+++ b/drivers/net/pcap/meson.build
@@ -2,14 +2,14 @@
 # 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 dpdk_conf.has('RTE_PORT_PCAP')
-	build = false
-	reason = 'missing dependency, "libpcap"'
+    build = false
+    reason = 'missing dependency, "libpcap"'
 endif
 sources = files('rte_eth_pcap.c')
 ext_deps += pcap_dep
diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build
index da0787c28c..811053ae90 100644
--- a/drivers/net/pfe/meson.build
+++ b/drivers/net/pfe/meson.build
@@ -2,18 +2,18 @@
 # Copyright 2019 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['common_dpaax']
 
 sources = files('pfe_ethdev.c',
-		'pfe_hal.c',
-		'pfe_hif_lib.c',
-		'pfe_hif.c')
+        'pfe_hal.c',
+        'pfe_hif_lib.c',
+        'pfe_hif.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/qede/base/meson.build b/drivers/net/qede/base/meson.build
index 03a6c44f53..d6ffc17991 100644
--- a/drivers/net/qede/base/meson.build
+++ b/drivers/net/qede/base/meson.build
@@ -2,47 +2,47 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = [
-	'bcm_osal.c',
-	'ecore_cxt.c',
-	'ecore_dcbx.c',
-	'ecore_dev.c',
-	'ecore_hw.c',
-	'ecore_init_fw_funcs.c',
-	'ecore_init_ops.c',
-	'ecore_int.c',
-	'ecore_l2.c',
-	'ecore_mcp.c',
-	'ecore_sp_commands.c',
-	'ecore_spq.c',
-	'ecore_sriov.c',
-	'ecore_vf.c',
+    'bcm_osal.c',
+    'ecore_cxt.c',
+    'ecore_dcbx.c',
+    'ecore_dev.c',
+    'ecore_hw.c',
+    'ecore_init_fw_funcs.c',
+    'ecore_init_ops.c',
+    'ecore_int.c',
+    'ecore_l2.c',
+    'ecore_mcp.c',
+    'ecore_sp_commands.c',
+    'ecore_spq.c',
+    'ecore_sriov.c',
+    'ecore_vf.c',
 ]
 
 
 error_cflags = [
-	'-Wno-unused-parameter',
-	'-Wno-sign-compare',
-	'-Wno-missing-prototypes',
-	'-Wno-cast-qual',
-	'-Wno-unused-function',
-	'-Wno-unused-variable',
-	'-Wno-strict-aliasing',
-	'-Wno-missing-prototypes',
-	'-Wno-unused-value',
-	'-Wno-format-nonliteral',
-	'-Wno-shift-negative-value',
-	'-Wno-unused-but-set-variable',
-	'-Wno-missing-declarations',
-	'-Wno-maybe-uninitialized',
-	'-Wno-strict-prototypes',
-	'-Wno-shift-negative-value',
-	'-Wno-implicit-fallthrough',
-	'-Wno-format-extra-args',
-	'-Wno-visibility',
-	'-Wno-empty-body',
-	'-Wno-invalid-source-encoding',
-	'-Wno-sometimes-uninitialized',
-	'-Wno-pointer-bool-conversion',
+    '-Wno-unused-parameter',
+    '-Wno-sign-compare',
+    '-Wno-missing-prototypes',
+    '-Wno-cast-qual',
+    '-Wno-unused-function',
+    '-Wno-unused-variable',
+    '-Wno-strict-aliasing',
+    '-Wno-missing-prototypes',
+    '-Wno-unused-value',
+    '-Wno-format-nonliteral',
+    '-Wno-shift-negative-value',
+    '-Wno-unused-but-set-variable',
+    '-Wno-missing-declarations',
+    '-Wno-maybe-uninitialized',
+    '-Wno-strict-prototypes',
+    '-Wno-shift-negative-value',
+    '-Wno-implicit-fallthrough',
+    '-Wno-format-extra-args',
+    '-Wno-visibility',
+    '-Wno-empty-body',
+    '-Wno-invalid-source-encoding',
+    '-Wno-sometimes-uninitialized',
+    '-Wno-pointer-bool-conversion',
 ]
 c_args = cflags
 foreach flag: error_cflags
@@ -52,6 +52,6 @@ foreach flag: error_cflags
 endforeach
 
 base_lib = static_library('qede_base', sources,
-	dependencies: [static_rte_net, static_rte_bus_pci],
-	c_args: c_args)
+    dependencies: [static_rte_net, static_rte_bus_pci],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 05ce69560b..03626eae77 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'qede_ethdev.c',
-	'qede_filter.c',
-	'qede_main.c',
-	'qede_rxtx.c',
-	'qede_debug.c',
-	'qede_regs.c',
-	'qede_sriov.c',
+    'qede_ethdev.c',
+    'qede_filter.c',
+    'qede_main.c',
+    'qede_rxtx.c',
+    'qede_debug.c',
+    'qede_regs.c',
+    'qede_sriov.c',
 )
 
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
diff --git a/drivers/net/ring/meson.build b/drivers/net/ring/meson.build
index fb6a5f7d66..0156b37aad 100644
--- a/drivers/net/ring/meson.build
+++ b/drivers/net/ring/meson.build
@@ -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
 
 sources = files('rte_eth_ring.c')
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index 0c5cfb9058..6ffbda5978 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -7,14 +7,14 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
@@ -24,42 +24,42 @@ extra_flags += '-Wno-strict-aliasing'
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+    '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+    '-Waggregate-return',
+    '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 deps += ['common_sfc_efx', 'bus_pci']
 sources = files(
-	'sfc_ethdev.c',
-	'sfc_kvargs.c',
-	'sfc.c',
-	'sfc_mcdi.c',
-	'sfc_sriov.c',
-	'sfc_intr.c',
-	'sfc_ev.c',
-	'sfc_port.c',
-	'sfc_rx.c',
-	'sfc_tx.c',
-	'sfc_tso.c',
-	'sfc_filter.c',
-	'sfc_switch.c',
-	'sfc_mae.c',
-	'sfc_flow.c',
-	'sfc_dp.c',
-	'sfc_ef10_rx.c',
-	'sfc_ef10_essb_rx.c',
-	'sfc_ef10_tx.c',
-	'sfc_ef100_rx.c',
-	'sfc_ef100_tx.c',
+    'sfc_ethdev.c',
+    'sfc_kvargs.c',
+    'sfc.c',
+    'sfc_mcdi.c',
+    'sfc_sriov.c',
+    'sfc_intr.c',
+    'sfc_ev.c',
+    'sfc_port.c',
+    'sfc_rx.c',
+    'sfc_tx.c',
+    'sfc_tso.c',
+    'sfc_filter.c',
+    'sfc_switch.c',
+    'sfc_mae.c',
+    'sfc_flow.c',
+    'sfc_dp.c',
+    'sfc_ef10_rx.c',
+    'sfc_ef10_essb_rx.c',
+    'sfc_ef10_tx.c',
+    'sfc_ef100_rx.c',
+    'sfc_ef100_tx.c',
 )
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index e31bdece7b..0bde03a0c3 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -2,23 +2,23 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 headers = files('rte_eth_softnic.h')
 sources = files('rte_eth_softnic_tm.c',
-	'rte_eth_softnic.c',
-	'rte_eth_softnic_mempool.c',
-	'rte_eth_softnic_swq.c',
-	'rte_eth_softnic_link.c',
-	'rte_eth_softnic_tap.c',
-	'rte_eth_softnic_action.c',
-	'rte_eth_softnic_pipeline.c',
-	'rte_eth_softnic_thread.c',
-	'rte_eth_softnic_cli.c',
-	'rte_eth_softnic_flow.c',
-	'rte_eth_softnic_meter.c',
-	'rte_eth_softnic_cryptodev.c',
-	'parser.c',
-	'conn.c')
+    'rte_eth_softnic.c',
+    'rte_eth_softnic_mempool.c',
+    'rte_eth_softnic_swq.c',
+    'rte_eth_softnic_link.c',
+    'rte_eth_softnic_tap.c',
+    'rte_eth_softnic_action.c',
+    'rte_eth_softnic_pipeline.c',
+    'rte_eth_softnic_thread.c',
+    'rte_eth_softnic_cli.c',
+    'rte_eth_softnic_flow.c',
+    'rte_eth_softnic_meter.c',
+    'rte_eth_softnic_cryptodev.c',
+    'parser.c',
+    'conn.c')
 deps += ['pipeline', 'port', 'table', 'sched', 'cryptodev']
diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
index 4f8f3325f6..dd288bfac8 100644
--- a/drivers/net/szedata2/meson.build
+++ b/drivers/net/szedata2/meson.build
@@ -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
 
 dep = dependency('libsze2', required: false, method: 'pkg-config')
diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build
index d51bd3190d..8b506a9c07 100644
--- a/drivers/net/tap/meson.build
+++ b/drivers/net/tap/meson.build
@@ -2,16 +2,16 @@
 # Copyright 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files(
-	'rte_eth_tap.c',
-	'tap_bpf_api.c',
-	'tap_flow.c',
-	'tap_intr.c',
-	'tap_netlink.c',
-	'tap_tcmsgs.c',
+    'rte_eth_tap.c',
+    'tap_bpf_api.c',
+    'tap_flow.c',
+    'tap_intr.c',
+    'tap_netlink.c',
+    'tap_tcmsgs.c',
 )
 
 deps = ['bus_vdev', 'gso', 'hash']
@@ -25,21 +25,21 @@ cflags += '-DTAP_MAX_QUEUES=16'
 #   "enum/define", "symbol to search" ]
 #
 args = [
-	[ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_UNSPEC' ],
-	[ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_KEY_VLAN_PRIO' ],
-	[ 'HAVE_TC_BPF', 'linux/pkt_cls.h',
-	  'TCA_BPF_UNSPEC' ],
-	[ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h',
-	  'TCA_BPF_FD' ],
-	[ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_UNSPEC' ],
-	[ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_FD' ],
+    [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h',
+      'TCA_FLOWER_UNSPEC' ],
+    [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h',
+      'TCA_FLOWER_KEY_VLAN_PRIO' ],
+    [ 'HAVE_TC_BPF', 'linux/pkt_cls.h',
+      'TCA_BPF_UNSPEC' ],
+    [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h',
+      'TCA_BPF_FD' ],
+    [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h',
+      'TCA_ACT_BPF_UNSPEC' ],
+    [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h',
+      'TCA_ACT_BPF_FD' ],
 ]
 config = configuration_data()
 foreach arg:args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
 endforeach
 configure_file(output : 'tap_autoconf.h', configuration : config)
diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build
index 8998264a3a..b75e1c83ec 100644
--- a/drivers/net/thunderx/base/meson.build
+++ b/drivers/net/thunderx/base/meson.build
@@ -2,15 +2,15 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'nicvf_hw.c',
-	'nicvf_mbox.c',
-	'nicvf_bsvf.c'
+    'nicvf_hw.c',
+    'nicvf_mbox.c',
+    'nicvf_bsvf.c'
 ]
 
 c_args = cflags
 base_lib = static_library('nicvf_base', sources,
-	c_args: c_args,
-	dependencies: static_rte_ethdev
+    c_args: c_args,
+    dependencies: static_rte_ethdev
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index dad5c59242..468a450ec0 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -2,25 +2,25 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('nicvf_rxtx.c',
-		'nicvf_ethdev.c',
-		'nicvf_svf.c'
+        'nicvf_ethdev.c',
+        'nicvf_svf.c'
 )
 
 if cc.has_argument('-fno-prefetch-loop-arrays')
-	cflags += '-fno-prefetch-loop-arrays'
+    cflags += '-fno-prefetch-loop-arrays'
 endif
 
 if cc.has_argument('-Wno-maybe-uninitialized')
-	cflags += '-Wno-maybe-uninitialized'
+    cflags += '-Wno-maybe-uninitialized'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build
index 33d0adf0d6..9b48ff1533 100644
--- a/drivers/net/txgbe/base/meson.build
+++ b/drivers/net/txgbe/base/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2015-2020
 
 sources = [
-	'txgbe_dcb_hw.c',
-	'txgbe_dcb.c',
-	'txgbe_eeprom.c',
-	'txgbe_hw.c',
-	'txgbe_mbx.c',
-	'txgbe_mng.c',
-	'txgbe_phy.c',
-	'txgbe_vf.c',
+    'txgbe_dcb_hw.c',
+    'txgbe_dcb.c',
+    'txgbe_eeprom.c',
+    'txgbe_hw.c',
+    'txgbe_mbx.c',
+    'txgbe_mng.c',
+    'txgbe_phy.c',
+    'txgbe_vf.c',
 ]
 
 error_cflags = []
 
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('txgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build
index 3b9994aa97..74290d439c 100644
--- a/drivers/net/txgbe/meson.build
+++ b/drivers/net/txgbe/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2015-2020
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'txgbe_ethdev.c',
-	'txgbe_ethdev_vf.c',
-	'txgbe_fdir.c',
-	'txgbe_flow.c',
-	'txgbe_ipsec.c',
-	'txgbe_ptypes.c',
-	'txgbe_pf.c',
-	'txgbe_rxtx.c',
-	'txgbe_tm.c',
+    'txgbe_ethdev.c',
+    'txgbe_ethdev_vf.c',
+    'txgbe_fdir.c',
+    'txgbe_flow.c',
+    'txgbe_ipsec.c',
+    'txgbe_ptypes.c',
+    'txgbe_pf.c',
+    'txgbe_rxtx.c',
+    'txgbe_tm.c',
 )
 
 deps += ['hash', 'security']
diff --git a/drivers/net/vdev_netvsc/meson.build b/drivers/net/vdev_netvsc/meson.build
index 49d3a2c7bb..b20a053bc2 100644
--- a/drivers/net/vdev_netvsc/meson.build
+++ b/drivers/net/vdev_netvsc/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('vdev_netvsc.c')
 
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
index 804b7a1dd1..858b79fdf5 100644
--- a/drivers/net/vhost/meson.build
+++ b/drivers/net/vhost/meson.build
@@ -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
 
 build = dpdk_conf.has('RTE_LIB_VHOST')
diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
index d595cfdcab..06bd0b6edc 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -2,54 +2,54 @@
 # 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('virtio.c',
-	'virtio_ethdev.c',
-	'virtio_pci_ethdev.c',
-	'virtio_pci.c',
-	'virtio_rxtx.c',
-	'virtio_rxtx_simple.c',
-	'virtqueue.c')
+    'virtio_ethdev.c',
+    'virtio_pci_ethdev.c',
+    'virtio_pci.c',
+    'virtio_rxtx.c',
+    'virtio_rxtx_simple.c',
+    'virtqueue.c')
 deps += ['kvargs', 'bus_pci']
 
 if arch_subdir == 'x86'
-	if not machine_args.contains('-mno-avx512f')
-		if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
-			cflags += ['-DCC_AVX512_SUPPORT']
-			virtio_avx512_lib = static_library('virtio_avx512_lib',
-					      'virtio_rxtx_packed.c',
-					      dependencies: [static_rte_ethdev,
-						static_rte_kvargs, static_rte_bus_pci],
-					      include_directories: includes,
-					      c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
-			objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
-			if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-				cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
-			elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-				cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
-			elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-				cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
-			endif
-		endif
-	endif
-	sources += files('virtio_rxtx_simple_sse.c')
+    if not machine_args.contains('-mno-avx512f')
+        if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
+            cflags += ['-DCC_AVX512_SUPPORT']
+            virtio_avx512_lib = static_library('virtio_avx512_lib',
+                          'virtio_rxtx_packed.c',
+                          dependencies: [static_rte_ethdev,
+                        static_rte_kvargs, static_rte_bus_pci],
+                          include_directories: includes,
+                          c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
+            objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
+            if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
+                cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
+            elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
+                cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
+            elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
+                cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
+            endif
+        endif
+    endif
+    sources += files('virtio_rxtx_simple_sse.c')
 elif arch_subdir == 'ppc'
-	sources += files('virtio_rxtx_simple_altivec.c')
+    sources += files('virtio_rxtx_simple_altivec.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('virtio_rxtx_packed.c')
-	sources += files('virtio_rxtx_simple_neon.c')
+    sources += files('virtio_rxtx_packed.c')
+    sources += files('virtio_rxtx_simple_neon.c')
 endif
 
 if is_linux
-	sources += files('virtio_user_ethdev.c',
-		'virtio_user/vhost_kernel.c',
-		'virtio_user/vhost_kernel_tap.c',
-		'virtio_user/vhost_user.c',
-		'virtio_user/vhost_vdpa.c',
-		'virtio_user/virtio_user_dev.c')
-	deps += ['bus_vdev']
+    sources += files('virtio_user_ethdev.c',
+        'virtio_user/vhost_kernel.c',
+        'virtio_user/vhost_kernel_tap.c',
+        'virtio_user/vhost_user.c',
+        'virtio_user/vhost_vdpa.c',
+        'virtio_user/virtio_user_dev.c')
+    deps += ['bus_vdev']
 endif
diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build
index 124238666c..1139281e51 100644
--- a/drivers/net/vmxnet3/meson.build
+++ b/drivers/net/vmxnet3/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources += files(
-	'vmxnet3_ethdev.c',
-	'vmxnet3_rxtx.c',
+    'vmxnet3_ethdev.c',
+    'vmxnet3_rxtx.c',
 )
 
 error_cflags = [
-		'-Wno-unused-parameter', '-Wno-unused-value',
+        '-Wno-unused-parameter', '-Wno-unused-value',
                 '-Wno-strict-aliasing', '-Wno-format-extra-args',
 ]
 foreach flag: error_cflags
diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
index 3549afafa1..a7e7f4b711 100644
--- a/drivers/raw/ifpga/base/meson.build
+++ b/drivers/raw/ifpga/base/meson.build
@@ -2,42 +2,42 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = [
-	'ifpga_api.c',
-	'ifpga_enumerate.c',
-	'ifpga_feature_dev.c',
-	'ifpga_fme.c',
-	'ifpga_fme_iperf.c',
-	'ifpga_fme_dperf.c',
-	'ifpga_fme_error.c',
-	'ifpga_port.c',
-	'ifpga_port_error.c',
-	'ifpga_fme_pr.c',
-	'ifpga_fme_rsu.c',
-	'ifpga_sec_mgr.c',
-	'opae_hw_api.c',
-	'opae_ifpga_hw_api.c',
-	'opae_debug.c',
-	'opae_spi.c',
-	'opae_spi_transaction.c',
-	'opae_intel_max10.c',
-	'opae_i2c.c',
-	'opae_at24_eeprom.c',
-	'opae_eth_group.c',
+    'ifpga_api.c',
+    'ifpga_enumerate.c',
+    'ifpga_feature_dev.c',
+    'ifpga_fme.c',
+    'ifpga_fme_iperf.c',
+    'ifpga_fme_dperf.c',
+    'ifpga_fme_error.c',
+    'ifpga_port.c',
+    'ifpga_port_error.c',
+    'ifpga_fme_pr.c',
+    'ifpga_fme_rsu.c',
+    'ifpga_sec_mgr.c',
+    'opae_hw_api.c',
+    'opae_ifpga_hw_api.c',
+    'opae_debug.c',
+    'opae_spi.c',
+    'opae_spi_transaction.c',
+    'opae_intel_max10.c',
+    'opae_i2c.c',
+    'opae_at24_eeprom.c',
+    'opae_eth_group.c',
 ]
 
 rtdep = dependency('librt', required: false)
 if not rtdep.found()
-	rtdep = cc.find_library('librt', required: false)
+    rtdep = cc.find_library('librt', required: false)
 endif
 if not rtdep.found()
-	build = false
-	reason = 'missing dependency, "librt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "librt"'
+    subdir_done()
 endif
 
 ext_deps += rtdep
 
 base_lib = static_library('ifpga_rawdev_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 60ea59ae28..aeccc1796d 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
-	'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
+    'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
 
 sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c')
 
diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build
index 6fbae05b78..9599b879c9 100644
--- a/drivers/raw/ioat/meson.build
+++ b/drivers/raw/ioat/meson.build
@@ -4,15 +4,15 @@
 build = dpdk_conf.has('RTE_ARCH_X86')
 reason = 'only supported on x86'
 sources = files(
-	'idxd_pci.c',
-	'idxd_vdev.c',
-	'ioat_common.c',
-	'ioat_rawdev.c',
-	'ioat_rawdev_test.c')
+    'idxd_pci.c',
+    'idxd_vdev.c',
+    'ioat_common.c',
+    'ioat_rawdev.c',
+    'ioat_rawdev_test.c')
 deps += ['bus_pci',
-	'bus_vdev',
-	'mbuf',
-	'rawdev']
+    'bus_vdev',
+    'mbuf',
+    'rawdev']
 
 headers = files('rte_ioat_rawdev.h',
-		'rte_ioat_rawdev_fns.h')
+        'rte_ioat_rawdev_fns.h')
diff --git a/drivers/raw/ntb/meson.build b/drivers/raw/ntb/meson.build
index 1b7c6eb449..bfe0b0e366 100644
--- a/drivers/raw/ntb/meson.build
+++ b/drivers/raw/ntb/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2019 Intel Corporation.
 
 deps += ['rawdev', 'mbuf', 'mempool',
-	 'pci', 'bus_pci']
+     'pci', 'bus_pci']
 sources = files('ntb.c',
                 'ntb_hw_intel.c')
 headers = files('rte_pmd_ntb.h')
diff --git a/drivers/raw/octeontx2_dma/meson.build b/drivers/raw/octeontx2_dma/meson.build
index 11f74680a5..e744fccaae 100644
--- a/drivers/raw/octeontx2_dma/meson.build
+++ b/drivers/raw/octeontx2_dma/meson.build
@@ -8,11 +8,11 @@ sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c')
 extra_flags = []
 # This integrated controller runs only on a arm64 machine, remove 32bit warnings
 if not dpdk_conf.get('RTE_ARCH_64')
-	extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
+    extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
 endif
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
diff --git a/drivers/raw/octeontx2_ep/meson.build b/drivers/raw/octeontx2_ep/meson.build
index 0e6338f76b..fed71db5e8 100644
--- a/drivers/raw/octeontx2_ep/meson.build
+++ b/drivers/raw/octeontx2_ep/meson.build
@@ -4,6 +4,6 @@
 
 deps += ['bus_pci', 'common_octeontx2', 'rawdev']
 sources = files('otx2_ep_rawdev.c',
-		'otx2_ep_enqdeq.c',
-		'otx2_ep_test.c',
-		'otx2_ep_vf.c')
+        'otx2_ep_enqdeq.c',
+        'otx2_ep_test.c',
+        'otx2_ep_vf.c')
diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build
index 87e9611812..cd8da347f2 100644
--- a/drivers/regex/mlx5/meson.build
+++ b/drivers/regex/mlx5/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2020 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['common_mlx5', 'eal', 'regexdev']
 sources = files(
-	'mlx5_regex.c',
-	'mlx5_rxp.c',
-	'mlx5_regex_devx.c',
-	'mlx5_regex_control.c',
-	'mlx5_regex_fastpath.c',
+    'mlx5_regex.c',
+    'mlx5_rxp.c',
+    'mlx5_regex_devx.c',
+    'mlx5_regex_control.c',
+    'mlx5_regex_fastpath.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/regex/octeontx2/meson.build b/drivers/regex/octeontx2/meson.build
index 6ccc8589a7..55af764b90 100644
--- a/drivers/regex/octeontx2/meson.build
+++ b/drivers/regex/octeontx2/meson.build
@@ -3,24 +3,24 @@
 #
 
 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
 
 lib = cc.find_library('librxp_compiler', required: false)
 if lib.found()
-	ext_deps += lib
-	ext_deps += cc.find_library('libstdc++', required: true)
-	includes += include_directories(inc_dir)
-	cflags += ['-DREE_COMPILER_SDK']
+    ext_deps += lib
+    ext_deps += cc.find_library('libstdc++', required: true)
+    includes += include_directories(inc_dir)
+    cflags += ['-DREE_COMPILER_SDK']
 endif
 
 sources = files('otx2_regexdev.c',
-		'otx2_regexdev_hw_access.c',
-		'otx2_regexdev_mbox.c',
-		'otx2_regexdev_compiler.c'
-		)
+        'otx2_regexdev_hw_access.c',
+        'otx2_regexdev_mbox.c',
+        'otx2_regexdev_compiler.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'regexdev']
 
diff --git a/drivers/vdpa/mlx5/meson.build b/drivers/vdpa/mlx5/meson.build
index a83ca86b3f..642a723195 100644
--- a/drivers/vdpa/mlx5/meson.build
+++ b/drivers/vdpa/mlx5/meson.build
@@ -2,35 +2,35 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched']
 sources = files(
-	'mlx5_vdpa.c',
-	'mlx5_vdpa_mem.c',
-	'mlx5_vdpa_event.c',
-	'mlx5_vdpa_virtq.c',
-	'mlx5_vdpa_steer.c',
-	'mlx5_vdpa_lm.c',
+    'mlx5_vdpa.c',
+    'mlx5_vdpa_mem.c',
+    'mlx5_vdpa_event.c',
+    'mlx5_vdpa_virtq.c',
+    'mlx5_vdpa_steer.c',
+    'mlx5_vdpa_lm.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
-- 
2.27.0

[dpdk-dev] [RFC PATCH 11/14] examples: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/bbdev_app/meson.build                |  2 +-
 examples/bond/meson.build                     |  2 +-
 examples/cmdline/meson.build                  |  2 +-
 examples/distributor/meson.build              |  4 +--
 examples/ethtool/meson.build                  |  8 ++---
 examples/eventdev_pipeline/meson.build        |  6 ++--
 examples/fips_validation/meson.build          | 22 +++++++-------
 examples/flow_classify/meson.build            |  2 +-
 examples/flow_filtering/meson.build           |  2 +-
 examples/helloworld/meson.build               |  2 +-
 examples/ioat/meson.build                     |  4 +--
 examples/ip_fragmentation/meson.build         |  2 +-
 examples/ip_pipeline/meson.build              | 30 +++++++++----------
 examples/ip_reassembly/meson.build            |  2 +-
 examples/ipsec-secgw/meson.build              | 26 ++++++++--------
 examples/ipv4_multicast/meson.build           |  2 +-
 examples/kni/meson.build                      |  4 +--
 examples/l2fwd-cat/meson.build                |  4 +--
 examples/l2fwd-crypto/meson.build             |  4 +--
 examples/l2fwd-event/meson.build              | 12 ++++----
 examples/l2fwd-jobstats/meson.build           |  2 +-
 examples/l2fwd-keepalive/meson.build          |  6 ++--
 examples/l2fwd/meson.build                    |  2 +-
 examples/l3fwd-acl/meson.build                |  2 +-
 examples/l3fwd-graph/meson.build              |  2 +-
 examples/l3fwd-power/meson.build              |  2 +-
 examples/l3fwd/meson.build                    |  4 +--
 examples/link_status_interrupt/meson.build    |  2 +-
 .../client_server_mp/mp_client/meson.build    |  2 +-
 .../client_server_mp/mp_server/meson.build    |  2 +-
 examples/multi_process/hotplug_mp/meson.build |  2 +-
 examples/multi_process/simple_mp/meson.build  |  2 +-
 .../multi_process/symmetric_mp/meson.build    |  2 +-
 examples/ntb/meson.build                      |  8 ++---
 examples/packet_ordering/meson.build          |  2 +-
 .../l3fwd-thread/meson.build                  | 20 ++++++-------
 .../pthread_shim/meson.build                  | 22 +++++++-------
 examples/pipeline/meson.build                 | 12 ++++----
 examples/ptpclient/meson.build                |  2 +-
 examples/qos_meter/meson.build                |  2 +-
 examples/qos_sched/meson.build                |  4 +--
 examples/rxtx_callbacks/meson.build           |  2 +-
 examples/service_cores/meson.build            |  2 +-
 examples/skeleton/meson.build                 |  2 +-
 examples/timer/meson.build                    |  2 +-
 examples/vdpa/meson.build                     |  6 ++--
 examples/vhost/meson.build                    | 10 +++----
 examples/vhost_blk/meson.build                | 10 +++----
 examples/vhost_crypto/meson.build             |  4 +--
 .../vm_power_manager/guest_cli/meson.build    |  2 +-
 examples/vm_power_manager/meson.build         | 20 ++++++-------
 examples/vmdq/meson.build                     |  2 +-
 examples/vmdq_dcb/meson.build                 |  2 +-
 53 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/examples/bbdev_app/meson.build b/examples/bbdev_app/meson.build
index 8e06a8a235..df8ee6842c 100644
--- a/examples/bbdev_app/meson.build
+++ b/examples/bbdev_app/meson.build
@@ -9,5 +9,5 @@
 deps += 'bbdev'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/bond/meson.build b/examples/bond/meson.build
index 69382ffcd2..eba94bfe8a 100644
--- a/examples/bond/meson.build
+++ b/examples/bond/meson.build
@@ -9,5 +9,5 @@
 deps += 'net_bond'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/cmdline/meson.build b/examples/cmdline/meson.build
index 7de0f16251..04b2995aa6 100644
--- a/examples/cmdline/meson.build
+++ b/examples/cmdline/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'commands.c', 'main.c', 'parse_obj_list.c'
+    'commands.c', 'main.c', 'parse_obj_list.c'
 )
diff --git a/examples/distributor/meson.build b/examples/distributor/meson.build
index d8dbc235fb..52e91ee784 100644
--- a/examples/distributor/meson.build
+++ b/examples/distributor/meson.build
@@ -9,11 +9,11 @@
 # require the power library
 build = dpdk_conf.has('RTE_LIB_POWER')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 allow_experimental_apis = true
 deps += ['distributor', 'power']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build
index 4d08bc4c57..1b57daaff1 100644
--- a/examples/ethtool/meson.build
+++ b/examples/ethtool/meson.build
@@ -8,17 +8,17 @@
 
 build = is_linux
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 sources = files('lib/rte_ethtool.c',
-	'ethtool-app/ethapp.c',
-	'ethtool-app/main.c')
+    'ethtool-app/ethapp.c',
+    'ethtool-app/main.c')
 includes = include_directories('lib', 'ethtool-app')
 
 deps += 'bus_pci'
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += 'net_ixgbe'
+    deps += 'net_ixgbe'
 endif
 
 allow_experimental_apis = true
diff --git a/examples/eventdev_pipeline/meson.build b/examples/eventdev_pipeline/meson.build
index 1dfeba0d3f..ca983aa056 100644
--- a/examples/eventdev_pipeline/meson.build
+++ b/examples/eventdev_pipeline/meson.build
@@ -9,7 +9,7 @@
 allow_experimental_apis = true
 deps += 'eventdev'
 sources = files(
-	'main.c',
-	'pipeline_worker_generic.c',
-	'pipeline_worker_tx.c'
+    'main.c',
+    'pipeline_worker_generic.c',
+    'pipeline_worker_tx.c'
 )
diff --git a/examples/fips_validation/meson.build b/examples/fips_validation/meson.build
index e2745d2786..6cdffc82f6 100644
--- a/examples/fips_validation/meson.build
+++ b/examples/fips_validation/meson.build
@@ -9,15 +9,15 @@
 deps += ['cryptodev']
 allow_experimental_apis = true
 sources = files(
-	'fips_validation_aes.c',
-	'fips_validation.c',
-	'fips_validation_hmac.c',
-	'fips_validation_tdes.c',
-	'fips_validation_gcm.c',
-	'fips_validation_cmac.c',
-	'fips_validation_ccm.c',
-	'fips_validation_sha.c',
-	'fips_validation_xts.c',
-	'fips_dev_self_test.c',
-	'main.c'
+    'fips_validation_aes.c',
+    'fips_validation.c',
+    'fips_validation_hmac.c',
+    'fips_validation_tdes.c',
+    'fips_validation_gcm.c',
+    'fips_validation_cmac.c',
+    'fips_validation_ccm.c',
+    'fips_validation_sha.c',
+    'fips_validation_xts.c',
+    'fips_dev_self_test.c',
+    'main.c'
 )
diff --git a/examples/flow_classify/meson.build b/examples/flow_classify/meson.build
index 56472e6819..c2364aa2f4 100644
--- a/examples/flow_classify/meson.build
+++ b/examples/flow_classify/meson.build
@@ -9,5 +9,5 @@
 deps += 'flow_classify'
 allow_experimental_apis = true
 sources = files(
-	'flow_classify.c'
+    'flow_classify.c'
 )
diff --git a/examples/flow_filtering/meson.build b/examples/flow_filtering/meson.build
index 6f5d1b08a9..cde1ef8ecd 100644
--- a/examples/flow_filtering/meson.build
+++ b/examples/flow_filtering/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c',
+    'main.c',
 )
diff --git a/examples/helloworld/meson.build b/examples/helloworld/meson.build
index 2b0a250361..0b893d2144 100644
--- a/examples/helloworld/meson.build
+++ b/examples/helloworld/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ioat/meson.build b/examples/ioat/meson.build
index e348196ba3..24057d9c1c 100644
--- a/examples/ioat/meson.build
+++ b/examples/ioat/meson.build
@@ -9,11 +9,11 @@
 allow_experimental_apis = true
 build = dpdk_conf.has('RTE_RAW_IOAT')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['raw_ioat']
 
 sources = files(
-	'ioatfwd.c'
+    'ioatfwd.c'
 )
diff --git a/examples/ip_fragmentation/meson.build b/examples/ip_fragmentation/meson.build
index 1230db4776..336a1fcb70 100644
--- a/examples/ip_fragmentation/meson.build
+++ b/examples/ip_fragmentation/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps +=  ['ip_frag', 'lpm']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ip_pipeline/meson.build b/examples/ip_pipeline/meson.build
index 945e28b58b..23c785cb47 100644
--- a/examples/ip_pipeline/meson.build
+++ b/examples/ip_pipeline/meson.build
@@ -8,24 +8,24 @@
 
 build = cc.has_header('sys/epoll.h')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['pipeline', 'bus_pci']
 allow_experimental_apis = true
 sources = files(
-	'action.c',
-	'cli.c',
-	'conn.c',
-	'kni.c',
-	'link.c',
-	'main.c',
-	'mempool.c',
-	'parser.c',
-	'pipeline.c',
-	'swq.c',
-	'tap.c',
-	'thread.c',
-	'tmgr.c',
-	'cryptodev.c'
+    'action.c',
+    'cli.c',
+    'conn.c',
+    'kni.c',
+    'link.c',
+    'main.c',
+    'mempool.c',
+    'parser.c',
+    'pipeline.c',
+    'swq.c',
+    'tap.c',
+    'thread.c',
+    'tmgr.c',
+    'cryptodev.c'
 )
diff --git a/examples/ip_reassembly/meson.build b/examples/ip_reassembly/meson.build
index 517bd4e19a..bf5eab6f0a 100644
--- a/examples/ip_reassembly/meson.build
+++ b/examples/ip_reassembly/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['lpm', 'ip_frag']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ipsec-secgw/meson.build b/examples/ipsec-secgw/meson.build
index d0373dab53..298a32bf64 100644
--- a/examples/ipsec-secgw/meson.build
+++ b/examples/ipsec-secgw/meson.build
@@ -9,17 +9,17 @@
 deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev']
 allow_experimental_apis = true
 sources = files(
-	'esp.c',
-	'event_helper.c',
-	'flow.c',
-	'ipsec.c',
-	'ipsec_process.c',
-	'ipsec-secgw.c',
-	'ipsec_worker.c',
-	'parser.c',
-	'rt.c',
-	'sa.c',
-	'sad.c',
-	'sp4.c',
-	'sp6.c'
+    'esp.c',
+    'event_helper.c',
+    'flow.c',
+    'ipsec.c',
+    'ipsec_process.c',
+    'ipsec-secgw.c',
+    'ipsec_worker.c',
+    'parser.c',
+    'rt.c',
+    'sa.c',
+    'sad.c',
+    'sp4.c',
+    'sp6.c'
 )
diff --git a/examples/ipv4_multicast/meson.build b/examples/ipv4_multicast/meson.build
index 7dc13fb8fc..a3f6673046 100644
--- a/examples/ipv4_multicast/meson.build
+++ b/examples/ipv4_multicast/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'hash'
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/kni/meson.build b/examples/kni/meson.build
index e119eebabb..e782f458d0 100644
--- a/examples/kni/meson.build
+++ b/examples/kni/meson.build
@@ -9,11 +9,11 @@
 # this app can be built if-and-only-if KNI library is buildable
 build = dpdk_conf.has('RTE_LIB_KNI')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['kni', 'bus_pci']
 sources = files(
-	'main.c'
+    'main.c'
 )
 allow_experimental_apis = true
diff --git a/examples/l2fwd-cat/meson.build b/examples/l2fwd-cat/meson.build
index 60169bcbda..3b48a0972a 100644
--- a/examples/l2fwd-cat/meson.build
+++ b/examples/l2fwd-cat/meson.build
@@ -9,12 +9,12 @@
 pqos = cc.find_library('pqos', required: false)
 build = pqos.found()
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 ext_deps += pqos
 allow_experimental_apis = true
 cflags += '-I/usr/local/include' # assume pqos lib installed in /usr/local
 sources = files(
-	'cat.c', 'l2fwd-cat.c'
+    'cat.c', 'l2fwd-cat.c'
 )
diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build
index 1813f015b2..8fe4c451dc 100644
--- a/examples/l2fwd-crypto/meson.build
+++ b/examples/l2fwd-crypto/meson.build
@@ -8,9 +8,9 @@
 
 deps += 'cryptodev'
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l2fwd-event/meson.build b/examples/l2fwd-event/meson.build
index 4a546eaf81..2388f59e91 100644
--- a/examples/l2fwd-event/meson.build
+++ b/examples/l2fwd-event/meson.build
@@ -10,10 +10,10 @@
 allow_experimental_apis = true
 deps += 'eventdev'
 sources = files(
-	'main.c',
-	'l2fwd_poll.c',
-	'l2fwd_common.c',
-	'l2fwd_event.c',
-	'l2fwd_event_internal_port.c',
-	'l2fwd_event_generic.c'
+    'main.c',
+    'l2fwd_poll.c',
+    'l2fwd_common.c',
+    'l2fwd_event.c',
+    'l2fwd_event_internal_port.c',
+    'l2fwd_event_generic.c'
 )
diff --git a/examples/l2fwd-jobstats/meson.build b/examples/l2fwd-jobstats/meson.build
index 72273736b6..a42914025f 100644
--- a/examples/l2fwd-jobstats/meson.build
+++ b/examples/l2fwd-jobstats/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['jobstats', 'timer']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l2fwd-keepalive/meson.build b/examples/l2fwd-keepalive/meson.build
index a56d679675..3ca5b6fd9c 100644
--- a/examples/l2fwd-keepalive/meson.build
+++ b/examples/l2fwd-keepalive/meson.build
@@ -9,12 +9,12 @@
 allow_experimental_apis = true
 librt = cc.find_library('rt', required: false)
 if not librt.found()
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 ext_deps += librt
 deps += 'timer'
 sources = files(
-	'main.c', 'shm.c'
+    'main.c', 'shm.c'
 )
diff --git a/examples/l2fwd/meson.build b/examples/l2fwd/meson.build
index 50d88caa0a..f50bf0927b 100644
--- a/examples/l2fwd/meson.build
+++ b/examples/l2fwd/meson.build
@@ -9,5 +9,5 @@
 # Enable experimental API flag as l2fwd uses rte_ethdev_set_ptype API
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l3fwd-acl/meson.build b/examples/l3fwd-acl/meson.build
index 6fa468b3aa..b0b42afcba 100644
--- a/examples/l3fwd-acl/meson.build
+++ b/examples/l3fwd-acl/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['acl', 'lpm', 'hash']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l3fwd-graph/meson.build b/examples/l3fwd-graph/meson.build
index a816bd8903..2550bdea7c 100644
--- a/examples/l3fwd-graph/meson.build
+++ b/examples/l3fwd-graph/meson.build
@@ -8,6 +8,6 @@
 
 deps += ['graph', 'eal', 'lpm', 'ethdev', 'node' ]
 sources = files(
-	'main.c'
+    'main.c'
 )
 allow_experimental_apis = true
diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index eb8aef306a..b4cb93c9c4 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -14,5 +14,5 @@ endif
 allow_experimental_apis = true
 deps += ['power', 'timer', 'lpm', 'hash', 'metrics', 'telemetry']
 sources = files(
-	'main.c', 'perf_core.c'
+    'main.c', 'perf_core.c'
 )
diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build
index 7d72b1b365..05b2ba45f0 100644
--- a/examples/l3fwd/meson.build
+++ b/examples/l3fwd/meson.build
@@ -9,6 +9,6 @@
 allow_experimental_apis = true
 deps += ['hash', 'lpm', 'eventdev']
 sources = files(
-	'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c',
-	'l3fwd_event_internal_port.c', 'l3fwd_event_generic.c', 'main.c'
+    'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c',
+    'l3fwd_event_internal_port.c', 'l3fwd_event_generic.c', 'main.c'
 )
diff --git a/examples/link_status_interrupt/meson.build b/examples/link_status_interrupt/meson.build
index 2b0a250361..0b893d2144 100644
--- a/examples/link_status_interrupt/meson.build
+++ b/examples/link_status_interrupt/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/multi_process/client_server_mp/mp_client/meson.build b/examples/multi_process/client_server_mp/mp_client/meson.build
index 69c3d3bfbe..e9edb216ee 100644
--- a/examples/multi_process/client_server_mp/mp_client/meson.build
+++ b/examples/multi_process/client_server_mp/mp_client/meson.build
@@ -10,5 +10,5 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-	'client.c'
+    'client.c'
 )
diff --git a/examples/multi_process/client_server_mp/mp_server/meson.build b/examples/multi_process/client_server_mp/mp_server/meson.build
index 0ef6424f4b..a166a0fb97 100644
--- a/examples/multi_process/client_server_mp/mp_server/meson.build
+++ b/examples/multi_process/client_server_mp/mp_server/meson.build
@@ -10,5 +10,5 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-	'args.c', 'init.c', 'main.c'
+    'args.c', 'init.c', 'main.c'
 )
diff --git a/examples/multi_process/hotplug_mp/meson.build b/examples/multi_process/hotplug_mp/meson.build
index f82f4d48a2..821e6d6bb2 100644
--- a/examples/multi_process/hotplug_mp/meson.build
+++ b/examples/multi_process/hotplug_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'commands.c', 'main.c'
+    'commands.c', 'main.c'
 )
diff --git a/examples/multi_process/simple_mp/meson.build b/examples/multi_process/simple_mp/meson.build
index cb02c65a69..6b4ee638d3 100644
--- a/examples/multi_process/simple_mp/meson.build
+++ b/examples/multi_process/simple_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'mp_commands.c', 'main.c'
+    'mp_commands.c', 'main.c'
 )
diff --git a/examples/multi_process/symmetric_mp/meson.build b/examples/multi_process/symmetric_mp/meson.build
index 14167825b0..201558f89c 100644
--- a/examples/multi_process/symmetric_mp/meson.build
+++ b/examples/multi_process/symmetric_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build
index 02be9fc80d..6010458e9d 100644
--- a/examples/ntb/meson.build
+++ b/examples/ntb/meson.build
@@ -8,15 +8,15 @@
 
 allow_experimental_apis = true
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'rawdev'
 cflags += ['-D_FILE_OFFSET_BITS=64']
 sources = files(
-	'ntb_fwd.c'
+    'ntb_fwd.c'
 )
 if dpdk_conf.has('RTE_RAW_NTB')
-	deps += 'raw_ntb'
+    deps += 'raw_ntb'
 endif
diff --git a/examples/packet_ordering/meson.build b/examples/packet_ordering/meson.build
index b381959145..99dd1bb76f 100644
--- a/examples/packet_ordering/meson.build
+++ b/examples/packet_ordering/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'reorder'
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/performance-thread/l3fwd-thread/meson.build b/examples/performance-thread/l3fwd-thread/meson.build
index 4858b201e4..58d4e96a45 100644
--- a/examples/performance-thread/l3fwd-thread/meson.build
+++ b/examples/performance-thread/l3fwd-thread/meson.build
@@ -8,7 +8,7 @@
 
 build = dpdk_conf.has('RTE_ARCH_X86_64')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['timer', 'lpm']
@@ -16,17 +16,17 @@ allow_experimental_apis = true
 
 # get the performance thread (pt) architecture subdir
 if dpdk_conf.has('RTE_ARCH_ARM64')
-	pt_arch_dir = '../common/arch/arm64'
+    pt_arch_dir = '../common/arch/arm64'
 else
-	pt_arch_dir = '../common/arch/x86'
+    pt_arch_dir = '../common/arch/x86'
 endif
 sources += files('main.c',
-	'../common/lthread.c',
-	'../common/lthread_cond.c',
-	'../common/lthread_diag.c',
-	'../common/lthread_mutex.c',
-	'../common/lthread_sched.c',
-	'../common/lthread_tls.c',
-	pt_arch_dir + '/ctx.c')
+    '../common/lthread.c',
+    '../common/lthread_cond.c',
+    '../common/lthread_diag.c',
+    '../common/lthread_mutex.c',
+    '../common/lthread_sched.c',
+    '../common/lthread_tls.c',
+    pt_arch_dir + '/ctx.c')
 
 includes += include_directories('../common', pt_arch_dir)
diff --git a/examples/performance-thread/pthread_shim/meson.build b/examples/performance-thread/pthread_shim/meson.build
index d499799307..866e6c94e8 100644
--- a/examples/performance-thread/pthread_shim/meson.build
+++ b/examples/performance-thread/pthread_shim/meson.build
@@ -8,7 +8,7 @@
 
 build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['timer']
@@ -16,18 +16,18 @@ allow_experimental_apis = true
 
 # get the performance thread (pt) architecture subdir
 if dpdk_conf.has('RTE_ARCH_ARM64')
-	pt_arch_dir = '../common/arch/arm64'
+    pt_arch_dir = '../common/arch/arm64'
 else
-	pt_arch_dir = '../common/arch/x86'
+    pt_arch_dir = '../common/arch/x86'
 endif
 sources += files('main.c',
-	'pthread_shim.c',
-	'../common/lthread.c',
-	'../common/lthread_cond.c',
-	'../common/lthread_diag.c',
-	'../common/lthread_mutex.c',
-	'../common/lthread_sched.c',
-	'../common/lthread_tls.c',
-	pt_arch_dir + '/ctx.c')
+    'pthread_shim.c',
+    '../common/lthread.c',
+    '../common/lthread_cond.c',
+    '../common/lthread_diag.c',
+    '../common/lthread_mutex.c',
+    '../common/lthread_sched.c',
+    '../common/lthread_tls.c',
+    pt_arch_dir + '/ctx.c')
 
 includes += include_directories('../common', pt_arch_dir)
diff --git a/examples/pipeline/meson.build b/examples/pipeline/meson.build
index 4f5925d7cf..02c0944f5a 100644
--- a/examples/pipeline/meson.build
+++ b/examples/pipeline/meson.build
@@ -8,15 +8,15 @@
 
 build = cc.has_header('sys/epoll.h')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['pipeline', 'bus_pci']
 allow_experimental_apis = true
 sources = files(
-	'cli.c',
-	'conn.c',
-	'main.c',
-	'obj.c',
-	'thread.c',
+    'cli.c',
+    'conn.c',
+    'main.c',
+    'obj.c',
+    'thread.c',
 )
diff --git a/examples/ptpclient/meson.build b/examples/ptpclient/meson.build
index d4171a2183..abe1961959 100644
--- a/examples/ptpclient/meson.build
+++ b/examples/ptpclient/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'ptpclient.c'
+    'ptpclient.c'
 )
diff --git a/examples/qos_meter/meson.build b/examples/qos_meter/meson.build
index 2f9ab13afd..43fff9cada 100644
--- a/examples/qos_meter/meson.build
+++ b/examples/qos_meter/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'meter'
 sources = files(
-	'main.c', 'rte_policer.c'
+    'main.c', 'rte_policer.c'
 )
diff --git a/examples/qos_sched/meson.build b/examples/qos_sched/meson.build
index ba59d3c9e5..ef8e40739c 100644
--- a/examples/qos_sched/meson.build
+++ b/examples/qos_sched/meson.build
@@ -9,6 +9,6 @@
 allow_experimental_apis = true
 deps += ['sched', 'cfgfile']
 sources = files(
-	'app_thread.c', 'args.c', 'cfg_file.c', 'cmdline.c',
-	'init.c', 'main.c', 'stats.c'
+    'app_thread.c', 'args.c', 'cfg_file.c', 'cmdline.c',
+    'init.c', 'main.c', 'stats.c'
 )
diff --git a/examples/rxtx_callbacks/meson.build b/examples/rxtx_callbacks/meson.build
index a7bf12dd3a..12b41f59f1 100644
--- a/examples/rxtx_callbacks/meson.build
+++ b/examples/rxtx_callbacks/meson.build
@@ -10,5 +10,5 @@
 allow_experimental_apis = true
 
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/service_cores/meson.build b/examples/service_cores/meson.build
index 2b0a250361..0b893d2144 100644
--- a/examples/service_cores/meson.build
+++ b/examples/service_cores/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/skeleton/meson.build b/examples/skeleton/meson.build
index ef46b187e7..7e0b7d1122 100644
--- a/examples/skeleton/meson.build
+++ b/examples/skeleton/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'basicfwd.c'
+    'basicfwd.c'
 )
diff --git a/examples/timer/meson.build b/examples/timer/meson.build
index 87c21a8679..e03b692667 100644
--- a/examples/timer/meson.build
+++ b/examples/timer/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'timer'
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vdpa/meson.build b/examples/vdpa/meson.build
index 26f6089c92..3ddbbc1265 100644
--- a/examples/vdpa/meson.build
+++ b/examples/vdpa/meson.build
@@ -7,12 +7,12 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vhost/meson.build b/examples/vhost/meson.build
index 9d9947c585..41ab9cfb1f 100644
--- a/examples/vhost/meson.build
+++ b/examples/vhost/meson.build
@@ -7,17 +7,17 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'main.c', 'virtio_net.c'
+    'main.c', 'virtio_net.c'
 )
 
 if dpdk_conf.has('RTE_RAW_IOAT')
-	deps += 'raw_ioat'
-	sources += files('ioat.c')
+    deps += 'raw_ioat'
+    sources += files('ioat.c')
 endif
diff --git a/examples/vhost_blk/meson.build b/examples/vhost_blk/meson.build
index 354ba05848..ad61577693 100644
--- a/examples/vhost_blk/meson.build
+++ b/examples/vhost_blk/meson.build
@@ -7,17 +7,17 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 if not cc.has_header('linux/virtio_blk.h')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'blk.c', 'vhost_blk.c', 'vhost_blk_compat.c'
+    'blk.c', 'vhost_blk.c', 'vhost_blk_compat.c'
 )
diff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build
index 403f210983..d379ba0787 100644
--- a/examples/vhost_crypto/meson.build
+++ b/examples/vhost_crypto/meson.build
@@ -8,11 +8,11 @@
 
 build = dpdk_conf.has('RTE_LIB_VHOST')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 allow_experimental_apis = true
 deps += ['vhost', 'cryptodev']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
index cd95266018..6ac09ef025 100644
--- a/examples/vm_power_manager/guest_cli/meson.build
+++ b/examples/vm_power_manager/guest_cli/meson.build
@@ -14,7 +14,7 @@ endif
 deps += ['power']
 
 sources = files(
-	'main.c', 'parse.c', 'vm_power_cli_guest.c'
+    'main.c', 'parse.c', 'vm_power_cli_guest.c'
 )
 
 allow_experimental_apis = true
diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index 637bd23235..67e72a222b 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -7,34 +7,34 @@
 # DPDK instance, use 'make'
 
 if not dpdk_conf.has('RTE_LIB_POWER')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += ['power']
 
 if dpdk_conf.has('RTE_NET_BNXT')
-	deps += ['net_bnxt']
+    deps += ['net_bnxt']
 endif
 
 if dpdk_conf.has('RTE_NET_I40E')
-	deps += ['net_i40e']
+    deps += ['net_i40e']
 endif
 
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += ['net_ixgbe']
+    deps += ['net_ixgbe']
 endif
 
 allow_experimental_apis = true
 sources = files(
-	'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
+    'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
 )
 
 # If we're on X86, pull in the x86 code for the branch monitor algo.
 if dpdk_conf.has('RTE_ARCH_X86_64')
-	sources += files('oob_monitor_x86.c')
+    sources += files('oob_monitor_x86.c')
 else
-	sources += files('oob_monitor_nop.c')
+    sources += files('oob_monitor_nop.c')
 endif
 
 opt_dep = cc.find_library('virt', required : false)
@@ -43,6 +43,6 @@ ext_deps += opt_dep
 
 opt_dep = dependency('jansson', required : false, method: 'pkg-config')
 if opt_dep.found()
-	ext_deps += opt_dep
-	cflags += '-DUSE_JANSSON'
+    ext_deps += opt_dep
+    cflags += '-DUSE_JANSSON'
 endif
diff --git a/examples/vmdq/meson.build b/examples/vmdq/meson.build
index 2b0a250361..0b893d2144 100644
--- a/examples/vmdq/meson.build
+++ b/examples/vmdq/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vmdq_dcb/meson.build b/examples/vmdq_dcb/meson.build
index 2b0a250361..0b893d2144 100644
--- a/examples/vmdq_dcb/meson.build
+++ b/examples/vmdq_dcb/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
-- 
2.27.0

[dpdk-dev] [RFC PATCH 12/14] app: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/test-bbdev/meson.build         |  12 +-
 app/test-compress-perf/meson.build |  10 +-
 app/test-crypto-perf/meson.build   |  20 +-
 app/test-eventdev/meson.build      |  24 +-
 app/test-flow-perf/meson.build     |   8 +-
 app/test-pipeline/meson.build      |  18 +-
 app/test-pmd/meson.build           |  60 +--
 app/test/meson.build               | 812 ++++++++++++++---------------
 8 files changed, 482 insertions(+), 482 deletions(-)

diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 6d50e03396..6fafd55b92 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('main.c',
-		'test_bbdev.c',
-		'test_bbdev_perf.c',
-		'test_bbdev_vector.c')
+        'test_bbdev.c',
+        'test_bbdev_perf.c',
+        'test_bbdev_vector.c')
 deps += ['bbdev', 'bus_vdev']
 if dpdk_conf.has('RTE_BASEBAND_FPGA_LTE_FEC')
-	deps += ['baseband_fpga_lte_fec']
+    deps += ['baseband_fpga_lte_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_FPGA_5GNR_FEC')
-	deps += ['baseband_fpga_5gnr_fec']
+    deps += ['baseband_fpga_5gnr_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_ACC100')
-	deps += ['baseband_acc100']
+    deps += ['baseband_acc100']
 endif
diff --git a/app/test-compress-perf/meson.build b/app/test-compress-perf/meson.build
index a1a484da9a..4dbf1c78f3 100644
--- a/app/test-compress-perf/meson.build
+++ b/app/test-compress-perf/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('comp_perf_options_parse.c',
-		'main.c',
-		'comp_perf_test_verify.c',
-		'comp_perf_test_throughput.c',
-		'comp_perf_test_cyclecount.c',
-		'comp_perf_test_common.c')
+        'main.c',
+        'comp_perf_test_verify.c',
+        'comp_perf_test_throughput.c',
+        'comp_perf_test_cyclecount.c',
+        'comp_perf_test_common.c')
 deps = ['compressdev']
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 558c648788..b974161c76 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('cperf_ops.c',
-		'cperf_options_parsing.c',
-		'cperf_test_common.c',
-		'cperf_test_latency.c',
-		'cperf_test_pmd_cyclecount.c',
-		'cperf_test_throughput.c',
-		'cperf_test_vector_parsing.c',
-		'cperf_test_vectors.c',
-		'cperf_test_verify.c',
-		'main.c')
+        'cperf_options_parsing.c',
+        'cperf_test_common.c',
+        'cperf_test_latency.c',
+        'cperf_test_pmd_cyclecount.c',
+        'cperf_test_throughput.c',
+        'cperf_test_vector_parsing.c',
+        'cperf_test_vectors.c',
+        'cperf_test_verify.c',
+        'main.c')
 deps += ['cryptodev', 'net', 'security']
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index 9e588d9ec7..edb3f293f2 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = files('evt_main.c',
-		'evt_options.c',
-		'evt_test.c',
-		'parser.c',
-		'test_order_common.c',
-		'test_order_atq.c',
-		'test_order_queue.c',
-		'test_perf_common.c',
-		'test_perf_atq.c',
-		'test_perf_queue.c',
-		'test_pipeline_common.c',
-		'test_pipeline_atq.c',
-		'test_pipeline_queue.c')
+        'evt_options.c',
+        'evt_test.c',
+        'parser.c',
+        'test_order_common.c',
+        'test_order_atq.c',
+        'test_order_queue.c',
+        'test_perf_common.c',
+        'test_perf_atq.c',
+        'test_perf_queue.c',
+        'test_pipeline_common.c',
+        'test_pipeline_atq.c',
+        'test_pipeline_queue.c')
 deps += 'eventdev'
diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build
index 6eaf83b41a..2cfb03963f 100644
--- a/app/test-flow-perf/meson.build
+++ b/app/test-flow-perf/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2020 Mellanox Technologies, Ltd
 
 sources = files(
-	'actions_gen.c',
-	'flow_gen.c',
-	'items_gen.c',
-	'main.c',
+    'actions_gen.c',
+    'flow_gen.c',
+    'items_gen.c',
+    'main.c',
 )
 
 deps += ['ethdev']
diff --git a/app/test-pipeline/meson.build b/app/test-pipeline/meson.build
index d5eddaba99..bfe9b0e246 100644
--- a/app/test-pipeline/meson.build
+++ b/app/test-pipeline/meson.build
@@ -2,13 +2,13 @@
 # Copyright(c) 2019 Intel Corporation
 
 sources = files(
-	'config.c',
-	'init.c',
-	'main.c',
-	'pipeline_acl.c',
-	'pipeline_hash.c',
-	'pipeline_lpm.c',
-	'pipeline_lpm_ipv6.c',
-	'pipeline_stub.c',
-	'runtime.c')
+    'config.c',
+    'init.c',
+    'main.c',
+    'pipeline_acl.c',
+    'pipeline_hash.c',
+    'pipeline_lpm.c',
+    'pipeline_lpm_ipv6.c',
+    'pipeline_stub.c',
+    'runtime.c')
 deps += ['pipeline', 'pci']
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 7e9c7bdd69..3adadbd98a 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -5,57 +5,57 @@
 name = 'testpmd'
 cflags += '-Wno-deprecated-declarations'
 sources = files('5tswap.c',
-	'cmdline.c',
-	'cmdline_flow.c',
-	'cmdline_mtr.c',
-	'cmdline_tm.c',
-	'config.c',
-	'csumonly.c',
-	'flowgen.c',
-	'icmpecho.c',
-	'ieee1588fwd.c',
-	'iofwd.c',
-	'macfwd.c',
-	'macswap.c',
-	'noisy_vnf.c',
-	'parameters.c',
-	'rxonly.c',
-	'testpmd.c',
-	'txonly.c',
-	'util.c')
+    'cmdline.c',
+    'cmdline_flow.c',
+    'cmdline_mtr.c',
+    'cmdline_tm.c',
+    'config.c',
+    'csumonly.c',
+    'flowgen.c',
+    'icmpecho.c',
+    'ieee1588fwd.c',
+    'iofwd.c',
+    'macfwd.c',
+    'macswap.c',
+    'noisy_vnf.c',
+    'parameters.c',
+    'rxonly.c',
+    'testpmd.c',
+    'txonly.c',
+    'util.c')
 
 deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-	deps += 'bitratestats'
+    deps += 'bitratestats'
 endif
 if dpdk_conf.has('RTE_LIB_PDUMP')
-	deps += 'pdump'
+    deps += 'pdump'
 endif
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-	deps += 'bitratestats'
+    deps += 'bitratestats'
 endif
 if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
-	deps += 'latencystats'
+    deps += 'latencystats'
 endif
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
 if dpdk_conf.has('RTE_NET_BOND')
-	deps += 'net_bond'
+    deps += 'net_bond'
 endif
 if dpdk_conf.has('RTE_NET_BNXT')
-	deps += 'net_bnxt'
+    deps += 'net_bnxt'
 endif
 if dpdk_conf.has('RTE_NET_I40E')
-	deps += 'net_i40e'
+    deps += 'net_i40e'
 endif
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += 'net_ixgbe'
+    deps += 'net_ixgbe'
 endif
 if dpdk_conf.has('RTE_NET_DPAA')
-	deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
+    deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
 endif
 if dpdk_conf.has('RTE_LIB_BPF')
-	sources += files('bpf_cmd.c')
-	deps += 'bpf'
+    sources += files('bpf_cmd.c')
+    deps += 'bpf'
 endif
diff --git a/app/test/meson.build b/app/test/meson.build
index 76eaaea457..4e068b1530 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -2,340 +2,340 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not get_option('tests')
-	subdir_done()
+    subdir_done()
 endif
 
 test_sources = files('commands.c',
-	'packet_burst_generator.c',
-	'test.c',
-	'test_acl.c',
-	'test_alarm.c',
-	'test_atomic.c',
-	'test_barrier.c',
-	'test_bitops.c',
-	'test_bitmap.c',
-	'test_bpf.c',
-	'test_byteorder.c',
-	'test_cmdline.c',
-	'test_cmdline_cirbuf.c',
-	'test_cmdline_etheraddr.c',
-	'test_cmdline_ipaddr.c',
-	'test_cmdline_lib.c',
-	'test_cmdline_num.c',
-	'test_cmdline_portlist.c',
-	'test_cmdline_string.c',
-	'test_common.c',
-	'test_cpuflags.c',
-	'test_crc.c',
-	'test_cryptodev.c',
-	'test_cryptodev_asym.c',
-	'test_cryptodev_blockcipher.c',
-	'test_cryptodev_security_pdcp.c',
-	'test_cycles.c',
-	'test_debug.c',
-	'test_distributor.c',
-	'test_distributor_perf.c',
-	'test_eal_flags.c',
-	'test_eal_fs.c',
-	'test_efd.c',
-	'test_efd_perf.c',
-	'test_errno.c',
-	'test_ethdev_link.c',
-	'test_event_crypto_adapter.c',
-	'test_event_eth_rx_adapter.c',
-	'test_event_ring.c',
-	'test_event_timer_adapter.c',
-	'test_eventdev.c',
-	'test_external_mem.c',
-	'test_fbarray.c',
-	'test_fib.c',
-	'test_fib_perf.c',
-	'test_fib6.c',
-	'test_fib6_perf.c',
-	'test_func_reentrancy.c',
-	'test_flow_classify.c',
-	'test_graph.c',
-	'test_graph_perf.c',
-	'test_hash.c',
-	'test_hash_functions.c',
-	'test_hash_multiwriter.c',
-	'test_hash_readwrite.c',
-	'test_hash_perf.c',
-	'test_hash_readwrite_lf_perf.c',
-	'test_interrupts.c',
-        'test_ipfrag.c',
-	'test_ipsec.c',
-	'test_ipsec_sad.c',
-	'test_ipsec_perf.c',
-	'test_kni.c',
-	'test_kvargs.c',
-	'test_lcores.c',
-	'test_logs.c',
-	'test_lpm.c',
-	'test_lpm6.c',
-	'test_lpm6_perf.c',
-	'test_lpm_perf.c',
-	'test_malloc.c',
-	'test_mbuf.c',
-	'test_member.c',
-	'test_member_perf.c',
-	'test_memcpy.c',
-	'test_memcpy_perf.c',
-	'test_memory.c',
-	'test_mempool.c',
-	'test_mempool_perf.c',
-	'test_memzone.c',
-	'test_meter.c',
-	'test_metrics.c',
-	'test_mcslock.c',
-	'test_mp_secondary.c',
-	'test_per_lcore.c',
-	'test_pmd_perf.c',
-	'test_power.c',
-	'test_power_cpufreq.c',
-	'test_power_kvm_vm.c',
-	'test_prefetch.c',
-	'test_rand_perf.c',
-	'test_rawdev.c',
-	'test_rcu_qsbr.c',
-	'test_rcu_qsbr_perf.c',
-	'test_reciprocal_division.c',
-	'test_reciprocal_division_perf.c',
-	'test_red.c',
-	'test_reorder.c',
-	'test_rib.c',
-	'test_rib6.c',
-	'test_ring.c',
-	'test_ring_mpmc_stress.c',
-	'test_ring_hts_stress.c',
-	'test_ring_mt_peek_stress.c',
-	'test_ring_mt_peek_stress_zc.c',
-	'test_ring_perf.c',
-	'test_ring_rts_stress.c',
-	'test_ring_st_peek_stress.c',
-	'test_ring_st_peek_stress_zc.c',
-	'test_ring_stress.c',
-	'test_rwlock.c',
-	'test_sched.c',
-	'test_security.c',
-	'test_service_cores.c',
-	'test_spinlock.c',
-	'test_stack.c',
-	'test_stack_perf.c',
-	'test_string_fns.c',
-	'test_table.c',
-	'test_table_acl.c',
-	'test_table_combined.c',
-	'test_table_pipeline.c',
-	'test_table_ports.c',
-	'test_table_tables.c',
-	'test_tailq.c',
-	'test_thash.c',
-	'test_timer.c',
-	'test_timer_perf.c',
-	'test_timer_racecond.c',
-	'test_timer_secondary.c',
-	'test_ticketlock.c',
-	'test_trace.c',
-	'test_trace_register.c',
-	'test_trace_perf.c',
-	'test_version.c',
-	'virtual_pmd.c'
+    'packet_burst_generator.c',
+    'test.c',
+    'test_acl.c',
+    'test_alarm.c',
+    'test_atomic.c',
+    'test_barrier.c',
+    'test_bitops.c',
+    'test_bitmap.c',
+    'test_bpf.c',
+    'test_byteorder.c',
+    'test_cmdline.c',
+    'test_cmdline_cirbuf.c',
+    'test_cmdline_etheraddr.c',
+    'test_cmdline_ipaddr.c',
+    'test_cmdline_lib.c',
+    'test_cmdline_num.c',
+    'test_cmdline_portlist.c',
+    'test_cmdline_string.c',
+    'test_common.c',
+    'test_cpuflags.c',
+    'test_crc.c',
+    'test_cryptodev.c',
+    'test_cryptodev_asym.c',
+    'test_cryptodev_blockcipher.c',
+    'test_cryptodev_security_pdcp.c',
+    'test_cycles.c',
+    'test_debug.c',
+    'test_distributor.c',
+    'test_distributor_perf.c',
+    'test_eal_flags.c',
+    'test_eal_fs.c',
+    'test_efd.c',
+    'test_efd_perf.c',
+    'test_errno.c',
+    'test_ethdev_link.c',
+    'test_event_crypto_adapter.c',
+    'test_event_eth_rx_adapter.c',
+    'test_event_ring.c',
+    'test_event_timer_adapter.c',
+    'test_eventdev.c',
+    'test_external_mem.c',
+    'test_fbarray.c',
+    'test_fib.c',
+    'test_fib_perf.c',
+    'test_fib6.c',
+    'test_fib6_perf.c',
+    'test_func_reentrancy.c',
+    'test_flow_classify.c',
+    'test_graph.c',
+    'test_graph_perf.c',
+    'test_hash.c',
+    'test_hash_functions.c',
+    'test_hash_multiwriter.c',
+    'test_hash_readwrite.c',
+    'test_hash_perf.c',
+    'test_hash_readwrite_lf_perf.c',
+    'test_interrupts.c',
+    'test_ipfrag.c',
+    'test_ipsec.c',
+    'test_ipsec_sad.c',
+    'test_ipsec_perf.c',
+    'test_kni.c',
+    'test_kvargs.c',
+    'test_lcores.c',
+    'test_logs.c',
+    'test_lpm.c',
+    'test_lpm6.c',
+    'test_lpm6_perf.c',
+    'test_lpm_perf.c',
+    'test_malloc.c',
+    'test_mbuf.c',
+    'test_member.c',
+    'test_member_perf.c',
+    'test_memcpy.c',
+    'test_memcpy_perf.c',
+    'test_memory.c',
+    'test_mempool.c',
+    'test_mempool_perf.c',
+    'test_memzone.c',
+    'test_meter.c',
+    'test_metrics.c',
+    'test_mcslock.c',
+    'test_mp_secondary.c',
+    'test_per_lcore.c',
+    'test_pmd_perf.c',
+    'test_power.c',
+    'test_power_cpufreq.c',
+    'test_power_kvm_vm.c',
+    'test_prefetch.c',
+    'test_rand_perf.c',
+    'test_rawdev.c',
+    'test_rcu_qsbr.c',
+    'test_rcu_qsbr_perf.c',
+    'test_reciprocal_division.c',
+    'test_reciprocal_division_perf.c',
+    'test_red.c',
+    'test_reorder.c',
+    'test_rib.c',
+    'test_rib6.c',
+    'test_ring.c',
+    'test_ring_mpmc_stress.c',
+    'test_ring_hts_stress.c',
+    'test_ring_mt_peek_stress.c',
+    'test_ring_mt_peek_stress_zc.c',
+    'test_ring_perf.c',
+    'test_ring_rts_stress.c',
+    'test_ring_st_peek_stress.c',
+    'test_ring_st_peek_stress_zc.c',
+    'test_ring_stress.c',
+    'test_rwlock.c',
+    'test_sched.c',
+    'test_security.c',
+    'test_service_cores.c',
+    'test_spinlock.c',
+    'test_stack.c',
+    'test_stack_perf.c',
+    'test_string_fns.c',
+    'test_table.c',
+    'test_table_acl.c',
+    'test_table_combined.c',
+    'test_table_pipeline.c',
+    'test_table_ports.c',
+    'test_table_tables.c',
+    'test_tailq.c',
+    'test_thash.c',
+    'test_timer.c',
+    'test_timer_perf.c',
+    'test_timer_racecond.c',
+    'test_timer_secondary.c',
+    'test_ticketlock.c',
+    'test_trace.c',
+    'test_trace_register.c',
+    'test_trace_perf.c',
+    'test_version.c',
+    'virtual_pmd.c'
 )
 
 test_deps = ['acl',
-	'bus_pci',
-	'bus_vdev',
-	'bitratestats',
-	'bpf',
-	'cfgfile',
-	'cmdline',
-	'cryptodev',
-	'distributor',
-	'efd',
-	'ethdev',
-	'eventdev',
-	'fib',
-	'flow_classify',
-	'graph',
-	'hash',
-	'ipsec',
-	'latencystats',
-	'lpm',
-	'member',
-	'metrics',
-	'node',
-	'pipeline',
-	'port',
-	'rawdev',
-	'rcu',
-	'reorder',
-	'rib',
-	'ring',
-	'security',
-	'stack',
-	'telemetry',
-	'timer'
+    'bus_pci',
+    'bus_vdev',
+    'bitratestats',
+    'bpf',
+    'cfgfile',
+    'cmdline',
+    'cryptodev',
+    'distributor',
+    'efd',
+    'ethdev',
+    'eventdev',
+    'fib',
+    'flow_classify',
+    'graph',
+    'hash',
+    'ipsec',
+    'latencystats',
+    'lpm',
+    'member',
+    'metrics',
+    'node',
+    'pipeline',
+    'port',
+    'rawdev',
+    'rcu',
+    'reorder',
+    'rib',
+    'ring',
+    'security',
+    'stack',
+    'telemetry',
+    'timer'
 ]
 
 # Each test is marked with flag true/false
 # to indicate whether it can run in no-huge mode.
 fast_tests = [
-        ['acl_autotest', true],
-        ['alarm_autotest', false],
-        ['atomic_autotest', false],
-        ['bitops_autotest', true],
-        ['byteorder_autotest', true],
-        ['cmdline_autotest', true],
-        ['common_autotest', true],
-        ['cpuflags_autotest', true],
-        ['cycles_autotest', true],
-        ['debug_autotest', true],
-        ['eal_flags_c_opt_autotest', false],
-        ['eal_flags_main_opt_autotest', false],
-        ['eal_flags_n_opt_autotest', false],
-        ['eal_flags_hpet_autotest', false],
-        ['eal_flags_no_huge_autotest', false],
-        ['eal_flags_a_opt_autotest', false],
-        ['eal_flags_b_opt_autotest', false],
-        ['eal_flags_vdev_opt_autotest', false],
-        ['eal_flags_r_opt_autotest', false],
-        ['eal_flags_mem_autotest', false],
-        ['eal_flags_file_prefix_autotest', false],
-        ['eal_flags_misc_autotest', false],
-        ['eal_fs_autotest', true],
-        ['errno_autotest', true],
-        ['ethdev_link_status', true],
-        ['event_ring_autotest', true],
-        ['fib_autotest', true],
-        ['fib6_autotest', true],
-        ['func_reentrancy_autotest', false],
-        ['flow_classify_autotest', false],
-        ['hash_autotest', true],
-        ['interrupt_autotest', true],
-        ['ipfrag_autotest', false],
-        ['lcores_autotest', true],
-        ['logs_autotest', true],
-        ['lpm_autotest', true],
-        ['lpm6_autotest', true],
-        ['malloc_autotest', false],
-        ['mbuf_autotest', false],
-        ['mcslock_autotest', false],
-        ['memcpy_autotest', true],
-        ['memory_autotest', false],
-        ['mempool_autotest', false],
-        ['memzone_autotest', false],
-        ['meter_autotest', true],
-        ['multiprocess_autotest', false],
-        ['per_lcore_autotest', true],
-        ['prefetch_autotest', true],
-        ['rcu_qsbr_autotest', true],
-        ['red_autotest', true],
-        ['rib_autotest', true],
-        ['rib6_autotest', true],
-        ['ring_autotest', true],
-        ['rwlock_test1_autotest', true],
-        ['rwlock_rda_autotest', true],
-        ['rwlock_rds_wrm_autotest', true],
-        ['rwlock_rde_wro_autotest', true],
-        ['sched_autotest', true],
-		['security_autotest', false],
-        ['spinlock_autotest', true],
-        ['stack_autotest', false],
-        ['stack_lf_autotest', false],
-        ['string_autotest', true],
-        ['table_autotest', true],
-        ['tailq_autotest', true],
-        ['ticketlock_autotest', true],
-        ['timer_autotest', false],
-        ['user_delay_us', true],
-        ['version_autotest', true],
-        ['crc_autotest', true],
-        ['delay_us_sleep_autotest', true],
-        ['distributor_autotest', false],
-        ['eventdev_common_autotest', true],
-        ['fbarray_autotest', true],
-        ['hash_readwrite_func_autotest', false],
-        ['ipsec_autotest', true],
-        ['kni_autotest', false],
-        ['kvargs_autotest', true],
-        ['member_autotest', true],
-        ['metrics_autotest', true],
-        ['power_cpufreq_autotest', false],
-        ['power_autotest', true],
-        ['power_kvm_vm_autotest', false],
-        ['reorder_autotest', true],
-        ['service_autotest', true],
-        ['thash_autotest', true],
-        ['trace_autotest', true],
+    ['acl_autotest', true],
+    ['alarm_autotest', false],
+    ['atomic_autotest', false],
+    ['bitops_autotest', true],
+    ['byteorder_autotest', true],
+    ['cmdline_autotest', true],
+    ['common_autotest', true],
+    ['cpuflags_autotest', true],
+    ['cycles_autotest', true],
+    ['debug_autotest', true],
+    ['eal_flags_c_opt_autotest', false],
+    ['eal_flags_main_opt_autotest', false],
+    ['eal_flags_n_opt_autotest', false],
+    ['eal_flags_hpet_autotest', false],
+    ['eal_flags_no_huge_autotest', false],
+    ['eal_flags_a_opt_autotest', false],
+    ['eal_flags_b_opt_autotest', false],
+    ['eal_flags_vdev_opt_autotest', false],
+    ['eal_flags_r_opt_autotest', false],
+    ['eal_flags_mem_autotest', false],
+    ['eal_flags_file_prefix_autotest', false],
+    ['eal_flags_misc_autotest', false],
+    ['eal_fs_autotest', true],
+    ['errno_autotest', true],
+    ['ethdev_link_status', true],
+    ['event_ring_autotest', true],
+    ['fib_autotest', true],
+    ['fib6_autotest', true],
+    ['func_reentrancy_autotest', false],
+    ['flow_classify_autotest', false],
+    ['hash_autotest', true],
+    ['interrupt_autotest', true],
+    ['ipfrag_autotest', false],
+    ['lcores_autotest', true],
+    ['logs_autotest', true],
+    ['lpm_autotest', true],
+    ['lpm6_autotest', true],
+    ['malloc_autotest', false],
+    ['mbuf_autotest', false],
+    ['mcslock_autotest', false],
+    ['memcpy_autotest', true],
+    ['memory_autotest', false],
+    ['mempool_autotest', false],
+    ['memzone_autotest', false],
+    ['meter_autotest', true],
+    ['multiprocess_autotest', false],
+    ['per_lcore_autotest', true],
+    ['prefetch_autotest', true],
+    ['rcu_qsbr_autotest', true],
+    ['red_autotest', true],
+    ['rib_autotest', true],
+    ['rib6_autotest', true],
+    ['ring_autotest', true],
+    ['rwlock_test1_autotest', true],
+    ['rwlock_rda_autotest', true],
+    ['rwlock_rds_wrm_autotest', true],
+    ['rwlock_rde_wro_autotest', true],
+    ['sched_autotest', true],
+    ['security_autotest', false],
+    ['spinlock_autotest', true],
+    ['stack_autotest', false],
+    ['stack_lf_autotest', false],
+    ['string_autotest', true],
+    ['table_autotest', true],
+    ['tailq_autotest', true],
+    ['ticketlock_autotest', true],
+    ['timer_autotest', false],
+    ['user_delay_us', true],
+    ['version_autotest', true],
+    ['crc_autotest', true],
+    ['delay_us_sleep_autotest', true],
+    ['distributor_autotest', false],
+    ['eventdev_common_autotest', true],
+    ['fbarray_autotest', true],
+    ['hash_readwrite_func_autotest', false],
+    ['ipsec_autotest', true],
+    ['kni_autotest', false],
+    ['kvargs_autotest', true],
+    ['member_autotest', true],
+    ['metrics_autotest', true],
+    ['power_cpufreq_autotest', false],
+    ['power_autotest', true],
+    ['power_kvm_vm_autotest', false],
+    ['reorder_autotest', true],
+    ['service_autotest', true],
+    ['thash_autotest', true],
+    ['trace_autotest', true],
 ]
 
 perf_test_names = [
-        'ring_perf_autotest',
-        'mempool_perf_autotest',
-        'memcpy_perf_autotest',
-        'hash_perf_autotest',
-        'timer_perf_autotest',
-        'reciprocal_division',
-        'reciprocal_division_perf',
-        'lpm_perf_autotest',
-        'rib_slow_autotest',
-        'fib_slow_autotest',
-        'fib_perf_autotest',
-        'red_all',
-        'barrier_autotest',
-        'hash_multiwriter_autotest',
-        'timer_racecond_autotest',
-        'efd_autotest',
-        'hash_functions_autotest',
-        'member_perf_autotest',
-        'efd_perf_autotest',
-        'lpm6_perf_autotest',
-        'rib6_slow_autotest',
-        'fib6_slow_autotest',
-        'fib6_perf_autotest',
-        'rcu_qsbr_perf_autotest',
-        'red_perf',
-        'distributor_perf_autotest',
-        'pmd_perf_autotest',
-        'stack_perf_autotest',
-        'stack_lf_perf_autotest',
-        'rand_perf_autotest',
-        'hash_readwrite_perf_autotest',
-        'hash_readwrite_lf_perf_autotest',
-        'trace_perf_autotest',
-	'ipsec_perf_autotest',
+    'ring_perf_autotest',
+    'mempool_perf_autotest',
+    'memcpy_perf_autotest',
+    'hash_perf_autotest',
+    'timer_perf_autotest',
+    'reciprocal_division',
+    'reciprocal_division_perf',
+    'lpm_perf_autotest',
+    'rib_slow_autotest',
+    'fib_slow_autotest',
+    'fib_perf_autotest',
+    'red_all',
+    'barrier_autotest',
+    'hash_multiwriter_autotest',
+    'timer_racecond_autotest',
+    'efd_autotest',
+    'hash_functions_autotest',
+    'member_perf_autotest',
+    'efd_perf_autotest',
+    'lpm6_perf_autotest',
+    'rib6_slow_autotest',
+    'fib6_slow_autotest',
+    'fib6_perf_autotest',
+    'rcu_qsbr_perf_autotest',
+    'red_perf',
+    'distributor_perf_autotest',
+    'pmd_perf_autotest',
+    'stack_perf_autotest',
+    'stack_lf_perf_autotest',
+    'rand_perf_autotest',
+    'hash_readwrite_perf_autotest',
+    'hash_readwrite_lf_perf_autotest',
+    'trace_perf_autotest',
+    'ipsec_perf_autotest',
 ]
 
 driver_test_names = [
-        'cryptodev_aesni_mb_autotest',
-        'cryptodev_aesni_gcm_autotest',
-        'cryptodev_dpaa_sec_autotest',
-        'cryptodev_dpaa2_sec_autotest',
-        'cryptodev_null_autotest',
-        'cryptodev_octeontx2_autotest',
-        'cryptodev_openssl_autotest',
-        'cryptodev_openssl_asym_autotest',
-        'cryptodev_qat_autotest',
-        'cryptodev_sw_armv8_autotest',
-        'cryptodev_sw_kasumi_autotest',
-        'cryptodev_sw_mvsam_autotest',
-        'cryptodev_sw_snow3g_autotest',
-        'cryptodev_sw_zuc_autotest',
-        'eventdev_selftest_octeontx',
-        'eventdev_selftest_sw',
-        'rawdev_autotest',
+    'cryptodev_aesni_mb_autotest',
+    'cryptodev_aesni_gcm_autotest',
+    'cryptodev_dpaa_sec_autotest',
+    'cryptodev_dpaa2_sec_autotest',
+    'cryptodev_null_autotest',
+    'cryptodev_octeontx2_autotest',
+    'cryptodev_openssl_autotest',
+    'cryptodev_openssl_asym_autotest',
+    'cryptodev_qat_autotest',
+    'cryptodev_sw_armv8_autotest',
+    'cryptodev_sw_kasumi_autotest',
+    'cryptodev_sw_mvsam_autotest',
+    'cryptodev_sw_snow3g_autotest',
+    'cryptodev_sw_zuc_autotest',
+    'eventdev_selftest_octeontx',
+    'eventdev_selftest_sw',
+    'rawdev_autotest',
 ]
 
 dump_test_names = [
-        'dump_struct_sizes',
-        'dump_mempool',
-        'dump_malloc_stats',
-        'dump_devargs',
-        'dump_log_types',
-        'dump_ring',
-        'dump_physmem',
-        'dump_memzone',
+    'dump_struct_sizes',
+    'dump_mempool',
+    'dump_malloc_stats',
+    'dump_devargs',
+    'dump_log_types',
+    'dump_ring',
+    'dump_physmem',
+    'dump_memzone',
 ]
 
 # The following linkages are an exception to allow running the
@@ -343,55 +343,55 @@ dump_test_names = [
 # DPDK libraries.  Explicit linkage of drivers (plugin libraries)
 # in applications should not be used.
 if dpdk_conf.has('RTE_MEMPOOL_RING')
-	test_deps += 'mempool_ring'
+    test_deps += 'mempool_ring'
 endif
 if dpdk_conf.has('RTE_MEMPOOL_STACK')
-	test_deps += 'mempool_stack'
+    test_deps += 'mempool_stack'
 endif
 if dpdk_conf.has('RTE_EVENT_SKELETON')
-	test_deps += 'event_skeleton'
+    test_deps += 'event_skeleton'
 endif
 if dpdk_conf.has('RTE_LIB_TELEMETRY')
-	test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
-	fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]]
+    test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
+    fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]]
 endif
 
 # The following linkages of drivers are required because
 # they are used via a driver-specific API.
 if dpdk_conf.has('RTE_NET_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_NET_RING')
-		test_sources += 'test_link_bonding_mode4.c'
-		driver_test_names += 'link_bonding_mode4_autotest'
-	endif
+    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_NET_RING')
+        test_sources += 'test_link_bonding_mode4.c'
+        driver_test_names += 'link_bonding_mode4_autotest'
+    endif
 endif
 if dpdk_conf.has('RTE_NET_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'
-	test_sources += 'test_bitratestats.c'
-	test_sources += 'test_latencystats.c'
-	test_sources += 'sample_packet_forward.c'
-	test_sources += 'test_pdump.c'
-	fast_tests += [['ring_pmd_autotest', true]]
-	perf_test_names += 'ring_pmd_perf_autotest'
-	fast_tests += [['event_eth_tx_adapter_autotest', false]]
-	fast_tests += [['bitratestats_autotest', true]]
-	fast_tests += [['latencystats_autotest', true]]
-	fast_tests += [['pdump_autotest', true]]
+    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'
+    test_sources += 'test_bitratestats.c'
+    test_sources += 'test_latencystats.c'
+    test_sources += 'sample_packet_forward.c'
+    test_sources += 'test_pdump.c'
+    fast_tests += [['ring_pmd_autotest', true]]
+    perf_test_names += 'ring_pmd_perf_autotest'
+    fast_tests += [['event_eth_tx_adapter_autotest', false]]
+    fast_tests += [['bitratestats_autotest', true]]
+    fast_tests += [['latencystats_autotest', true]]
+    fast_tests += [['pdump_autotest', true]]
 endif
 
 if dpdk_conf.has('RTE_LIB_POWER')
-	test_deps += 'power'
+    test_deps += 'power'
 endif
 if dpdk_conf.has('RTE_LIB_KNI')
-	test_deps += 'kni'
+    test_deps += 'kni'
 endif
 if dpdk_conf.has('RTE_LIB_PDUMP')
-	test_deps += 'pdump'
+    test_deps += 'pdump'
 endif
 
 if cc.has_argument('-Wno-format-truncation')
@@ -406,38 +406,38 @@ cflags += ['-DALLOW_INTERNAL_API']
 
 test_dep_objs = []
 if dpdk_conf.has('RTE_LIB_COMPRESSDEV')
-	compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
-	if compress_test_dep.found()
-		test_dep_objs += compress_test_dep
-		test_sources += 'test_compressdev.c'
-		test_deps += 'compressdev'
-		fast_tests += [['compressdev_autotest', false]]
-	endif
+    compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
+    if compress_test_dep.found()
+        test_dep_objs += compress_test_dep
+        test_sources += 'test_compressdev.c'
+        test_deps += 'compressdev'
+        fast_tests += [['compressdev_autotest', false]]
+    endif
 endif
 
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	driver_test_names += 'cryptodev_scheduler_autotest'
-	test_deps += 'crypto_scheduler'
+    driver_test_names += 'cryptodev_scheduler_autotest'
+    test_deps += 'crypto_scheduler'
 endif
 
 foreach d:test_deps
-	def_lib = get_option('default_library')
-	test_dep_objs += get_variable(def_lib + '_rte_' + d)
+    def_lib = get_option('default_library')
+    test_dep_objs += get_variable(def_lib + '_rte_' + d)
 endforeach
 
 link_libs = []
 if get_option('default_library') == 'static'
-	link_libs = dpdk_static_libraries + dpdk_drivers
+    link_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 dpdk_test = executable('dpdk-test',
-	test_sources,
-	link_whole: link_libs,
-	dependencies: test_dep_objs,
-	c_args: cflags,
-	install_rpath: join_paths(get_option('prefix'),
-			 driver_install_path),
-	install: true)
+    test_sources,
+    link_whole: link_libs,
+    dependencies: test_dep_objs,
+    c_args: cflags,
+    install_rpath: join_paths(get_option('prefix'),
+             driver_install_path),
+    install: true)
 
 has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
 message('hugepage availability: @0@'.format(has_hugepage))
@@ -453,59 +453,59 @@ num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip()
 default_test_args = [num_cores_arg]
 
 foreach arg : fast_tests
-	test_args = default_test_args
-	run_test = true
-	if not has_hugepage
-		if arg[1]
-			test_args += ['--no-huge', '-m', '2048']
-		else
-			run_test = false
-		endif
-	endif
+    test_args = default_test_args
+    run_test = true
+    if not has_hugepage
+        if arg[1]
+            test_args += ['--no-huge', '-m', '2048']
+        else
+            run_test = false
+        endif
+    endif
 
-	if (get_option('default_library') == 'shared' and
-		arg[0] == 'event_eth_tx_adapter_autotest')
-		foreach drv:dpdk_drivers
-			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
-		endforeach
-	endif
-	if is_linux
-		test_args += ['--file-prefix=@0@'.format(arg[0])]
-	endif
+    if (get_option('default_library') == 'shared' and
+        arg[0] == 'event_eth_tx_adapter_autotest')
+        foreach drv:dpdk_drivers
+            test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
+        endforeach
+    endif
+    if is_linux
+        test_args += ['--file-prefix=@0@'.format(arg[0])]
+    endif
 
-	if run_test
-		test(arg[0], dpdk_test,
-			env : ['DPDK_TEST=' + arg[0]],
-			args : test_args,
-			timeout : timeout_seconds_fast,
-			is_parallel : false,
-			suite : 'fast-tests')
-	endif
+    if run_test
+        test(arg[0], dpdk_test,
+            env : ['DPDK_TEST=' + arg[0]],
+            args : test_args,
+            timeout : timeout_seconds_fast,
+            is_parallel : false,
+            suite : 'fast-tests')
+    endif
 endforeach
 
 foreach arg : perf_test_names
-	test(arg, dpdk_test,
-	env : ['DPDK_TEST=' + arg],
-	args : default_test_args,
-	timeout : timeout_seconds,
-	is_parallel : false,
-	suite : 'perf-tests')
+    test(arg, dpdk_test,
+    env : ['DPDK_TEST=' + arg],
+    args : default_test_args,
+    timeout : timeout_seconds,
+    is_parallel : false,
+    suite : 'perf-tests')
 endforeach
 
 foreach arg : driver_test_names
-	test(arg, dpdk_test,
-		env : ['DPDK_TEST=' + arg],
-		args : default_test_args,
-		timeout : timeout_seconds,
-		is_parallel : false,
-		suite : 'driver-tests')
+    test(arg, dpdk_test,
+        env : ['DPDK_TEST=' + arg],
+        args : default_test_args,
+        timeout : timeout_seconds,
+        is_parallel : false,
+        suite : 'driver-tests')
 endforeach
 
 foreach arg : dump_test_names
-	test(arg, dpdk_test,
-		env : ['DPDK_TEST=' + arg],
-		args : default_test_args,
-		timeout : timeout_seconds,
-		is_parallel : false,
-		suite : 'debug-tests')
+    test(arg, dpdk_test,
+        env : ['DPDK_TEST=' + arg],
+        args : default_test_args,
+        timeout : timeout_seconds,
+        is_parallel : false,
+        suite : 'debug-tests')
 endforeach
-- 
2.27.0

[dpdk-dev] [RFC PATCH 13/14] lib: remove librte_ prefix from directory names

[Bruce Richardson]

There is no reason for the DPDK libraries to all have 'librte_' prefix on
the directory names. This prefix makes the directory names longer and also
makes it awkward to add features referring to individual libraries in the
build - should the lib names be specified with or without the prefix.
Therefore, we can just remove the library prefix and use the library's
unique name as the directory name, i.e. 'eal' rather than 'librte_eal'

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 MAINTAINERS                                   | 212 +++++++++---------
 app/test/test_eal_fs.c                        |   2 +-
 app/test/test_memzone.c                       |   2 +-
 app/test/test_telemetry_json.c                |   2 +-
 config/arm/meson.build                        |   2 +-
 devtools/build-tags.sh                        |  14 +-
 doc/api/doxy-api.conf.in                      | 104 ++++-----
 doc/guides/contributing/abi_versioning.rst    |  12 +-
 doc/guides/contributing/coding_style.rst      |   4 +-
 doc/guides/contributing/documentation.rst     |  10 +-
 doc/guides/prog_guide/event_timer_adapter.rst |   2 +-
 doc/guides/prog_guide/qos_framework.rst       |   4 +-
 doc/guides/prog_guide/rawdev.rst              |   2 +-
 doc/guides/rel_notes/known_issues.rst         |   2 +-
 drivers/common/mlx5/linux/meson.build         |   2 +-
 drivers/crypto/virtio/meson.build             |   2 +-
 kernel/linux/kni/meson.build                  |   4 +-
 lib/{librte_acl => acl}/acl.h                 |   0
 lib/{librte_acl => acl}/acl_bld.c             |   0
 lib/{librte_acl => acl}/acl_gen.c             |   0
 lib/{librte_acl => acl}/acl_run.h             |   0
 lib/{librte_acl => acl}/acl_run_altivec.c     |   0
 lib/{librte_acl => acl}/acl_run_altivec.h     |   0
 lib/{librte_acl => acl}/acl_run_avx2.c        |   0
 lib/{librte_acl => acl}/acl_run_avx2.h        |   0
 lib/{librte_acl => acl}/acl_run_avx512.c      |   0
 .../acl_run_avx512_common.h                   |   0
 lib/{librte_acl => acl}/acl_run_avx512x16.h   |   0
 lib/{librte_acl => acl}/acl_run_avx512x8.h    |   0
 lib/{librte_acl => acl}/acl_run_neon.c        |   0
 lib/{librte_acl => acl}/acl_run_neon.h        |   0
 lib/{librte_acl => acl}/acl_run_scalar.c      |   0
 lib/{librte_acl => acl}/acl_run_sse.c         |   0
 lib/{librte_acl => acl}/acl_run_sse.h         |   0
 lib/{librte_acl => acl}/acl_vect.h            |   0
 lib/{librte_acl => acl}/meson.build           |   0
 lib/{librte_acl => acl}/rte_acl.c             |   0
 lib/{librte_acl => acl}/rte_acl.h             |   0
 lib/{librte_acl => acl}/rte_acl_osdep.h       |   0
 lib/{librte_acl => acl}/tb_mem.c              |   0
 lib/{librte_acl => acl}/tb_mem.h              |   0
 lib/{librte_acl => acl}/version.map           |   0
 lib/{librte_bbdev => bbdev}/meson.build       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.c       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.h       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_op.h    |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h   |   0
 lib/{librte_bbdev => bbdev}/version.map       |   0
 .../meson.build                               |   0
 .../rte_bitrate.c                             |   0
 .../rte_bitrate.h                             |   0
 .../version.map                               |   0
 lib/{librte_bpf => bpf}/bpf.c                 |   0
 lib/{librte_bpf => bpf}/bpf_def.h             |   0
 lib/{librte_bpf => bpf}/bpf_exec.c            |   0
 lib/{librte_bpf => bpf}/bpf_impl.h            |   0
 lib/{librte_bpf => bpf}/bpf_jit_arm64.c       |   0
 lib/{librte_bpf => bpf}/bpf_jit_x86.c         |   0
 lib/{librte_bpf => bpf}/bpf_load.c            |   0
 lib/{librte_bpf => bpf}/bpf_load_elf.c        |   0
 lib/{librte_bpf => bpf}/bpf_pkt.c             |   0
 lib/{librte_bpf => bpf}/bpf_validate.c        |   0
 lib/{librte_bpf => bpf}/meson.build           |   0
 lib/{librte_bpf => bpf}/rte_bpf.h             |   0
 lib/{librte_bpf => bpf}/rte_bpf_ethdev.h      |   0
 lib/{librte_bpf => bpf}/version.map           |   0
 lib/{librte_cfgfile => cfgfile}/meson.build   |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h |   0
 lib/{librte_cfgfile => cfgfile}/version.map   |   0
 lib/{librte_cmdline => cmdline}/cmdline.c     |   0
 lib/{librte_cmdline => cmdline}/cmdline.h     |   0
 .../cmdline_cirbuf.c                          |   0
 .../cmdline_cirbuf.h                          |   0
 .../cmdline_os_unix.c                         |   0
 .../cmdline_os_windows.c                      |   0
 .../cmdline_parse.c                           |   0
 .../cmdline_parse.h                           |   0
 .../cmdline_parse_etheraddr.c                 |   0
 .../cmdline_parse_etheraddr.h                 |   0
 .../cmdline_parse_ipaddr.c                    |   0
 .../cmdline_parse_ipaddr.h                    |   0
 .../cmdline_parse_num.c                       |   0
 .../cmdline_parse_num.h                       |   0
 .../cmdline_parse_portlist.c                  |   0
 .../cmdline_parse_portlist.h                  |   0
 .../cmdline_parse_string.c                    |   0
 .../cmdline_parse_string.h                    |   0
 .../cmdline_private.h                         |   0
 .../cmdline_rdline.c                          |   0
 .../cmdline_rdline.h                          |   0
 .../cmdline_socket.c                          |   0
 .../cmdline_socket.h                          |   0
 .../cmdline_vt100.c                           |   0
 .../cmdline_vt100.h                           |   0
 lib/{librte_cmdline => cmdline}/meson.build   |   0
 lib/{librte_cmdline => cmdline}/version.map   |   0
 .../meson.build                               |   0
 .../rte_comp.c                                |   0
 .../rte_comp.h                                |   0
 .../rte_compressdev.c                         |   0
 .../rte_compressdev.h                         |   0
 .../rte_compressdev_internal.h                |   0
 .../rte_compressdev_pmd.c                     |   0
 .../rte_compressdev_pmd.h                     |   0
 .../version.map                               |   0
 .../cryptodev_trace_points.c                  |   0
 .../meson.build                               |   0
 .../rte_crypto.h                              |   0
 .../rte_crypto_asym.h                         |   0
 .../rte_crypto_sym.h                          |   0
 .../rte_cryptodev.c                           |   0
 .../rte_cryptodev.h                           |   0
 .../rte_cryptodev_pmd.c                       |   0
 .../rte_cryptodev_pmd.h                       |   0
 .../rte_cryptodev_trace.h                     |   0
 .../rte_cryptodev_trace_fp.h                  |   0
 .../version.map                               |   0
 .../distributor_private.h                     |   0
 .../meson.build                               |   0
 .../rte_distributor.c                         |   0
 .../rte_distributor.h                         |   0
 .../rte_distributor_match_generic.c           |   0
 .../rte_distributor_match_sse.c               |   0
 .../rte_distributor_single.c                  |   0
 .../rte_distributor_single.h                  |   0
 .../version.map                               |   0
 .../arm/include/meson.build                   |   0
 .../arm/include/rte_atomic.h                  |   0
 .../arm/include/rte_atomic_32.h               |   0
 .../arm/include/rte_atomic_64.h               |   0
 .../arm/include/rte_byteorder.h               |   0
 .../arm/include/rte_cpuflags.h                |   0
 .../arm/include/rte_cpuflags_32.h             |   0
 .../arm/include/rte_cpuflags_64.h             |   0
 .../arm/include/rte_cycles.h                  |   0
 .../arm/include/rte_cycles_32.h               |   0
 .../arm/include/rte_cycles_64.h               |   0
 lib/{librte_eal => eal}/arm/include/rte_io.h  |   0
 .../arm/include/rte_io_64.h                   |   0
 .../arm/include/rte_mcslock.h                 |   0
 .../arm/include/rte_memcpy.h                  |   0
 .../arm/include/rte_memcpy_32.h               |   0
 .../arm/include/rte_memcpy_64.h               |   0
 .../arm/include/rte_pause.h                   |   0
 .../arm/include/rte_pause_32.h                |   0
 .../arm/include/rte_pause_64.h                |   0
 .../arm/include/rte_power_intrinsics.h        |   0
 .../arm/include/rte_prefetch.h                |   0
 .../arm/include/rte_prefetch_32.h             |   0
 .../arm/include/rte_prefetch_64.h             |   0
 .../arm/include/rte_rwlock.h                  |   0
 .../arm/include/rte_spinlock.h                |   0
 .../arm/include/rte_ticketlock.h              |   0
 .../arm/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/arm/meson.build       |   0
 lib/{librte_eal => eal}/arm/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/arm/rte_cycles.c      |   0
 lib/{librte_eal => eal}/arm/rte_hypervisor.c  |   0
 .../arm/rte_power_intrinsics.c                |   0
 .../common/eal_common_bus.c                   |   0
 .../common/eal_common_class.c                 |   0
 .../common/eal_common_config.c                |   0
 .../common/eal_common_cpuflags.c              |   0
 .../common/eal_common_debug.c                 |   0
 .../common/eal_common_dev.c                   |   0
 .../common/eal_common_devargs.c               |   0
 .../common/eal_common_dynmem.c                |   0
 .../common/eal_common_errno.c                 |   0
 .../common/eal_common_fbarray.c               |   0
 .../common/eal_common_hexdump.c               |   0
 .../common/eal_common_hypervisor.c            |   0
 .../common/eal_common_launch.c                |   0
 .../common/eal_common_lcore.c                 |   0
 .../common/eal_common_log.c                   |   0
 .../common/eal_common_mcfg.c                  |   0
 .../common/eal_common_memalloc.c              |   0
 .../common/eal_common_memory.c                |   0
 .../common/eal_common_memzone.c               |   0
 .../common/eal_common_options.c               |   0
 .../common/eal_common_proc.c                  |   0
 .../common/eal_common_string_fns.c            |   0
 .../common/eal_common_tailqs.c                |   0
 .../common/eal_common_thread.c                |   0
 .../common/eal_common_timer.c                 |   0
 .../common/eal_common_trace.c                 |   0
 .../common/eal_common_trace_ctf.c             |   0
 .../common/eal_common_trace_points.c          |   0
 .../common/eal_common_trace_utils.c           |   0
 .../common/eal_common_uuid.c                  |   0
 .../common/eal_filesystem.h                   |   0
 .../common/eal_hugepages.h                    |   0
 .../common/eal_internal_cfg.h                 |   0
 lib/{librte_eal => eal}/common/eal_memalloc.h |   0
 lib/{librte_eal => eal}/common/eal_memcfg.h   |   0
 lib/{librte_eal => eal}/common/eal_options.h  |   0
 lib/{librte_eal => eal}/common/eal_private.h  |   0
 lib/{librte_eal => eal}/common/eal_thread.h   |   0
 lib/{librte_eal => eal}/common/eal_trace.h    |   0
 lib/{librte_eal => eal}/common/hotplug_mp.c   |   0
 lib/{librte_eal => eal}/common/hotplug_mp.h   |   0
 lib/{librte_eal => eal}/common/malloc_elem.c  |   0
 lib/{librte_eal => eal}/common/malloc_elem.h  |   0
 lib/{librte_eal => eal}/common/malloc_heap.c  |   0
 lib/{librte_eal => eal}/common/malloc_heap.h  |   0
 lib/{librte_eal => eal}/common/malloc_mp.c    |   0
 lib/{librte_eal => eal}/common/malloc_mp.h    |   0
 lib/{librte_eal => eal}/common/meson.build    |   0
 .../common/rte_keepalive.c                    |   0
 lib/{librte_eal => eal}/common/rte_malloc.c   |   0
 lib/{librte_eal => eal}/common/rte_random.c   |   0
 .../common/rte_reciprocal.c                   |   0
 lib/{librte_eal => eal}/common/rte_service.c  |   0
 lib/{librte_eal => eal}/common/rte_version.c  |   0
 lib/{librte_eal => eal}/freebsd/eal.c         |   0
 lib/{librte_eal => eal}/freebsd/eal_alarm.c   |   0
 .../freebsd/eal_alarm_private.h               |   0
 .../freebsd/eal_cpuflags.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_debug.c   |   0
 lib/{librte_eal => eal}/freebsd/eal_dev.c     |   0
 .../freebsd/eal_hugepage_info.c               |   0
 .../freebsd/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/freebsd/eal_lcore.c   |   0
 .../freebsd/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_memory.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_thread.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_timer.c   |   0
 .../freebsd/include/meson.build               |   0
 .../freebsd/include/rte_os.h                  |   0
 lib/{librte_eal => eal}/freebsd/meson.build   |   0
 .../include/generic/rte_atomic.h              |   0
 .../include/generic/rte_byteorder.h           |   0
 .../include/generic/rte_cpuflags.h            |   0
 .../include/generic/rte_cycles.h              |   0
 .../include/generic/rte_io.h                  |   0
 .../include/generic/rte_mcslock.h             |   0
 .../include/generic/rte_memcpy.h              |   0
 .../include/generic/rte_pause.h               |   0
 .../include/generic/rte_power_intrinsics.h    |   0
 .../include/generic/rte_prefetch.h            |   0
 .../include/generic/rte_rwlock.h              |   0
 .../include/generic/rte_spinlock.h            |   0
 .../include/generic/rte_ticketlock.h          |   0
 .../include/generic/rte_vect.h                |   0
 lib/{librte_eal => eal}/include/meson.build   |   0
 lib/{librte_eal => eal}/include/rte_alarm.h   |   0
 lib/{librte_eal => eal}/include/rte_bitmap.h  |   0
 lib/{librte_eal => eal}/include/rte_bitops.h  |   0
 .../include/rte_branch_prediction.h           |   0
 lib/{librte_eal => eal}/include/rte_bus.h     |   0
 lib/{librte_eal => eal}/include/rte_class.h   |   0
 lib/{librte_eal => eal}/include/rte_common.h  |   0
 lib/{librte_eal => eal}/include/rte_compat.h  |   0
 lib/{librte_eal => eal}/include/rte_debug.h   |   0
 lib/{librte_eal => eal}/include/rte_dev.h     |   0
 lib/{librte_eal => eal}/include/rte_devargs.h |   0
 lib/{librte_eal => eal}/include/rte_eal.h     |   0
 .../include/rte_eal_interrupts.h              |   0
 .../include/rte_eal_memconfig.h               |   0
 .../include/rte_eal_paging.h                  |   0
 .../include/rte_eal_trace.h                   |   0
 lib/{librte_eal => eal}/include/rte_errno.h   |   0
 lib/{librte_eal => eal}/include/rte_fbarray.h |   0
 .../include/rte_function_versioning.h         |   0
 lib/{librte_eal => eal}/include/rte_hexdump.h |   0
 .../include/rte_hypervisor.h                  |   0
 .../include/rte_interrupts.h                  |   0
 .../include/rte_keepalive.h                   |   0
 lib/{librte_eal => eal}/include/rte_launch.h  |   0
 lib/{librte_eal => eal}/include/rte_lcore.h   |   0
 lib/{librte_eal => eal}/include/rte_log.h     |   0
 lib/{librte_eal => eal}/include/rte_malloc.h  |   0
 lib/{librte_eal => eal}/include/rte_memory.h  |   0
 lib/{librte_eal => eal}/include/rte_memzone.h |   0
 .../include/rte_pci_dev_feature_defs.h        |   0
 .../include/rte_pci_dev_features.h            |   0
 .../include/rte_per_lcore.h                   |   0
 lib/{librte_eal => eal}/include/rte_random.h  |   0
 .../include/rte_reciprocal.h                  |   0
 lib/{librte_eal => eal}/include/rte_service.h |   0
 .../include/rte_service_component.h           |   0
 .../include/rte_string_fns.h                  |   0
 lib/{librte_eal => eal}/include/rte_tailq.h   |   0
 lib/{librte_eal => eal}/include/rte_test.h    |   0
 lib/{librte_eal => eal}/include/rte_thread.h  |   0
 lib/{librte_eal => eal}/include/rte_time.h    |   0
 lib/{librte_eal => eal}/include/rte_trace.h   |   0
 .../include/rte_trace_point.h                 |   0
 .../include/rte_trace_point_register.h        |   0
 lib/{librte_eal => eal}/include/rte_uuid.h    |   0
 lib/{librte_eal => eal}/include/rte_version.h |   0
 lib/{librte_eal => eal}/include/rte_vfio.h    |   0
 lib/{librte_eal => eal}/linux/eal.c           |   0
 lib/{librte_eal => eal}/linux/eal_alarm.c     |   0
 lib/{librte_eal => eal}/linux/eal_cpuflags.c  |   0
 lib/{librte_eal => eal}/linux/eal_debug.c     |   0
 lib/{librte_eal => eal}/linux/eal_dev.c       |   0
 .../linux/eal_hugepage_info.c                 |   0
 .../linux/eal_interrupts.c                    |   0
 lib/{librte_eal => eal}/linux/eal_lcore.c     |   0
 lib/{librte_eal => eal}/linux/eal_log.c       |   0
 lib/{librte_eal => eal}/linux/eal_memalloc.c  |   0
 lib/{librte_eal => eal}/linux/eal_memory.c    |   0
 lib/{librte_eal => eal}/linux/eal_thread.c    |   0
 lib/{librte_eal => eal}/linux/eal_timer.c     |   0
 lib/{librte_eal => eal}/linux/eal_vfio.c      |   0
 lib/{librte_eal => eal}/linux/eal_vfio.h      |   0
 .../linux/eal_vfio_mp_sync.c                  |   0
 .../linux/include/meson.build                 |   0
 .../linux/include/rte_os.h                    |   0
 lib/{librte_eal => eal}/linux/meson.build     |   0
 lib/{librte_eal => eal}/meson.build           |   0
 .../ppc/include/meson.build                   |   0
 .../ppc/include/rte_altivec.h                 |   0
 .../ppc/include/rte_atomic.h                  |   0
 .../ppc/include/rte_byteorder.h               |   0
 .../ppc/include/rte_cpuflags.h                |   0
 .../ppc/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/ppc/include/rte_io.h  |   0
 .../ppc/include/rte_mcslock.h                 |   0
 .../ppc/include/rte_memcpy.h                  |   0
 .../ppc/include/rte_pause.h                   |   0
 .../ppc/include/rte_power_intrinsics.h        |   0
 .../ppc/include/rte_prefetch.h                |   0
 .../ppc/include/rte_rwlock.h                  |   0
 .../ppc/include/rte_spinlock.h                |   0
 .../ppc/include/rte_ticketlock.h              |   0
 .../ppc/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/ppc/meson.build       |   0
 lib/{librte_eal => eal}/ppc/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/ppc/rte_cycles.c      |   0
 lib/{librte_eal => eal}/ppc/rte_hypervisor.c  |   0
 .../ppc/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/rte_eal_exports.def   |   0
 lib/{librte_eal => eal}/unix/eal_file.c       |   0
 .../unix/eal_unix_memory.c                    |   0
 lib/{librte_eal => eal}/unix/eal_unix_timer.c |   0
 lib/{librte_eal => eal}/unix/meson.build      |   0
 lib/{librte_eal => eal}/unix/rte_thread.c     |   0
 lib/{librte_eal => eal}/version.map           |   0
 lib/{librte_eal => eal}/windows/eal.c         |   0
 lib/{librte_eal => eal}/windows/eal_alarm.c   |   0
 lib/{librte_eal => eal}/windows/eal_debug.c   |   0
 lib/{librte_eal => eal}/windows/eal_file.c    |   0
 .../windows/eal_hugepages.c                   |   0
 .../windows/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/windows/eal_lcore.c   |   0
 lib/{librte_eal => eal}/windows/eal_log.c     |   0
 .../windows/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/windows/eal_memory.c  |   0
 lib/{librte_eal => eal}/windows/eal_mp.c      |   0
 lib/{librte_eal => eal}/windows/eal_thread.c  |   0
 lib/{librte_eal => eal}/windows/eal_timer.c   |   0
 lib/{librte_eal => eal}/windows/eal_windows.h |   0
 lib/{librte_eal => eal}/windows/fnmatch.c     |   0
 lib/{librte_eal => eal}/windows/getopt.c      |   0
 .../windows/include/arpa/inet.h               |   0
 .../windows/include/dirent.h                  |   0
 .../windows/include/fnmatch.h                 |   0
 .../windows/include/getopt.h                  |   0
 .../windows/include/meson.build               |   0
 .../windows/include/netinet/in.h              |   0
 .../windows/include/netinet/ip.h              |   0
 .../windows/include/pthread.h                 |   0
 .../windows/include/regex.h                   |   0
 .../windows/include/rte_os.h                  |   0
 .../windows/include/rte_virt2phys.h           |   0
 .../windows/include/rte_windows.h             |   0
 .../windows/include/sched.h                   |   0
 .../windows/include/sys/queue.h               |   0
 .../windows/include/sys/socket.h              |   0
 .../windows/include/unistd.h                  |   0
 lib/{librte_eal => eal}/windows/meson.build   |   0
 lib/{librte_eal => eal}/windows/rte_thread.c  |   0
 .../x86/include/meson.build                   |   0
 .../x86/include/rte_atomic.h                  |   0
 .../x86/include/rte_atomic_32.h               |   0
 .../x86/include/rte_atomic_64.h               |   0
 .../x86/include/rte_byteorder.h               |   0
 .../x86/include/rte_byteorder_32.h            |   0
 .../x86/include/rte_byteorder_64.h            |   0
 .../x86/include/rte_cpuflags.h                |   0
 .../x86/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/x86/include/rte_io.h  |   0
 .../x86/include/rte_mcslock.h                 |   0
 .../x86/include/rte_memcpy.h                  |   0
 .../x86/include/rte_pause.h                   |   0
 .../x86/include/rte_power_intrinsics.h        |   0
 .../x86/include/rte_prefetch.h                |   0
 lib/{librte_eal => eal}/x86/include/rte_rtm.h |   0
 .../x86/include/rte_rwlock.h                  |   0
 .../x86/include/rte_spinlock.h                |   0
 .../x86/include/rte_ticketlock.h              |   0
 .../x86/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/x86/meson.build       |   0
 lib/{librte_eal => eal}/x86/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/x86/rte_cpuid.h       |   0
 lib/{librte_eal => eal}/x86/rte_cycles.c      |   0
 lib/{librte_eal => eal}/x86/rte_hypervisor.c  |   0
 .../x86/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/x86/rte_spinlock.c    |   0
 lib/{librte_efd => efd}/meson.build           |   0
 lib/{librte_efd => efd}/rte_efd.c             |   0
 lib/{librte_efd => efd}/rte_efd.h             |   0
 lib/{librte_efd => efd}/rte_efd_arm64.h       |   0
 lib/{librte_efd => efd}/rte_efd_x86.h         |   0
 lib/{librte_efd => efd}/version.map           |   0
 lib/{librte_ethdev => ethdev}/ethdev_driver.h |   0
 lib/{librte_ethdev => ethdev}/ethdev_pci.h    |   0
 .../ethdev_private.c                          |   0
 .../ethdev_private.h                          |   0
 .../ethdev_profile.c                          |   0
 .../ethdev_profile.h                          |   0
 .../ethdev_trace_points.c                     |   0
 lib/{librte_ethdev => ethdev}/ethdev_vdev.h   |   0
 lib/{librte_ethdev => ethdev}/meson.build     |   0
 lib/{librte_ethdev => ethdev}/rte_class_eth.c |   0
 lib/{librte_ethdev => ethdev}/rte_dev_info.h  |   0
 lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h  |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.c    |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.h    |   0
 .../rte_ethdev_core.h                         |   0
 .../rte_ethdev_trace.h                        |   0
 .../rte_ethdev_trace_fp.h                     |   0
 lib/{librte_ethdev => ethdev}/rte_flow.c      |   0
 lib/{librte_ethdev => ethdev}/rte_flow.h      |   0
 .../rte_flow_driver.h                         |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.c       |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.h       |   0
 .../rte_mtr_driver.h                          |   0
 lib/{librte_ethdev => ethdev}/rte_tm.c        |   0
 lib/{librte_ethdev => ethdev}/rte_tm.h        |   0
 lib/{librte_ethdev => ethdev}/rte_tm_driver.h |   0
 lib/{librte_ethdev => ethdev}/version.map     |   0
 .../eventdev_pmd.h                            |   0
 .../eventdev_pmd_pci.h                        |   0
 .../eventdev_pmd_vdev.h                       |   0
 .../eventdev_trace_points.c                   |   0
 lib/{librte_eventdev => eventdev}/meson.build |   0
 .../rte_event_crypto_adapter.c                |   0
 .../rte_event_crypto_adapter.h                |   0
 .../rte_event_eth_rx_adapter.c                |   0
 .../rte_event_eth_rx_adapter.h                |   0
 .../rte_event_eth_tx_adapter.c                |   0
 .../rte_event_eth_tx_adapter.h                |   0
 .../rte_event_ring.c                          |   0
 .../rte_event_ring.h                          |   0
 .../rte_event_timer_adapter.c                 |   0
 .../rte_event_timer_adapter.h                 |   0
 .../rte_event_timer_adapter_pmd.h             |   0
 .../rte_eventdev.c                            |   0
 .../rte_eventdev.h                            |   0
 .../rte_eventdev_trace.h                      |   0
 .../rte_eventdev_trace_fp.h                   |   0
 lib/{librte_eventdev => eventdev}/version.map |   0
 lib/{librte_fib => fib}/dir24_8.c             |   0
 lib/{librte_fib => fib}/dir24_8.h             |   0
 lib/{librte_fib => fib}/dir24_8_avx512.c      |   0
 lib/{librte_fib => fib}/dir24_8_avx512.h      |   0
 lib/{librte_fib => fib}/meson.build           |   0
 lib/{librte_fib => fib}/rte_fib.c             |   0
 lib/{librte_fib => fib}/rte_fib.h             |   0
 lib/{librte_fib => fib}/rte_fib6.c            |   0
 lib/{librte_fib => fib}/rte_fib6.h            |   0
 lib/{librte_fib => fib}/trie.c                |   0
 lib/{librte_fib => fib}/trie.h                |   0
 lib/{librte_fib => fib}/trie_avx512.c         |   0
 lib/{librte_fib => fib}/trie_avx512.h         |   0
 lib/{librte_fib => fib}/version.map           |   0
 .../meson.build                               |   0
 .../rte_flow_classify.c                       |   0
 .../rte_flow_classify.h                       |   0
 .../rte_flow_classify_parse.c                 |   0
 .../rte_flow_classify_parse.h                 |   0
 .../version.map                               |   0
 lib/{librte_graph => graph}/graph.c           |   0
 lib/{librte_graph => graph}/graph_debug.c     |   0
 lib/{librte_graph => graph}/graph_ops.c       |   0
 lib/{librte_graph => graph}/graph_populate.c  |   0
 lib/{librte_graph => graph}/graph_private.h   |   0
 lib/{librte_graph => graph}/graph_stats.c     |   0
 lib/{librte_graph => graph}/meson.build       |   0
 lib/{librte_graph => graph}/node.c            |   0
 lib/{librte_graph => graph}/rte_graph.h       |   0
 .../rte_graph_worker.h                        |   0
 lib/{librte_graph => graph}/version.map       |   0
 lib/{librte_gro => gro}/gro_tcp4.c            |   0
 lib/{librte_gro => gro}/gro_tcp4.h            |   0
 lib/{librte_gro => gro}/gro_udp4.c            |   0
 lib/{librte_gro => gro}/gro_udp4.h            |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.h      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.h      |   0
 lib/{librte_gro => gro}/meson.build           |   0
 lib/{librte_gro => gro}/rte_gro.c             |   0
 lib/{librte_gro => gro}/rte_gro.h             |   0
 lib/{librte_gro => gro}/version.map           |   0
 lib/{librte_gso => gso}/gso_common.c          |   0
 lib/{librte_gso => gso}/gso_common.h          |   0
 lib/{librte_gso => gso}/gso_tcp4.c            |   0
 lib/{librte_gso => gso}/gso_tcp4.h            |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.h     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.h     |   0
 lib/{librte_gso => gso}/gso_udp4.c            |   0
 lib/{librte_gso => gso}/gso_udp4.h            |   0
 lib/{librte_gso => gso}/meson.build           |   0
 lib/{librte_gso => gso}/rte_gso.c             |   0
 lib/{librte_gso => gso}/rte_gso.h             |   0
 lib/{librte_gso => gso}/version.map           |   0
 lib/{librte_hash => hash}/meson.build         |   0
 lib/{librte_hash => hash}/rte_cmp_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cmp_x86.h       |   0
 lib/{librte_hash => hash}/rte_crc_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.c   |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.h   |   0
 lib/{librte_hash => hash}/rte_fbk_hash.c      |   0
 lib/{librte_hash => hash}/rte_fbk_hash.h      |   0
 lib/{librte_hash => hash}/rte_hash.h          |   0
 lib/{librte_hash => hash}/rte_hash_crc.h      |   0
 lib/{librte_hash => hash}/rte_jhash.h         |   0
 lib/{librte_hash => hash}/rte_thash.h         |   0
 lib/{librte_hash => hash}/version.map         |   0
 .../ip_frag_common.h                          |   0
 .../ip_frag_internal.c                        |   0
 lib/{librte_ip_frag => ip_frag}/meson.build   |   0
 lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h |   0
 .../rte_ip_frag_common.c                      |   0
 .../rte_ipv4_fragmentation.c                  |   0
 .../rte_ipv4_reassembly.c                     |   0
 .../rte_ipv6_fragmentation.c                  |   0
 .../rte_ipv6_reassembly.c                     |   0
 lib/{librte_ip_frag => ip_frag}/version.map   |   0
 lib/{librte_ipsec => ipsec}/crypto.h          |   0
 lib/{librte_ipsec => ipsec}/esp_inb.c         |   0
 lib/{librte_ipsec => ipsec}/esp_outb.c        |   0
 lib/{librte_ipsec => ipsec}/iph.h             |   0
 lib/{librte_ipsec => ipsec}/ipsec_sad.c       |   0
 lib/{librte_ipsec => ipsec}/ipsec_sqn.h       |   0
 lib/{librte_ipsec => ipsec}/meson.build       |   0
 lib/{librte_ipsec => ipsec}/misc.h            |   0
 lib/{librte_ipsec => ipsec}/pad.h             |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec.h       |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_group.h |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h    |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h   |   0
 lib/{librte_ipsec => ipsec}/sa.c              |   0
 lib/{librte_ipsec => ipsec}/sa.h              |   0
 lib/{librte_ipsec => ipsec}/ses.c             |   0
 lib/{librte_ipsec => ipsec}/version.map       |   0
 lib/{librte_jobstats => jobstats}/meson.build |   0
 .../rte_jobstats.c                            |   0
 .../rte_jobstats.h                            |   0
 lib/{librte_jobstats => jobstats}/version.map |   0
 lib/{librte_kni => kni}/meson.build           |   0
 lib/{librte_kni => kni}/rte_kni.c             |   0
 lib/{librte_kni => kni}/rte_kni.h             |   0
 lib/{librte_kni => kni}/rte_kni_common.h      |   0
 lib/{librte_kni => kni}/rte_kni_fifo.h        |   0
 lib/{librte_kni => kni}/version.map           |   0
 lib/{librte_kvargs => kvargs}/meson.build     |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.c    |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.h    |   0
 lib/{librte_kvargs => kvargs}/version.map     |   0
 .../meson.build                               |   0
 .../rte_latencystats.c                        |   0
 .../rte_latencystats.h                        |   0
 .../version.map                               |   0
 lib/{librte_lpm => lpm}/meson.build           |   0
 lib/{librte_lpm => lpm}/rte_lpm.c             |   0
 lib/{librte_lpm => lpm}/rte_lpm.h             |   0
 lib/{librte_lpm => lpm}/rte_lpm6.c            |   0
 lib/{librte_lpm => lpm}/rte_lpm6.h            |   0
 lib/{librte_lpm => lpm}/rte_lpm_altivec.h     |   0
 lib/{librte_lpm => lpm}/rte_lpm_neon.h        |   0
 lib/{librte_lpm => lpm}/rte_lpm_sse.h         |   0
 lib/{librte_lpm => lpm}/rte_lpm_sve.h         |   0
 lib/{librte_lpm => lpm}/version.map           |   0
 lib/{librte_mbuf => mbuf}/meson.build         |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.c          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.h          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_core.h     |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c    |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h    |   0
 lib/{librte_mbuf => mbuf}/version.map         |   0
 lib/{librte_member => member}/meson.build     |   0
 lib/{librte_member => member}/rte_member.c    |   0
 lib/{librte_member => member}/rte_member.h    |   0
 lib/{librte_member => member}/rte_member_ht.c |   0
 lib/{librte_member => member}/rte_member_ht.h |   0
 .../rte_member_vbf.c                          |   0
 .../rte_member_vbf.h                          |   0
 .../rte_member_x86.h                          |   0
 lib/{librte_member => member}/version.map     |   0
 .../mempool_trace_points.c                    |   0
 lib/{librte_mempool => mempool}/meson.build   |   0
 lib/{librte_mempool => mempool}/rte_mempool.c |   0
 lib/{librte_mempool => mempool}/rte_mempool.h |   0
 .../rte_mempool_ops.c                         |   0
 .../rte_mempool_ops_default.c                 |   0
 .../rte_mempool_trace.h                       |   0
 .../rte_mempool_trace_fp.h                    |   0
 lib/{librte_mempool => mempool}/version.map   |   0
 lib/meson.build                               |  16 +-
 lib/{librte_meter => meter}/meson.build       |   0
 lib/{librte_meter => meter}/rte_meter.c       |   0
 lib/{librte_meter => meter}/rte_meter.h       |   0
 lib/{librte_meter => meter}/version.map       |   0
 lib/{librte_metrics => metrics}/meson.build   |   0
 lib/{librte_metrics => metrics}/rte_metrics.c |   0
 lib/{librte_metrics => metrics}/rte_metrics.h |   0
 .../rte_metrics_telemetry.c                   |   0
 .../rte_metrics_telemetry.h                   |   0
 lib/{librte_metrics => metrics}/version.map   |   0
 lib/{librte_net => net}/meson.build           |   0
 lib/{librte_net => net}/net_crc.h             |   0
 lib/{librte_net => net}/net_crc_avx512.c      |   0
 lib/{librte_net => net}/net_crc_neon.c        |   0
 lib/{librte_net => net}/net_crc_sse.c         |   0
 lib/{librte_net => net}/rte_arp.c             |   0
 lib/{librte_net => net}/rte_arp.h             |   0
 lib/{librte_net => net}/rte_ecpri.h           |   0
 lib/{librte_net => net}/rte_esp.h             |   0
 lib/{librte_net => net}/rte_ether.c           |   0
 lib/{librte_net => net}/rte_ether.h           |   0
 lib/{librte_net => net}/rte_geneve.h          |   0
 lib/{librte_net => net}/rte_gre.h             |   0
 lib/{librte_net => net}/rte_gtp.h             |   0
 lib/{librte_net => net}/rte_higig.h           |   0
 lib/{librte_net => net}/rte_icmp.h            |   0
 lib/{librte_net => net}/rte_ip.h              |   0
 lib/{librte_net => net}/rte_mpls.h            |   0
 lib/{librte_net => net}/rte_net.c             |   0
 lib/{librte_net => net}/rte_net.h             |   0
 lib/{librte_net => net}/rte_net_crc.c         |   0
 lib/{librte_net => net}/rte_net_crc.h         |   0
 lib/{librte_net => net}/rte_sctp.h            |   0
 lib/{librte_net => net}/rte_tcp.h             |   0
 lib/{librte_net => net}/rte_udp.h             |   0
 lib/{librte_net => net}/rte_vxlan.h           |   0
 lib/{librte_net => net}/version.map           |   0
 lib/{librte_node => node}/ethdev_ctrl.c       |   0
 lib/{librte_node => node}/ethdev_rx.c         |   0
 lib/{librte_node => node}/ethdev_rx_priv.h    |   0
 lib/{librte_node => node}/ethdev_tx.c         |   0
 lib/{librte_node => node}/ethdev_tx_priv.h    |   0
 lib/{librte_node => node}/ip4_lookup.c        |   0
 lib/{librte_node => node}/ip4_lookup_neon.h   |   0
 lib/{librte_node => node}/ip4_lookup_sse.h    |   0
 lib/{librte_node => node}/ip4_rewrite.c       |   0
 lib/{librte_node => node}/ip4_rewrite_priv.h  |   0
 lib/{librte_node => node}/log.c               |   0
 lib/{librte_node => node}/meson.build         |   0
 lib/{librte_node => node}/node_private.h      |   0
 lib/{librte_node => node}/null.c              |   0
 lib/{librte_node => node}/pkt_cls.c           |   0
 lib/{librte_node => node}/pkt_cls_priv.h      |   0
 lib/{librte_node => node}/pkt_drop.c          |   0
 lib/{librte_node => node}/rte_node_eth_api.h  |   0
 lib/{librte_node => node}/rte_node_ip4_api.h  |   0
 lib/{librte_node => node}/version.map         |   0
 lib/{librte_pci => pci}/meson.build           |   0
 lib/{librte_pci => pci}/rte_pci.c             |   0
 lib/{librte_pci => pci}/rte_pci.h             |   0
 lib/{librte_pci => pci}/version.map           |   0
 lib/{librte_pdump => pdump}/meson.build       |   0
 lib/{librte_pdump => pdump}/rte_pdump.c       |   0
 lib/{librte_pdump => pdump}/rte_pdump.h       |   0
 lib/{librte_pdump => pdump}/version.map       |   0
 lib/{librte_pipeline => pipeline}/meson.build |   0
 .../rte_pipeline.c                            |   0
 .../rte_pipeline.h                            |   0
 .../rte_port_in_action.c                      |   0
 .../rte_port_in_action.h                      |   0
 .../rte_swx_ctl.c                             |   0
 .../rte_swx_ctl.h                             |   0
 .../rte_swx_extern.h                          |   0
 .../rte_swx_pipeline.c                        |   0
 .../rte_swx_pipeline.h                        |   0
 .../rte_swx_pipeline_spec.c                   |   0
 .../rte_table_action.c                        |   0
 .../rte_table_action.h                        |   0
 lib/{librte_pipeline => pipeline}/version.map |   0
 lib/{librte_port => port}/meson.build         |   0
 lib/{librte_port => port}/rte_port.h          |   0
 lib/{librte_port => port}/rte_port_ethdev.c   |   0
 lib/{librte_port => port}/rte_port_ethdev.h   |   0
 lib/{librte_port => port}/rte_port_eventdev.c |   0
 lib/{librte_port => port}/rte_port_eventdev.h |   0
 lib/{librte_port => port}/rte_port_fd.c       |   0
 lib/{librte_port => port}/rte_port_fd.h       |   0
 lib/{librte_port => port}/rte_port_frag.c     |   0
 lib/{librte_port => port}/rte_port_frag.h     |   0
 lib/{librte_port => port}/rte_port_kni.c      |   0
 lib/{librte_port => port}/rte_port_kni.h      |   0
 lib/{librte_port => port}/rte_port_ras.c      |   0
 lib/{librte_port => port}/rte_port_ras.h      |   0
 lib/{librte_port => port}/rte_port_ring.c     |   0
 lib/{librte_port => port}/rte_port_ring.h     |   0
 lib/{librte_port => port}/rte_port_sched.c    |   0
 lib/{librte_port => port}/rte_port_sched.h    |   0
 .../rte_port_source_sink.c                    |   0
 .../rte_port_source_sink.h                    |   0
 .../rte_port_sym_crypto.c                     |   0
 .../rte_port_sym_crypto.h                     |   0
 lib/{librte_port => port}/rte_swx_port.h      |   0
 .../rte_swx_port_ethdev.c                     |   0
 .../rte_swx_port_ethdev.h                     |   0
 lib/{librte_port => port}/rte_swx_port_fd.c   |   0
 lib/{librte_port => port}/rte_swx_port_fd.h   |   0
 lib/{librte_port => port}/rte_swx_port_ring.c |   0
 lib/{librte_port => port}/rte_swx_port_ring.h |   0
 .../rte_swx_port_source_sink.c                |   0
 .../rte_swx_port_source_sink.h                |   0
 lib/{librte_port => port}/version.map         |   0
 lib/{librte_power => power}/guest_channel.c   |   0
 lib/{librte_power => power}/guest_channel.h   |   0
 lib/{librte_power => power}/meson.build       |   0
 .../power_acpi_cpufreq.c                      |   0
 .../power_acpi_cpufreq.h                      |   0
 lib/{librte_power => power}/power_common.c    |   0
 lib/{librte_power => power}/power_common.h    |   0
 lib/{librte_power => power}/power_kvm_vm.c    |   0
 lib/{librte_power => power}/power_kvm_vm.h    |   0
 .../power_pstate_cpufreq.c                    |   0
 .../power_pstate_cpufreq.h                    |   0
 lib/{librte_power => power}/rte_power.c       |   0
 lib/{librte_power => power}/rte_power.h       |   0
 .../rte_power_empty_poll.c                    |   0
 .../rte_power_empty_poll.h                    |   0
 .../rte_power_guest_channel.h                 |   0
 .../rte_power_pmd_mgmt.c                      |   0
 .../rte_power_pmd_mgmt.h                      |   0
 lib/{librte_power => power}/version.map       |   0
 lib/{librte_rawdev => rawdev}/meson.build     |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.c    |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.h    |   0
 .../rte_rawdev_pmd.h                          |   0
 lib/{librte_rawdev => rawdev}/version.map     |   0
 lib/{librte_rcu => rcu}/meson.build           |   0
 lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.c        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.h        |   0
 lib/{librte_rcu => rcu}/version.map           |   0
 lib/{librte_regexdev => regexdev}/meson.build |   0
 .../rte_regexdev.c                            |   0
 .../rte_regexdev.h                            |   0
 .../rte_regexdev_core.h                       |   0
 .../rte_regexdev_driver.h                     |   0
 lib/{librte_regexdev => regexdev}/version.map |   0
 lib/{librte_reorder => reorder}/meson.build   |   0
 lib/{librte_reorder => reorder}/rte_reorder.c |   0
 lib/{librte_reorder => reorder}/rte_reorder.h |   0
 lib/{librte_reorder => reorder}/version.map   |   0
 lib/{librte_rib => rib}/meson.build           |   0
 lib/{librte_rib => rib}/rte_rib.c             |   0
 lib/{librte_rib => rib}/rte_rib.h             |   0
 lib/{librte_rib => rib}/rte_rib6.c            |   0
 lib/{librte_rib => rib}/rte_rib6.h            |   0
 lib/{librte_rib => rib}/version.map           |   0
 lib/{librte_ring => ring}/meson.build         |   0
 lib/{librte_ring => ring}/rte_ring.c          |   0
 lib/{librte_ring => ring}/rte_ring.h          |   0
 lib/{librte_ring => ring}/rte_ring_c11_pvt.h  |   0
 lib/{librte_ring => ring}/rte_ring_core.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem_pvt.h |   0
 .../rte_ring_generic_pvt.h                    |   0
 lib/{librte_ring => ring}/rte_ring_hts.h      |   0
 .../rte_ring_hts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/rte_ring_peek.h     |   0
 .../rte_ring_peek_elem_pvt.h                  |   0
 lib/{librte_ring => ring}/rte_ring_peek_zc.h  |   0
 lib/{librte_ring => ring}/rte_ring_rts.h      |   0
 .../rte_ring_rts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/version.map         |   0
 lib/{librte_sched => sched}/meson.build       |   0
 lib/{librte_sched => sched}/rte_approx.c      |   0
 lib/{librte_sched => sched}/rte_approx.h      |   0
 lib/{librte_sched => sched}/rte_red.c         |   0
 lib/{librte_sched => sched}/rte_red.h         |   0
 lib/{librte_sched => sched}/rte_sched.c       |   0
 lib/{librte_sched => sched}/rte_sched.h       |   0
 .../rte_sched_common.h                        |   0
 lib/{librte_sched => sched}/version.map       |   0
 lib/{librte_security => security}/meson.build |   0
 .../rte_security.c                            |   0
 .../rte_security.h                            |   0
 .../rte_security_driver.h                     |   0
 lib/{librte_security => security}/version.map |   0
 lib/{librte_stack => stack}/meson.build       |   0
 lib/{librte_stack => stack}/rte_stack.c       |   0
 lib/{librte_stack => stack}/rte_stack.h       |   0
 lib/{librte_stack => stack}/rte_stack_lf.c    |   0
 lib/{librte_stack => stack}/rte_stack_lf.h    |   0
 .../rte_stack_lf_c11.h                        |   0
 .../rte_stack_lf_generic.h                    |   0
 .../rte_stack_lf_stubs.h                      |   0
 lib/{librte_stack => stack}/rte_stack_std.c   |   0
 lib/{librte_stack => stack}/rte_stack_std.h   |   0
 lib/{librte_stack => stack}/stack_pvt.h       |   0
 lib/{librte_stack => stack}/version.map       |   0
 lib/{librte_table => table}/meson.build       |   0
 lib/{librte_table => table}/rte_lru.h         |   0
 lib/{librte_table => table}/rte_lru_arm64.h   |   0
 lib/{librte_table => table}/rte_lru_x86.h     |   0
 lib/{librte_table => table}/rte_swx_table.h   |   0
 .../rte_swx_table_em.c                        |   0
 .../rte_swx_table_em.h                        |   0
 .../rte_swx_table_wm.c                        |   0
 .../rte_swx_table_wm.h                        |   0
 lib/{librte_table => table}/rte_table.h       |   0
 lib/{librte_table => table}/rte_table_acl.c   |   0
 lib/{librte_table => table}/rte_table_acl.h   |   0
 lib/{librte_table => table}/rte_table_array.c |   0
 lib/{librte_table => table}/rte_table_array.h |   0
 lib/{librte_table => table}/rte_table_hash.h  |   0
 .../rte_table_hash_cuckoo.c                   |   0
 .../rte_table_hash_cuckoo.h                   |   0
 .../rte_table_hash_ext.c                      |   0
 .../rte_table_hash_func.h                     |   0
 .../rte_table_hash_func_arm64.h               |   0
 .../rte_table_hash_key16.c                    |   0
 .../rte_table_hash_key32.c                    |   0
 .../rte_table_hash_key8.c                     |   0
 .../rte_table_hash_lru.c                      |   0
 lib/{librte_table => table}/rte_table_lpm.c   |   0
 lib/{librte_table => table}/rte_table_lpm.h   |   0
 .../rte_table_lpm_ipv6.c                      |   0
 .../rte_table_lpm_ipv6.h                      |   0
 lib/{librte_table => table}/rte_table_stub.c  |   0
 lib/{librte_table => table}/rte_table_stub.h  |   0
 lib/{librte_table => table}/version.map       |   0
 .../meson.build                               |   2 +-
 .../rte_telemetry.h                           |   0
 .../telemetry.c                               |   0
 .../telemetry_data.c                          |   0
 .../telemetry_data.h                          |   0
 .../telemetry_internal.h                      |   0
 .../telemetry_json.h                          |   0
 .../telemetry_legacy.c                        |   0
 .../version.map                               |   0
 lib/{librte_timer => timer}/meson.build       |   0
 lib/{librte_timer => timer}/rte_timer.c       |   0
 lib/{librte_timer => timer}/rte_timer.h       |   0
 lib/{librte_timer => timer}/version.map       |   0
 lib/{librte_vhost => vhost}/fd_man.c          |   0
 lib/{librte_vhost => vhost}/fd_man.h          |   0
 lib/{librte_vhost => vhost}/iotlb.c           |   0
 lib/{librte_vhost => vhost}/iotlb.h           |   0
 lib/{librte_vhost => vhost}/meson.build       |   0
 lib/{librte_vhost => vhost}/rte_vdpa.h        |   0
 lib/{librte_vhost => vhost}/rte_vdpa_dev.h    |   0
 lib/{librte_vhost => vhost}/rte_vhost.h       |   0
 lib/{librte_vhost => vhost}/rte_vhost_async.h |   0
 .../rte_vhost_crypto.h                        |   0
 lib/{librte_vhost => vhost}/socket.c          |   0
 lib/{librte_vhost => vhost}/vdpa.c            |   0
 lib/{librte_vhost => vhost}/version.map       |   0
 lib/{librte_vhost => vhost}/vhost.c           |   0
 lib/{librte_vhost => vhost}/vhost.h           |   0
 lib/{librte_vhost => vhost}/vhost_crypto.c    |   0
 lib/{librte_vhost => vhost}/vhost_user.c      |   0
 lib/{librte_vhost => vhost}/vhost_user.h      |   0
 lib/{librte_vhost => vhost}/virtio_crypto.h   |   0
 lib/{librte_vhost => vhost}/virtio_net.c      |   0
 license/exceptions.txt                        |   6 +-
 meson.build                                   |   6 +-
 874 files changed, 207 insertions(+), 205 deletions(-)
 rename lib/{librte_acl => acl}/acl.h (100%)
 rename lib/{librte_acl => acl}/acl_bld.c (100%)
 rename lib/{librte_acl => acl}/acl_gen.c (100%)
 rename lib/{librte_acl => acl}/acl_run.h (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.c (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512_common.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x16.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x8.h (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.c (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.h (100%)
 rename lib/{librte_acl => acl}/acl_run_scalar.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.h (100%)
 rename lib/{librte_acl => acl}/acl_vect.h (100%)
 rename lib/{librte_acl => acl}/meson.build (100%)
 rename lib/{librte_acl => acl}/rte_acl.c (100%)
 rename lib/{librte_acl => acl}/rte_acl.h (100%)
 rename lib/{librte_acl => acl}/rte_acl_osdep.h (100%)
 rename lib/{librte_acl => acl}/tb_mem.c (100%)
 rename lib/{librte_acl => acl}/tb_mem.h (100%)
 rename lib/{librte_acl => acl}/version.map (100%)
 rename lib/{librte_bbdev => bbdev}/meson.build (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.c (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_op.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h (100%)
 rename lib/{librte_bbdev => bbdev}/version.map (100%)
 rename lib/{librte_bitratestats => bitratestats}/meson.build (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.c (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.h (100%)
 rename lib/{librte_bitratestats => bitratestats}/version.map (100%)
 rename lib/{librte_bpf => bpf}/bpf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_def.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_exec.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_impl.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_arm64.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_x86.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load_elf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_pkt.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_validate.c (100%)
 rename lib/{librte_bpf => bpf}/meson.build (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf.h (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf_ethdev.h (100%)
 rename lib/{librte_bpf => bpf}/version.map (100%)
 rename lib/{librte_cfgfile => cfgfile}/meson.build (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h (100%)
 rename lib/{librte_cfgfile => cfgfile}/version.map (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_unix.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_windows.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_private.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.h (100%)
 rename lib/{librte_cmdline => cmdline}/meson.build (100%)
 rename lib/{librte_cmdline => cmdline}/version.map (100%)
 rename lib/{librte_compressdev => compressdev}/meson.build (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_internal.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.h (100%)
 rename lib/{librte_compressdev => compressdev}/version.map (100%)
 rename lib/{librte_cryptodev => cryptodev}/cryptodev_trace_points.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/meson.build (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_asym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_sym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace_fp.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/version.map (100%)
 rename lib/{librte_distributor => distributor}/distributor_private.h (100%)
 rename lib/{librte_distributor => distributor}/meson.build (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.h (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_generic.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_sse.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.h (100%)
 rename lib/{librte_distributor => distributor}/version.map (100%)
 rename lib/{librte_eal => eal}/arm/include/meson.build (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/arm/meson.build (100%)
 rename lib/{librte_eal => eal}/arm/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_bus.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_class.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_config.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_debug.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dev.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_devargs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dynmem.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_errno.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_fbarray.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hexdump.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_launch.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_lcore.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_log.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_mcfg.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memalloc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memory.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memzone.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_options.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_proc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_string_fns.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_tailqs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_thread.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_timer.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_ctf.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_points.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_utils.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_uuid.c (100%)
 rename lib/{librte_eal => eal}/common/eal_filesystem.h (100%)
 rename lib/{librte_eal => eal}/common/eal_hugepages.h (100%)
 rename lib/{librte_eal => eal}/common/eal_internal_cfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memalloc.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memcfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_options.h (100%)
 rename lib/{librte_eal => eal}/common/eal_private.h (100%)
 rename lib/{librte_eal => eal}/common/eal_thread.h (100%)
 rename lib/{librte_eal => eal}/common/eal_trace.h (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.c (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.h (100%)
 rename lib/{librte_eal => eal}/common/meson.build (100%)
 rename lib/{librte_eal => eal}/common/rte_keepalive.c (100%)
 rename lib/{librte_eal => eal}/common/rte_malloc.c (100%)
 rename lib/{librte_eal => eal}/common/rte_random.c (100%)
 rename lib/{librte_eal => eal}/common/rte_reciprocal.c (100%)
 rename lib/{librte_eal => eal}/common/rte_service.c (100%)
 rename lib/{librte_eal => eal}/common/rte_version.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm_private.h (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/freebsd/include/meson.build (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/freebsd/meson.build (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_io.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/include/meson.build (100%)
 rename lib/{librte_eal => eal}/include/rte_alarm.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitmap.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitops.h (100%)
 rename lib/{librte_eal => eal}/include/rte_branch_prediction.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bus.h (100%)
 rename lib/{librte_eal => eal}/include/rte_class.h (100%)
 rename lib/{librte_eal => eal}/include/rte_common.h (100%)
 rename lib/{librte_eal => eal}/include/rte_compat.h (100%)
 rename lib/{librte_eal => eal}/include/rte_debug.h (100%)
 rename lib/{librte_eal => eal}/include/rte_dev.h (100%)
 rename lib/{librte_eal => eal}/include/rte_devargs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_memconfig.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_paging.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_errno.h (100%)
 rename lib/{librte_eal => eal}/include/rte_fbarray.h (100%)
 rename lib/{librte_eal => eal}/include/rte_function_versioning.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hexdump.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hypervisor.h (100%)
 rename lib/{librte_eal => eal}/include/rte_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_keepalive.h (100%)
 rename lib/{librte_eal => eal}/include/rte_launch.h (100%)
 rename lib/{librte_eal => eal}/include/rte_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_log.h (100%)
 rename lib/{librte_eal => eal}/include/rte_malloc.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memory.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memzone.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_feature_defs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_features.h (100%)
 rename lib/{librte_eal => eal}/include/rte_per_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_random.h (100%)
 rename lib/{librte_eal => eal}/include/rte_reciprocal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service_component.h (100%)
 rename lib/{librte_eal => eal}/include/rte_string_fns.h (100%)
 rename lib/{librte_eal => eal}/include/rte_tailq.h (100%)
 rename lib/{librte_eal => eal}/include/rte_test.h (100%)
 rename lib/{librte_eal => eal}/include/rte_thread.h (100%)
 rename lib/{librte_eal => eal}/include/rte_time.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point_register.h (100%)
 rename lib/{librte_eal => eal}/include/rte_uuid.h (100%)
 rename lib/{librte_eal => eal}/include/rte_version.h (100%)
 rename lib/{librte_eal => eal}/include/rte_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_log.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio_mp_sync.c (100%)
 rename lib/{librte_eal => eal}/linux/include/meson.build (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/linux/meson.build (100%)
 rename lib/{librte_eal => eal}/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/include/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_altivec.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/ppc/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/rte_eal_exports.def (100%)
 rename lib/{librte_eal => eal}/unix/eal_file.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_memory.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_timer.c (100%)
 rename lib/{librte_eal => eal}/unix/meson.build (100%)
 rename lib/{librte_eal => eal}/unix/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/version.map (100%)
 rename lib/{librte_eal => eal}/windows/eal.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_file.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_hugepages.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_log.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_mp.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/fnmatch.c (100%)
 rename lib/{librte_eal => eal}/windows/getopt.c (100%)
 rename lib/{librte_eal => eal}/windows/include/arpa/inet.h (100%)
 rename lib/{librte_eal => eal}/windows/include/dirent.h (100%)
 rename lib/{librte_eal => eal}/windows/include/fnmatch.h (100%)
 rename lib/{librte_eal => eal}/windows/include/getopt.h (100%)
 rename lib/{librte_eal => eal}/windows/include/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/include/netinet/in.h (100%)
 rename lib/{librte_eal => eal}/windows/include/netinet/ip.h (100%)
 rename lib/{librte_eal => eal}/windows/include/pthread.h (100%)
 rename lib/{librte_eal => eal}/windows/include/regex.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_virt2phys.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sched.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/queue.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/socket.h (100%)
 rename lib/{librte_eal => eal}/windows/include/unistd.h (100%)
 rename lib/{librte_eal => eal}/windows/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/x86/include/meson.build (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rtm.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/x86/meson.build (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuid.h (100%)
 rename lib/{librte_eal => eal}/x86/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_spinlock.c (100%)
 rename lib/{librte_efd => efd}/meson.build (100%)
 rename lib/{librte_efd => efd}/rte_efd.c (100%)
 rename lib/{librte_efd => efd}/rte_efd.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_arm64.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_x86.h (100%)
 rename lib/{librte_efd => efd}/version.map (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_pci.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_trace_points.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_vdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/meson.build (100%)
 rename lib/{librte_ethdev => ethdev}/rte_class_eth.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_dev_info.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_core.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace_fp.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/version.map (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_pci.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_vdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_trace_points.c (100%)
 rename lib/{librte_eventdev => eventdev}/meson.build (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace_fp.h (100%)
 rename lib/{librte_eventdev => eventdev}/version.map (100%)
 rename lib/{librte_fib => fib}/dir24_8.c (100%)
 rename lib/{librte_fib => fib}/dir24_8.h (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.c (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.h (100%)
 rename lib/{librte_fib => fib}/meson.build (100%)
 rename lib/{librte_fib => fib}/rte_fib.c (100%)
 rename lib/{librte_fib => fib}/rte_fib.h (100%)
 rename lib/{librte_fib => fib}/rte_fib6.c (100%)
 rename lib/{librte_fib => fib}/rte_fib6.h (100%)
 rename lib/{librte_fib => fib}/trie.c (100%)
 rename lib/{librte_fib => fib}/trie.h (100%)
 rename lib/{librte_fib => fib}/trie_avx512.c (100%)
 rename lib/{librte_fib => fib}/trie_avx512.h (100%)
 rename lib/{librte_fib => fib}/version.map (100%)
 rename lib/{librte_flow_classify => flow_classify}/meson.build (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/version.map (100%)
 rename lib/{librte_graph => graph}/graph.c (100%)
 rename lib/{librte_graph => graph}/graph_debug.c (100%)
 rename lib/{librte_graph => graph}/graph_ops.c (100%)
 rename lib/{librte_graph => graph}/graph_populate.c (100%)
 rename lib/{librte_graph => graph}/graph_private.h (100%)
 rename lib/{librte_graph => graph}/graph_stats.c (100%)
 rename lib/{librte_graph => graph}/meson.build (100%)
 rename lib/{librte_graph => graph}/node.c (100%)
 rename lib/{librte_graph => graph}/rte_graph.h (100%)
 rename lib/{librte_graph => graph}/rte_graph_worker.h (100%)
 rename lib/{librte_graph => graph}/version.map (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_udp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.h (100%)
 rename lib/{librte_gro => gro}/meson.build (100%)
 rename lib/{librte_gro => gro}/rte_gro.c (100%)
 rename lib/{librte_gro => gro}/rte_gro.h (100%)
 rename lib/{librte_gro => gro}/version.map (100%)
 rename lib/{librte_gso => gso}/gso_common.c (100%)
 rename lib/{librte_gso => gso}/gso_common.h (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.h (100%)
 rename lib/{librte_gso => gso}/gso_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_udp4.h (100%)
 rename lib/{librte_gso => gso}/meson.build (100%)
 rename lib/{librte_gso => gso}/rte_gso.c (100%)
 rename lib/{librte_gso => gso}/rte_gso.h (100%)
 rename lib/{librte_gso => gso}/version.map (100%)
 rename lib/{librte_hash => hash}/meson.build (100%)
 rename lib/{librte_hash => hash}/rte_cmp_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cmp_x86.h (100%)
 rename lib/{librte_hash => hash}/rte_crc_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash_crc.h (100%)
 rename lib/{librte_hash => hash}/rte_jhash.h (100%)
 rename lib/{librte_hash => hash}/rte_thash.h (100%)
 rename lib/{librte_hash => hash}/version.map (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_common.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_internal.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/meson.build (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag_common.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/version.map (100%)
 rename lib/{librte_ipsec => ipsec}/crypto.h (100%)
 rename lib/{librte_ipsec => ipsec}/esp_inb.c (100%)
 rename lib/{librte_ipsec => ipsec}/esp_outb.c (100%)
 rename lib/{librte_ipsec => ipsec}/iph.h (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sad.c (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sqn.h (100%)
 rename lib/{librte_ipsec => ipsec}/meson.build (100%)
 rename lib/{librte_ipsec => ipsec}/misc.h (100%)
 rename lib/{librte_ipsec => ipsec}/pad.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_group.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h (100%)
 rename lib/{librte_ipsec => ipsec}/sa.c (100%)
 rename lib/{librte_ipsec => ipsec}/sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/ses.c (100%)
 rename lib/{librte_ipsec => ipsec}/version.map (100%)
 rename lib/{librte_jobstats => jobstats}/meson.build (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.c (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.h (100%)
 rename lib/{librte_jobstats => jobstats}/version.map (100%)
 rename lib/{librte_kni => kni}/meson.build (100%)
 rename lib/{librte_kni => kni}/rte_kni.c (100%)
 rename lib/{librte_kni => kni}/rte_kni.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_common.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_fifo.h (100%)
 rename lib/{librte_kni => kni}/version.map (100%)
 rename lib/{librte_kvargs => kvargs}/meson.build (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.c (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.h (100%)
 rename lib/{librte_kvargs => kvargs}/version.map (100%)
 rename lib/{librte_latencystats => latencystats}/meson.build (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.c (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.h (100%)
 rename lib/{librte_latencystats => latencystats}/version.map (100%)
 rename lib/{librte_lpm => lpm}/meson.build (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_altivec.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_neon.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sse.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sve.h (100%)
 rename lib/{librte_lpm => lpm}/version.map (100%)
 rename lib/{librte_mbuf => mbuf}/meson.build (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_core.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h (100%)
 rename lib/{librte_mbuf => mbuf}/version.map (100%)
 rename lib/{librte_member => member}/meson.build (100%)
 rename lib/{librte_member => member}/rte_member.c (100%)
 rename lib/{librte_member => member}/rte_member.h (100%)
 rename lib/{librte_member => member}/rte_member_ht.c (100%)
 rename lib/{librte_member => member}/rte_member_ht.h (100%)
 rename lib/{librte_member => member}/rte_member_vbf.c (100%)
 rename lib/{librte_member => member}/rte_member_vbf.h (100%)
 rename lib/{librte_member => member}/rte_member_x86.h (100%)
 rename lib/{librte_member => member}/version.map (100%)
 rename lib/{librte_mempool => mempool}/mempool_trace_points.c (100%)
 rename lib/{librte_mempool => mempool}/meson.build (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops_default.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace_fp.h (100%)
 rename lib/{librte_mempool => mempool}/version.map (100%)
 rename lib/{librte_meter => meter}/meson.build (100%)
 rename lib/{librte_meter => meter}/rte_meter.c (100%)
 rename lib/{librte_meter => meter}/rte_meter.h (100%)
 rename lib/{librte_meter => meter}/version.map (100%)
 rename lib/{librte_metrics => metrics}/meson.build (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.h (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.h (100%)
 rename lib/{librte_metrics => metrics}/version.map (100%)
 rename lib/{librte_net => net}/meson.build (100%)
 rename lib/{librte_net => net}/net_crc.h (100%)
 rename lib/{librte_net => net}/net_crc_avx512.c (100%)
 rename lib/{librte_net => net}/net_crc_neon.c (100%)
 rename lib/{librte_net => net}/net_crc_sse.c (100%)
 rename lib/{librte_net => net}/rte_arp.c (100%)
 rename lib/{librte_net => net}/rte_arp.h (100%)
 rename lib/{librte_net => net}/rte_ecpri.h (100%)
 rename lib/{librte_net => net}/rte_esp.h (100%)
 rename lib/{librte_net => net}/rte_ether.c (100%)
 rename lib/{librte_net => net}/rte_ether.h (100%)
 rename lib/{librte_net => net}/rte_geneve.h (100%)
 rename lib/{librte_net => net}/rte_gre.h (100%)
 rename lib/{librte_net => net}/rte_gtp.h (100%)
 rename lib/{librte_net => net}/rte_higig.h (100%)
 rename lib/{librte_net => net}/rte_icmp.h (100%)
 rename lib/{librte_net => net}/rte_ip.h (100%)
 rename lib/{librte_net => net}/rte_mpls.h (100%)
 rename lib/{librte_net => net}/rte_net.c (100%)
 rename lib/{librte_net => net}/rte_net.h (100%)
 rename lib/{librte_net => net}/rte_net_crc.c (100%)
 rename lib/{librte_net => net}/rte_net_crc.h (100%)
 rename lib/{librte_net => net}/rte_sctp.h (100%)
 rename lib/{librte_net => net}/rte_tcp.h (100%)
 rename lib/{librte_net => net}/rte_udp.h (100%)
 rename lib/{librte_net => net}/rte_vxlan.h (100%)
 rename lib/{librte_net => net}/version.map (100%)
 rename lib/{librte_node => node}/ethdev_ctrl.c (100%)
 rename lib/{librte_node => node}/ethdev_rx.c (100%)
 rename lib/{librte_node => node}/ethdev_rx_priv.h (100%)
 rename lib/{librte_node => node}/ethdev_tx.c (100%)
 rename lib/{librte_node => node}/ethdev_tx_priv.h (100%)
 rename lib/{librte_node => node}/ip4_lookup.c (100%)
 rename lib/{librte_node => node}/ip4_lookup_neon.h (100%)
 rename lib/{librte_node => node}/ip4_lookup_sse.h (100%)
 rename lib/{librte_node => node}/ip4_rewrite.c (100%)
 rename lib/{librte_node => node}/ip4_rewrite_priv.h (100%)
 rename lib/{librte_node => node}/log.c (100%)
 rename lib/{librte_node => node}/meson.build (100%)
 rename lib/{librte_node => node}/node_private.h (100%)
 rename lib/{librte_node => node}/null.c (100%)
 rename lib/{librte_node => node}/pkt_cls.c (100%)
 rename lib/{librte_node => node}/pkt_cls_priv.h (100%)
 rename lib/{librte_node => node}/pkt_drop.c (100%)
 rename lib/{librte_node => node}/rte_node_eth_api.h (100%)
 rename lib/{librte_node => node}/rte_node_ip4_api.h (100%)
 rename lib/{librte_node => node}/version.map (100%)
 rename lib/{librte_pci => pci}/meson.build (100%)
 rename lib/{librte_pci => pci}/rte_pci.c (100%)
 rename lib/{librte_pci => pci}/rte_pci.h (100%)
 rename lib/{librte_pci => pci}/version.map (100%)
 rename lib/{librte_pdump => pdump}/meson.build (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.c (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.h (100%)
 rename lib/{librte_pdump => pdump}/version.map (100%)
 rename lib/{librte_pipeline => pipeline}/meson.build (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_extern.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline_spec.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/version.map (100%)
 rename lib/{librte_port => port}/meson.build (100%)
 rename lib/{librte_port => port}/rte_port.h (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.c (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.h (100%)
 rename lib/{librte_port => port}/rte_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_port_frag.c (100%)
 rename lib/{librte_port => port}/rte_port_frag.h (100%)
 rename lib/{librte_port => port}/rte_port_kni.c (100%)
 rename lib/{librte_port => port}/rte_port_kni.h (100%)
 rename lib/{librte_port => port}/rte_port_ras.c (100%)
 rename lib/{librte_port => port}/rte_port_ras.h (100%)
 rename lib/{librte_port => port}/rte_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_port_sched.c (100%)
 rename lib/{librte_port => port}/rte_port_sched.h (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.h (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.c (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.h (100%)
 rename lib/{librte_port => port}/rte_swx_port.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.h (100%)
 rename lib/{librte_port => port}/version.map (100%)
 rename lib/{librte_power => power}/guest_channel.c (100%)
 rename lib/{librte_power => power}/guest_channel.h (100%)
 rename lib/{librte_power => power}/meson.build (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.h (100%)
 rename lib/{librte_power => power}/power_common.c (100%)
 rename lib/{librte_power => power}/power_common.h (100%)
 rename lib/{librte_power => power}/power_kvm_vm.c (100%)
 rename lib/{librte_power => power}/power_kvm_vm.h (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.h (100%)
 rename lib/{librte_power => power}/rte_power.c (100%)
 rename lib/{librte_power => power}/rte_power.h (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.c (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.h (100%)
 rename lib/{librte_power => power}/rte_power_guest_channel.h (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.c (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.h (100%)
 rename lib/{librte_power => power}/version.map (100%)
 rename lib/{librte_rawdev => rawdev}/meson.build (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.c (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.h (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev_pmd.h (100%)
 rename lib/{librte_rawdev => rawdev}/version.map (100%)
 rename lib/{librte_rcu => rcu}/meson.build (100%)
 rename lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.c (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.h (100%)
 rename lib/{librte_rcu => rcu}/version.map (100%)
 rename lib/{librte_regexdev => regexdev}/meson.build (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.c (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_core.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_driver.h (100%)
 rename lib/{librte_regexdev => regexdev}/version.map (100%)
 rename lib/{librte_reorder => reorder}/meson.build (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.c (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.h (100%)
 rename lib/{librte_reorder => reorder}/version.map (100%)
 rename lib/{librte_rib => rib}/meson.build (100%)
 rename lib/{librte_rib => rib}/rte_rib.c (100%)
 rename lib/{librte_rib => rib}/rte_rib.h (100%)
 rename lib/{librte_rib => rib}/rte_rib6.c (100%)
 rename lib/{librte_rib => rib}/rte_rib6.h (100%)
 rename lib/{librte_rib => rib}/version.map (100%)
 rename lib/{librte_ring => ring}/meson.build (100%)
 rename lib/{librte_ring => ring}/rte_ring.c (100%)
 rename lib/{librte_ring => ring}/rte_ring.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_c11_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_core.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_generic_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_zc.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/version.map (100%)
 rename lib/{librte_sched => sched}/meson.build (100%)
 rename lib/{librte_sched => sched}/rte_approx.c (100%)
 rename lib/{librte_sched => sched}/rte_approx.h (100%)
 rename lib/{librte_sched => sched}/rte_red.c (100%)
 rename lib/{librte_sched => sched}/rte_red.h (100%)
 rename lib/{librte_sched => sched}/rte_sched.c (100%)
 rename lib/{librte_sched => sched}/rte_sched.h (100%)
 rename lib/{librte_sched => sched}/rte_sched_common.h (100%)
 rename lib/{librte_sched => sched}/version.map (100%)
 rename lib/{librte_security => security}/meson.build (100%)
 rename lib/{librte_security => security}/rte_security.c (100%)
 rename lib/{librte_security => security}/rte_security.h (100%)
 rename lib/{librte_security => security}/rte_security_driver.h (100%)
 rename lib/{librte_security => security}/version.map (100%)
 rename lib/{librte_stack => stack}/meson.build (100%)
 rename lib/{librte_stack => stack}/rte_stack.c (100%)
 rename lib/{librte_stack => stack}/rte_stack.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_c11.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_generic.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_stubs.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.h (100%)
 rename lib/{librte_stack => stack}/stack_pvt.h (100%)
 rename lib/{librte_stack => stack}/version.map (100%)
 rename lib/{librte_table => table}/meson.build (100%)
 rename lib/{librte_table => table}/rte_lru.h (100%)
 rename lib/{librte_table => table}/rte_lru_arm64.h (100%)
 rename lib/{librte_table => table}/rte_lru_x86.h (100%)
 rename lib/{librte_table => table}/rte_swx_table.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.h (100%)
 rename lib/{librte_table => table}/rte_table.h (100%)
 rename lib/{librte_table => table}/rte_table_acl.c (100%)
 rename lib/{librte_table => table}/rte_table_acl.h (100%)
 rename lib/{librte_table => table}/rte_table_array.c (100%)
 rename lib/{librte_table => table}/rte_table_array.h (100%)
 rename lib/{librte_table => table}/rte_table_hash.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_ext.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_func.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_func_arm64.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_key16.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key32.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key8.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_lru.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.h (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.h (100%)
 rename lib/{librte_table => table}/rte_table_stub.c (100%)
 rename lib/{librte_table => table}/rte_table_stub.h (100%)
 rename lib/{librte_table => table}/version.map (100%)
 rename lib/{librte_telemetry => telemetry}/meson.build (80%)
 rename lib/{librte_telemetry => telemetry}/rte_telemetry.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_internal.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_json.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_legacy.c (100%)
 rename lib/{librte_telemetry => telemetry}/version.map (100%)
 rename lib/{librte_timer => timer}/meson.build (100%)
 rename lib/{librte_timer => timer}/rte_timer.c (100%)
 rename lib/{librte_timer => timer}/rte_timer.h (100%)
 rename lib/{librte_timer => timer}/version.map (100%)
 rename lib/{librte_vhost => vhost}/fd_man.c (100%)
 rename lib/{librte_vhost => vhost}/fd_man.h (100%)
 rename lib/{librte_vhost => vhost}/iotlb.c (100%)
 rename lib/{librte_vhost => vhost}/iotlb.h (100%)
 rename lib/{librte_vhost => vhost}/meson.build (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa_dev.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_async.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/socket.c (100%)
 rename lib/{librte_vhost => vhost}/vdpa.c (100%)
 rename lib/{librte_vhost => vhost}/version.map (100%)
 rename lib/{librte_vhost => vhost}/vhost.c (100%)
 rename lib/{librte_vhost => vhost}/vhost.h (100%)
 rename lib/{librte_vhost => vhost}/vhost_crypto.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_net.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0ec5588540..857cc724fb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -114,8 +114,8 @@ F: .ci/
 ABI Policy & Versioning
 M: Ray Kinsella <mdr@ashroe.eu>
 M: Neil Horman <nhorman@tuxdriver.com>
-F: lib/librte_eal/include/rte_compat.h
-F: lib/librte_eal/include/rte_function_versioning.h
+F: lib/eal/include/rte_compat.h
+F: lib/eal/include/rte_function_versioning.h
 F: doc/guides/contributing/abi_*.rst
 F: doc/guides/rel_notes/deprecation.rst
 F: devtools/check-abi.sh
@@ -145,10 +145,10 @@ Environment Abstraction Layer
 T: git://dpdk.org/dpdk
 
 EAL API and common code
-F: lib/librte_eal/common/
-F: lib/librte_eal/unix/
-F: lib/librte_eal/include/
-F: lib/librte_eal/version.map
+F: lib/eal/common/
+F: lib/eal/unix/
+F: lib/eal/include/
+F: lib/eal/version.map
 F: doc/guides/prog_guide/env_abstraction_layer.rst
 F: app/test/test_alarm.c
 F: app/test/test_atomic.c
@@ -175,24 +175,24 @@ F: app/test/test_version.c
 Trace - EXPERIMENTAL
 M: Jerin Jacob <jerinj@marvell.com>
 M: Sunil Kumar Kori <skori@marvell.com>
-F: lib/librte_eal/include/rte_trace*.h
-F: lib/librte_eal/common/eal_common_trace*.c
-F: lib/librte_eal/common/eal_trace.h
+F: lib/eal/include/rte_trace*.h
+F: lib/eal/common/eal_common_trace*.c
+F: lib/eal/common/eal_trace.h
 F: doc/guides/prog_guide/trace_lib.rst
 F: app/test/test_trace*
 
 Memory Allocation
 M: Anatoly Burakov <anatoly.burakov@intel.com>
-F: lib/librte_eal/include/rte_fbarray.h
-F: lib/librte_eal/include/rte_mem*
-F: lib/librte_eal/include/rte_malloc.h
-F: lib/librte_eal/common/*malloc*
-F: lib/librte_eal/common/eal_common_dynmem.c
-F: lib/librte_eal/common/eal_common_fbarray.c
-F: lib/librte_eal/common/eal_common_mem*
-F: lib/librte_eal/common/eal_hugepages.h
-F: lib/librte_eal/linux/eal_mem*
-F: lib/librte_eal/freebsd/eal_mem*
+F: lib/eal/include/rte_fbarray.h
+F: lib/eal/include/rte_mem*
+F: lib/eal/include/rte_malloc.h
+F: lib/eal/common/*malloc*
+F: lib/eal/common/eal_common_dynmem.c
+F: lib/eal/common/eal_common_fbarray.c
+F: lib/eal/common/eal_common_mem*
+F: lib/eal/common/eal_hugepages.h
+F: lib/eal/linux/eal_mem*
+F: lib/eal/freebsd/eal_mem*
 F: doc/guides/prog_guide/env_abstraction_layer.rst
 F: app/test/test_external_mem.c
 F: app/test/test_func_reentrancy.c
@@ -203,19 +203,19 @@ F: app/test/test_memzone.c
 
 Interrupt Subsystem
 M: Harman Kalra <hkalra@marvell.com>
-F: lib/librte_eal/*/*interrupts.*
+F: lib/eal/*/*interrupts.*
 F: app/test/test_interrupts.c
 
 Keep alive
-F: lib/librte_eal/include/rte_keepalive.h
-F: lib/librte_eal/common/rte_keepalive.c
+F: lib/eal/include/rte_keepalive.h
+F: lib/eal/common/rte_keepalive.c
 F: examples/l2fwd-keepalive/
 F: doc/guides/sample_app_ug/keep_alive.rst
 
 Secondary process
 M: Anatoly Burakov <anatoly.burakov@intel.com>
 K: RTE_PROC_
-F: lib/librte_eal/common/eal_common_proc.c
+F: lib/eal/common/eal_common_proc.c
 F: doc/guides/prog_guide/multi_proc_support.rst
 F: app/test/test_mp_secondary.c
 F: examples/multi_process/
@@ -223,52 +223,52 @@ F: doc/guides/sample_app_ug/multi_process.rst
 
 Service Cores
 M: Harry van Haaren <harry.van.haaren@intel.com>
-F: lib/librte_eal/include/rte_service.h
-F: lib/librte_eal/include/rte_service_component.h
-F: lib/librte_eal/common/rte_service.c
+F: lib/eal/include/rte_service.h
+F: lib/eal/include/rte_service_component.h
+F: lib/eal/common/rte_service.c
 F: doc/guides/prog_guide/service_cores.rst
 F: app/test/test_service_cores.c
 
 Bitops
 M: Joyce Kong <joyce.kong@arm.com>
-F: lib/librte_eal/include/rte_bitops.h
+F: lib/eal/include/rte_bitops.h
 F: app/test/test_bitops.c
 
 Bitmap
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_eal/include/rte_bitmap.h
+F: lib/eal/include/rte_bitmap.h
 F: app/test/test_bitmap.c
 
 MCSlock
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/librte_eal/include/generic/rte_mcslock.h
+F: lib/eal/include/generic/rte_mcslock.h
 F: app/test/test_mcslock.c
 
 Ticketlock
 M: Joyce Kong <joyce.kong@arm.com>
-F: lib/librte_eal/include/generic/rte_ticketlock.h
+F: lib/eal/include/generic/rte_ticketlock.h
 F: app/test/test_ticketlock.c
 
 Pseudo-random Number Generation
 M: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
-F: lib/librte_eal/include/rte_random.h
-F: lib/librte_eal/common/rte_random.c
+F: lib/eal/include/rte_random.h
+F: lib/eal/common/rte_random.c
 F: app/test/test_rand_perf.c
 
 ARM v7
 M: Jan Viktorin <viktorin@rehivetech.com>
 M: Ruifeng Wang <ruifeng.wang@arm.com>
 F: config/arm/
-F: lib/librte_eal/arm/
-X: lib/librte_eal/arm/include/*_64.h
+F: lib/eal/arm/
+X: lib/eal/arm/include/*_64.h
 
 ARM v8
 M: Jerin Jacob <jerinj@marvell.com>
 M: Ruifeng Wang <ruifeng.wang@arm.com>
 F: config/arm/
 F: doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
-F: lib/librte_eal/arm/
-X: lib/librte_eal/arm/include/*_32.h
+F: lib/eal/arm/
+X: lib/eal/arm/include/*_32.h
 F: lib/*/*_arm64.*
 F: lib/*/*_neon.*
 F: drivers/*/*/*_neon.*
@@ -278,7 +278,7 @@ F: examples/*/*_neon.*
 IBM POWER (alpha)
 M: David Christensen <drc@linux.vnet.ibm.com>
 F: config/ppc/
-F: lib/librte_eal/ppc/
+F: lib/eal/ppc/
 F: lib/*/*_altivec*
 F: drivers/*/*/*_altivec.*
 F: app/*/*_altivec.*
@@ -291,7 +291,7 @@ F: config/x86/
 F: doc/guides/linux_gsg/nic_perf_intel_platform.rst
 F: buildtools/binutils-avx512-check.sh
 F: doc/guides/howto/avx512.rst
-F: lib/librte_eal/x86/
+F: lib/eal/x86/
 F: lib/*/*_sse*
 F: lib/*/*_avx*
 F: drivers/*/*/*_sse*
@@ -302,7 +302,7 @@ F: examples/*/*_sse*
 F: examples/*/*_avx*
 
 Linux EAL (with overlaps)
-F: lib/librte_eal/linux/
+F: lib/eal/linux/
 F: doc/guides/linux_gsg/
 
 Linux UIO
@@ -311,12 +311,12 @@ F: drivers/bus/pci/linux/*uio*
 
 Linux VFIO
 M: Anatoly Burakov <anatoly.burakov@intel.com>
-F: lib/librte_eal/linux/*vfio*
+F: lib/eal/linux/*vfio*
 F: drivers/bus/pci/linux/*vfio*
 
 FreeBSD EAL (with overlaps)
 M: Bruce Richardson <bruce.richardson@intel.com>
-F: lib/librte_eal/freebsd/
+F: lib/eal/freebsd/
 F: doc/guides/freebsd_gsg/
 
 FreeBSD contigmem
@@ -332,15 +332,15 @@ M: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
 M: Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>
 M: Dmitry Malloy <dmitrym@microsoft.com>
 M: Pallavi Kadam <pallavi.kadam@intel.com>
-F: lib/librte_eal/windows/
-F: lib/librte_eal/rte_eal_exports.def
+F: lib/eal/windows/
+F: lib/eal/rte_eal_exports.def
 F: buildtools/map_to_win.py
 F: doc/guides/windows_gsg/
 
 Windows memory allocation
 M: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
-F: lib/librte_eal/windows/eal_hugepages.c
-F: lib/librte_eal/windows/eal_mem*
+F: lib/eal/windows/eal_hugepages.c
+F: lib/eal/windows/eal_mem*
 
 
 Core Libraries
@@ -350,7 +350,7 @@ T: git://dpdk.org/dpdk
 Memory pool
 M: Olivier Matz <olivier.matz@6wind.com>
 M: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
-F: lib/librte_mempool/
+F: lib/mempool/
 F: drivers/mempool/ring/
 F: doc/guides/prog_guide/mempool_lib.rst
 F: app/test/test_mempool*
@@ -359,21 +359,21 @@ F: app/test/test_func_reentrancy.c
 Ring queue
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_ring/
+F: lib/ring/
 F: doc/guides/prog_guide/ring_lib.rst
 F: app/test/test_ring*
 F: app/test/test_func_reentrancy.c
 
 Stack
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_stack/
+F: lib/stack/
 F: drivers/mempool/stack/
 F: app/test/test_stack*
 F: doc/guides/prog_guide/stack_lib.rst
 
 Packet buffer
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_mbuf/
+F: lib/mbuf/
 F: doc/guides/prog_guide/mbuf_lib.rst
 F: app/test/test_mbuf.c
 
@@ -382,7 +382,7 @@ M: Thomas Monjalon <thomas@monjalon.net>
 M: Ferruh Yigit <ferruh.yigit@intel.com>
 M: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/
+F: lib/ethdev/
 F: app/test/test_ethdev*
 F: devtools/test-null.sh
 F: doc/guides/prog_guide/switch_representation.rst
@@ -392,22 +392,22 @@ M: Ori Kam <orika@nvidia.com>
 T: git://dpdk.org/next/dpdk-next-net
 F: app/test-pmd/cmdline_flow.c
 F: doc/guides/prog_guide/rte_flow.rst
-F: lib/librte_ethdev/rte_flow*
+F: lib/ethdev/rte_flow*
 
 Traffic Management API - EXPERIMENTAL
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/rte_tm*
+F: lib/ethdev/rte_tm*
 
 Traffic Metering and Policing API - EXPERIMENTAL
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/rte_mtr*
+F: lib/ethdev/rte_mtr*
 
 Baseband API - EXPERIMENTAL
 M: Nicolas Chautru <nicolas.chautru@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_bbdev/
+F: lib/bbdev/
 F: doc/guides/prog_guide/bbdev.rst
 F: drivers/baseband/
 F: doc/guides/bbdevs/
@@ -419,7 +419,7 @@ F: doc/guides/sample_app_ug/bbdev_app.rst
 Crypto API
 M: Declan Doherty <declan.doherty@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_cryptodev/
+F: lib/cryptodev/
 F: app/test/test_cryptodev*
 F: examples/l2fwd-crypto/
 
@@ -427,7 +427,7 @@ Security API
 M: Akhil Goyal <gakhil@marvell.com>
 M: Declan Doherty <declan.doherty@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_security/
+F: lib/security/
 F: doc/guides/prog_guide/rte_security.rst
 F: app/test/test_security.c
 
@@ -435,7 +435,7 @@ Compression API - EXPERIMENTAL
 M: Fiona Trahe <fiona.trahe@intel.com>
 M: Ashish Gupta <ashish.gupta@marvell.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_compressdev/
+F: lib/compressdev/
 F: drivers/compress/
 F: app/test/test_compressdev*
 F: doc/guides/prog_guide/compressdev.rst
@@ -443,7 +443,7 @@ F: doc/guides/compressdevs/features/default.ini
 
 RegEx API - EXPERIMENTAL
 M: Ori Kam <orika@nvidia.com>
-F: lib/librte_regexdev/
+F: lib/regexdev/
 F: app/test-regex/
 F: doc/guides/prog_guide/regexdev.rst
 F: doc/guides/regexdevs/features/default.ini
@@ -451,7 +451,7 @@ F: doc/guides/regexdevs/features/default.ini
 Eventdev API
 M: Jerin Jacob <jerinj@marvell.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/
+F: lib/eventdev/
 F: drivers/event/skeleton/
 F: app/test/test_eventdev.c
 F: examples/l3fwd/l3fwd_event*
@@ -459,35 +459,35 @@ F: examples/l3fwd/l3fwd_event*
 Eventdev Ethdev Rx Adapter API
 M: Jay Jayatheerthan <jay.jayatheerthan@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*eth_rx_adapter*
+F: lib/eventdev/*eth_rx_adapter*
 F: app/test/test_event_eth_rx_adapter.c
 F: doc/guides/prog_guide/event_ethernet_rx_adapter.rst
 
 Eventdev Ethdev Tx Adapter API
 M: Jay Jayatheerthan <jay.jayatheerthan@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*eth_tx_adapter*
+F: lib/eventdev/*eth_tx_adapter*
 F: app/test/test_event_eth_tx_adapter.c
 F: doc/guides/prog_guide/event_ethernet_tx_adapter.rst
 
 Eventdev Timer Adapter API
 M: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*timer_adapter*
+F: lib/eventdev/*timer_adapter*
 F: app/test/test_event_timer_adapter.c
 F: doc/guides/prog_guide/event_timer_adapter.rst
 
 Eventdev Crypto Adapter API
 M: Abhinandan Gujjar <abhinandan.gujjar@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*crypto_adapter*
+F: lib/eventdev/*crypto_adapter*
 F: app/test/test_event_crypto_adapter.c
 F: doc/guides/prog_guide/event_crypto_adapter.rst
 
 Raw device API
 M: Nipun Gupta <nipun.gupta@nxp.com>
 M: Hemant Agrawal <hemant.agrawal@nxp.com>
-F: lib/librte_rawdev/
+F: lib/rawdev/
 F: drivers/raw/skeleton/
 F: app/test/test_rawdev.c
 F: doc/guides/prog_guide/rawdev.rst
@@ -554,7 +554,7 @@ F: examples/bond/
 Linux KNI
 M: Ferruh Yigit <ferruh.yigit@intel.com>
 F: kernel/linux/kni/
-F: lib/librte_kni/
+F: lib/kni/
 F: doc/guides/prog_guide/kernel_nic_interface.rst
 F: app/test/test_kni.c
 F: examples/kni/
@@ -897,7 +897,7 @@ Vhost-user
 M: Maxime Coquelin <maxime.coquelin@redhat.com>
 M: Chenbo Xia <chenbo.xia@intel.com>
 T: git://dpdk.org/next/dpdk-next-virtio
-F: lib/librte_vhost/
+F: lib/vhost/
 F: doc/guides/prog_guide/vhost_lib.rst
 F: examples/vhost/
 F: doc/guides/sample_app_ug/vhost.rst
@@ -1296,19 +1296,19 @@ Packet processing
 
 Network headers
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_net/
+F: lib/net/
 
 Packet CRC
 M: Jasvinder Singh <jasvinder.singh@intel.com>
-F: lib/librte_net/net_crc.h
-F: lib/librte_net/rte_net_crc*
-F: lib/librte_net/net_crc_avx512.c
-F: lib/librte_net/net_crc_sse.c
+F: lib/net/net_crc.h
+F: lib/net/rte_net_crc*
+F: lib/net/net_crc_avx512.c
+F: lib/net/net_crc_sse.c
 F: app/test/test_crc.c
 
 IP fragmentation & reassembly
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_ip_frag/
+F: lib/ip_frag/
 F: doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
 F: app/test/test_ipfrag.c
 F: examples/ip_fragmentation/
@@ -1318,18 +1318,18 @@ F: doc/guides/sample_app_ug/ip_reassembly.rst
 
 Generic Receive Offload - EXPERIMENTAL
 M: Jiayu Hu <jiayu.hu@intel.com>
-F: lib/librte_gro/
+F: lib/gro/
 F: doc/guides/prog_guide/generic_receive_offload_lib.rst
 
 Generic Segmentation Offload
 M: Jiayu Hu <jiayu.hu@intel.com>
-F: lib/librte_gso/
+F: lib/gso/
 F: doc/guides/prog_guide/generic_segmentation_offload_lib.rst
 
 IPsec
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_ipsec/
+F: lib/ipsec/
 M: Bernard Iremonger <bernard.iremonger@intel.com>
 F: app/test/test_ipsec*
 F: doc/guides/prog_guide/ipsec_lib.rst
@@ -1338,7 +1338,7 @@ F: app/test-sad/
 
 Flow Classify - EXPERIMENTAL
 M: Bernard Iremonger <bernard.iremonger@intel.com>
-F: lib/librte_flow_classify/
+F: lib/flow_classify/
 F: app/test/test_flow_classify*
 F: doc/guides/prog_guide/flow_classify_lib.rst
 F: examples/flow_classify/
@@ -1346,7 +1346,7 @@ F: doc/guides/sample_app_ug/flow_classify.rst
 
 Distributor
 M: David Hunt <david.hunt@intel.com>
-F: lib/librte_distributor/
+F: lib/distributor/
 F: doc/guides/prog_guide/packet_distrib_lib.rst
 F: app/test/test_distributor*
 F: examples/distributor/
@@ -1354,7 +1354,7 @@ F: doc/guides/sample_app_ug/dist_app.rst
 
 Reorder
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_reorder/
+F: lib/reorder/
 F: doc/guides/prog_guide/reorder_lib.rst
 F: app/test/test_reorder*
 F: examples/packet_ordering/
@@ -1363,7 +1363,7 @@ F: doc/guides/sample_app_ug/packet_ordering.rst
 Hierarchical scheduler
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 M: Jasvinder Singh <jasvinder.singh@intel.com>
-F: lib/librte_sched/
+F: lib/sched/
 F: doc/guides/prog_guide/qos_framework.rst
 F: app/test/test_red.c
 F: app/test/test_sched.c
@@ -1372,7 +1372,7 @@ F: doc/guides/sample_app_ug/qos_scheduler.rst
 
 Packet capture
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_pdump/
+F: lib/pdump/
 F: doc/guides/prog_guide/pdump_lib.rst
 F: app/test/test_pdump.*
 F: app/pdump/
@@ -1382,9 +1382,9 @@ F: doc/guides/tools/pdump.rst
 Packet Framework
 ----------------
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_pipeline/
-F: lib/librte_port/
-F: lib/librte_table/
+F: lib/pipeline/
+F: lib/port/
+F: lib/table/
 F: doc/guides/prog_guide/packet_framework.rst
 F: app/test/test_table*
 F: app/test-pipeline/
@@ -1399,7 +1399,7 @@ Algorithms
 
 ACL
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_acl/
+F: lib/acl/
 F: doc/guides/prog_guide/packet_classif_access_ctrl.rst
 F: app/test-acl/
 F: app/test/test_acl.*
@@ -1409,7 +1409,7 @@ F: doc/guides/sample_app_ug/l3_forward_access_ctrl.rst
 EFD
 M: Byron Marohn <byron.marohn@intel.com>
 M: Yipeng Wang <yipeng1.wang@intel.com>
-F: lib/librte_efd/
+F: lib/efd/
 F: doc/guides/prog_guide/efd_lib.rst
 F: app/test/test_efd*
 F: examples/server_node_efd/
@@ -1419,7 +1419,7 @@ Hashes
 M: Yipeng Wang <yipeng1.wang@intel.com>
 M: Sameh Gobriel <sameh.gobriel@intel.com>
 M: Bruce Richardson <bruce.richardson@intel.com>
-F: lib/librte_hash/
+F: lib/hash/
 F: doc/guides/prog_guide/hash_lib.rst
 F: app/test/test_*hash*
 F: app/test/test_func_reentrancy.c
@@ -1427,7 +1427,7 @@ F: app/test/test_func_reentrancy.c
 LPM
 M: Bruce Richardson <bruce.richardson@intel.com>
 M: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
-F: lib/librte_lpm/
+F: lib/lpm/
 F: doc/guides/prog_guide/lpm*
 F: app/test/test_lpm*
 F: app/test/test_func_reentrancy.c
@@ -1436,21 +1436,21 @@ F: app/test/test_xmmt_ops.h
 Membership - EXPERIMENTAL
 M: Yipeng Wang <yipeng1.wang@intel.com>
 M: Sameh Gobriel <sameh.gobriel@intel.com>
-F: lib/librte_member/
+F: lib/member/
 F: doc/guides/prog_guide/member_lib.rst
 F: app/test/test_member*
 
 RIB/FIB - EXPERIMENTAL
 M: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
-F: lib/librte_rib/
+F: lib/rib/
 F: app/test/test_rib*
-F: lib/librte_fib/
+F: lib/fib/
 F: app/test/test_fib*
 F: app/test-fib/
 
 Traffic metering
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_meter/
+F: lib/meter/
 F: doc/guides/sample_app_ug/qos_scheduler.rst
 F: app/test/test_meter.c
 F: examples/qos_meter/
@@ -1462,13 +1462,13 @@ Other libraries
 
 Configuration file
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_cfgfile/
+F: lib/cfgfile/
 F: app/test/test_cfgfile.c
 F: app/test/test_cfgfiles/
 
 Interactive command line
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_cmdline/
+F: lib/cmdline/
 F: app/test-cmdline/
 F: app/test/test_cmdline*
 F: examples/cmdline/
@@ -1476,22 +1476,22 @@ F: doc/guides/sample_app_ug/cmd_line.rst
 
 Key/Value parsing
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_kvargs/
+F: lib/kvargs/
 F: app/test/test_kvargs.c
 
 RCU
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/librte_rcu/
+F: lib/rcu/
 F: app/test/test_rcu*
 F: doc/guides/prog_guide/rcu_lib.rst
 
 PCI
 M: Gaetan Rivet <grive@u256.net>
-F: lib/librte_pci/
+F: lib/pci/
 
 Power management
 M: David Hunt <david.hunt@intel.com>
-F: lib/librte_power/
+F: lib/power/
 F: doc/guides/prog_guide/power_man.rst
 F: app/test/test_power*
 F: examples/l3fwd-power/
@@ -1502,40 +1502,40 @@ F: doc/guides/sample_app_ug/vm_power_management.rst
 Timers
 M: Robert Sanford <rsanford@akamai.com>
 M: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
-F: lib/librte_timer/
+F: lib/timer/
 F: doc/guides/prog_guide/timer_lib.rst
 F: app/test/test_timer*
 F: examples/timer/
 F: doc/guides/sample_app_ug/timer.rst
 
 Job statistics
-F: lib/librte_jobstats/
+F: lib/jobstats/
 F: examples/l2fwd-jobstats/
 F: doc/guides/sample_app_ug/l2_forward_job_stats.rst
 
 Metrics
-F: lib/librte_metrics/
+F: lib/metrics/
 F: app/test/test_metrics.c
 
 Bit-rate statistics
-F: lib/librte_bitratestats/
+F: lib/bitratestats/
 F: app/test/test_bitratestats.c
 
 Latency statistics
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_latencystats/
+F: lib/latencystats/
 F: app/test/test_latencystats.c
 
 Telemetry - EXPERIMENTAL
 M: Ciara Power <ciara.power@intel.com>
-F: lib/librte_telemetry/
+F: lib/telemetry/
 F: app/test/test_telemetry*
 F: usertools/dpdk-telemetry*
 F: doc/guides/howto/telemetry.rst
 
 BPF
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_bpf/
+F: lib/bpf/
 F: examples/bpf/
 F: app/test/test_bpf.c
 F: doc/guides/prog_guide/bpf_lib.rst
@@ -1543,7 +1543,7 @@ F: doc/guides/prog_guide/bpf_lib.rst
 Graph - EXPERIMENTAL
 M: Jerin Jacob <jerinj@marvell.com>
 M: Kiran Kumar K <kirankumark@marvell.com>
-F: lib/librte_graph/
+F: lib/graph/
 F: doc/guides/prog_guide/graph_lib.rst
 F: app/test/test_graph*
 M: Nithin Dabilpuram <ndabilpuram@marvell.com>
@@ -1553,7 +1553,7 @@ F: doc/guides/sample_app_ug/l3_forward_graph.rst
 Nodes - EXPERIMENTAL
 M: Nithin Dabilpuram <ndabilpuram@marvell.com>
 M: Pavan Nikhilesh <pbhagavatula@marvell.com>
-F: lib/librte_node/
+F: lib/node/
 
 
 Test Applications
diff --git a/app/test/test_eal_fs.c b/app/test/test_eal_fs.c
index cae624f82a..bb93b82a43 100644
--- a/app/test/test_eal_fs.c
+++ b/app/test/test_eal_fs.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 /* eal_filesystem.h is not a public header file, so use relative path */
-#include "../../lib/librte_eal/common/eal_filesystem.h"
+#include "../../lib/eal/common/eal_filesystem.h"
 
 static int
 test_parse_sysfs_value(void)
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 0343b0326e..03a9d1d3bb 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -18,7 +18,7 @@
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
-#include "../../lib/librte_eal/common/malloc_elem.h"
+#include "../../lib/eal/common/malloc_elem.h"
 
 #include "test.h"
 
diff --git a/app/test/test_telemetry_json.c b/app/test/test_telemetry_json.c
index 7a91490f4c..3171ab12ec 100644
--- a/app/test/test_telemetry_json.c
+++ b/app/test/test_telemetry_json.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include "../../lib/librte_telemetry/telemetry_json.h"
+#include "../../lib/telemetry/telemetry_json.h"
 #include "test.h"
 
 static int
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 39f79b5f86..809df11379 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -6,7 +6,7 @@
 flags_common = [
     # Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
     # to determine the best threshold in code. Refer to notes in source file
-    # (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
+    # (lib/eal/arm/include/rte_memcpy_64.h) for more info.
     ['RTE_ARCH_ARM64_MEMCPY', false],
     #    ['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
     #    ['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
index 8fa01ad177..0361135d6e 100755
--- a/devtools/build-tags.sh
+++ b/devtools/build-tags.sh
@@ -67,13 +67,13 @@ common_sources()
 
 linux_sources()
 {
-	find_sources "lib/librte_eal/linux" '*.[chS]'
+	find_sources "lib/eal/linux" '*.[chS]'
 	find_sources "kernel/linux" '*.[chS]'
 }
 
 bsd_sources()
 {
-	find_sources "lib/librte_eal/freebsd" '*.[chS]'
+	find_sources "lib/eal/freebsd" '*.[chS]'
 	find_sources "kernel/freebsd" '*.[chS]'
 }
 
@@ -85,14 +85,14 @@ arm_common()
 arm_32_sources()
 {
 	arm_common
-	find_sources "lib/librte_eal/arm" '*.[chS]' \
+	find_sources "lib/eal/arm" '*.[chS]' \
 					"$skip_64b_files"
 }
 
 arm_64_sources()
 {
 	arm_common
-	find_sources "lib/librte_eal/arm" '*.[chS]' \
+	find_sources "lib/eal/arm" '*.[chS]' \
 					 "$skip_32b_files"
 	find_sources "$source_dirs" '*arm64.[chS]'
 }
@@ -108,20 +108,20 @@ x86_common()
 x86_32_sources()
 {
 	x86_common
-	find_sources "lib/librte_eal/x86" '*.[chS]' \
+	find_sources "lib/eal/x86" '*.[chS]' \
 					"$skip_64b_files"
 }
 
 x86_64_sources()
 {
 	x86_common
-	find_sources "lib/librte_eal/x86" '*.[chS]' \
+	find_sources "lib/eal/x86" '*.[chS]' \
 					"$skip_32b_files"
 }
 
 ppc_64_sources()
 {
-	find_sources "lib/librte_eal/ppc" '*.[chS]'
+	find_sources "lib/eal/ppc" '*.[chS]'
 	find_sources "$source_dirs" '*altivec*.[chS]'
 }
 
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index b3c5cdfeca..bd521a3e73 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -25,58 +25,58 @@ INPUT                   = @TOPDIR@/doc/api/doxy-api-index.md \
                           @TOPDIR@/drivers/raw/dpaa2_qdma \
                           @TOPDIR@/drivers/raw/ifpga \
                           @TOPDIR@/drivers/raw/ioat \
-                          @TOPDIR@/lib/librte_eal/include \
-                          @TOPDIR@/lib/librte_eal/include/generic \
-                          @TOPDIR@/lib/librte_acl \
-                          @TOPDIR@/lib/librte_bbdev \
-                          @TOPDIR@/lib/librte_bitratestats \
-                          @TOPDIR@/lib/librte_bpf \
-                          @TOPDIR@/lib/librte_cfgfile \
-                          @TOPDIR@/lib/librte_cmdline \
-                          @TOPDIR@/lib/librte_compressdev \
-                          @TOPDIR@/lib/librte_cryptodev \
-                          @TOPDIR@/lib/librte_distributor \
-                          @TOPDIR@/lib/librte_efd \
-                          @TOPDIR@/lib/librte_ethdev \
-                          @TOPDIR@/lib/librte_eventdev \
-                          @TOPDIR@/lib/librte_fib \
-                          @TOPDIR@/lib/librte_flow_classify \
-                          @TOPDIR@/lib/librte_graph \
-                          @TOPDIR@/lib/librte_gro \
-                          @TOPDIR@/lib/librte_gso \
-                          @TOPDIR@/lib/librte_hash \
-                          @TOPDIR@/lib/librte_ip_frag \
-                          @TOPDIR@/lib/librte_ipsec \
-                          @TOPDIR@/lib/librte_jobstats \
-                          @TOPDIR@/lib/librte_kni \
-                          @TOPDIR@/lib/librte_kvargs \
-                          @TOPDIR@/lib/librte_latencystats \
-                          @TOPDIR@/lib/librte_lpm \
-                          @TOPDIR@/lib/librte_mbuf \
-                          @TOPDIR@/lib/librte_member \
-                          @TOPDIR@/lib/librte_mempool \
-                          @TOPDIR@/lib/librte_meter \
-                          @TOPDIR@/lib/librte_metrics \
-                          @TOPDIR@/lib/librte_node \
-                          @TOPDIR@/lib/librte_net \
-                          @TOPDIR@/lib/librte_pci \
-                          @TOPDIR@/lib/librte_pdump \
-                          @TOPDIR@/lib/librte_pipeline \
-                          @TOPDIR@/lib/librte_port \
-                          @TOPDIR@/lib/librte_power \
-                          @TOPDIR@/lib/librte_rawdev \
-                          @TOPDIR@/lib/librte_rcu \
-                          @TOPDIR@/lib/librte_regexdev \
-                          @TOPDIR@/lib/librte_reorder \
-                          @TOPDIR@/lib/librte_rib \
-                          @TOPDIR@/lib/librte_ring \
-                          @TOPDIR@/lib/librte_sched \
-                          @TOPDIR@/lib/librte_security \
-                          @TOPDIR@/lib/librte_stack \
-                          @TOPDIR@/lib/librte_table \
-                          @TOPDIR@/lib/librte_telemetry \
-                          @TOPDIR@/lib/librte_timer \
-                          @TOPDIR@/lib/librte_vhost
+                          @TOPDIR@/lib/eal/include \
+                          @TOPDIR@/lib/eal/include/generic \
+                          @TOPDIR@/lib/acl \
+                          @TOPDIR@/lib/bbdev \
+                          @TOPDIR@/lib/bitratestats \
+                          @TOPDIR@/lib/bpf \
+                          @TOPDIR@/lib/cfgfile \
+                          @TOPDIR@/lib/cmdline \
+                          @TOPDIR@/lib/compressdev \
+                          @TOPDIR@/lib/cryptodev \
+                          @TOPDIR@/lib/distributor \
+                          @TOPDIR@/lib/efd \
+                          @TOPDIR@/lib/ethdev \
+                          @TOPDIR@/lib/eventdev \
+                          @TOPDIR@/lib/fib \
+                          @TOPDIR@/lib/flow_classify \
+                          @TOPDIR@/lib/graph \
+                          @TOPDIR@/lib/gro \
+                          @TOPDIR@/lib/gso \
+                          @TOPDIR@/lib/hash \
+                          @TOPDIR@/lib/ip_frag \
+                          @TOPDIR@/lib/ipsec \
+                          @TOPDIR@/lib/jobstats \
+                          @TOPDIR@/lib/kni \
+                          @TOPDIR@/lib/kvargs \
+                          @TOPDIR@/lib/latencystats \
+                          @TOPDIR@/lib/lpm \
+                          @TOPDIR@/lib/mbuf \
+                          @TOPDIR@/lib/member \
+                          @TOPDIR@/lib/mempool \
+                          @TOPDIR@/lib/meter \
+                          @TOPDIR@/lib/metrics \
+                          @TOPDIR@/lib/node \
+                          @TOPDIR@/lib/net \
+                          @TOPDIR@/lib/pci \
+                          @TOPDIR@/lib/pdump \
+                          @TOPDIR@/lib/pipeline \
+                          @TOPDIR@/lib/port \
+                          @TOPDIR@/lib/power \
+                          @TOPDIR@/lib/rawdev \
+                          @TOPDIR@/lib/rcu \
+                          @TOPDIR@/lib/regexdev \
+                          @TOPDIR@/lib/reorder \
+                          @TOPDIR@/lib/rib \
+                          @TOPDIR@/lib/ring \
+                          @TOPDIR@/lib/sched \
+                          @TOPDIR@/lib/security \
+                          @TOPDIR@/lib/stack \
+                          @TOPDIR@/lib/table \
+                          @TOPDIR@/lib/telemetry \
+                          @TOPDIR@/lib/timer \
+                          @TOPDIR@/lib/vhost
 INPUT                   += @API_EXAMPLES@
 FILE_PATTERNS           = rte_*.h \
                           cmdline.h
diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
index 91ada18dd7..7ff18f4f74 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -58,12 +58,12 @@ persists over multiple releases.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_21 {
         global:
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_21 {
         global:
  ...
@@ -77,7 +77,7 @@ that library.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_21 {
         global:
  ...
@@ -88,7 +88,7 @@ that library.
  } DPDK_21;
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_21 {
         global:
  ...
@@ -100,12 +100,12 @@ how this may be done.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_22 {
         global:
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_22 {
         global:
  ...
diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index 734d1901b2..45f9565128 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -759,7 +759,7 @@ Examples:
  * The virtio network PMD in ``drivers/net/virtio`` uses ``pmd.net.virtio``
  * The eventdev software poll mode driver in ``drivers/event/sw`` uses ``pmd.event.sw``
  * The octeontx mempool driver in ``drivers/mempool/octeontx`` uses ``pmd.mempool.octeontx``
- * The DPDK hash library in ``lib/librte_hash`` uses ``lib.hash``
+ * The DPDK hash library in ``lib/hash`` uses ``lib.hash``
 
 Specializations
 ~~~~~~~~~~~~~~~
@@ -918,7 +918,7 @@ name
 	If a library's .so or .a file differs from that given in the directory
 	name, the name should be specified using this variable. In practice,
 	since the convention is that for a library called ``librte_xyz.so``, the
-	sources are stored in a directory ``lib/librte_xyz``, this value should
+	sources are stored in a directory ``lib/xyz``, this value should
 	never be needed for new libraries.
 
 .. note::
diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index a4e6be6aca..842549a4c8 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -19,10 +19,10 @@ The DPDK source code repository contains input files to build the API documentat
 The main directories that contain files related to documentation are shown below::
 
    lib
-   |-- librte_acl
-   |-- librte_cfgfile
-   |-- librte_cmdline
-   |-- librte_eal
+   |-- acl
+   |-- cfgfile
+   |-- cmdline
+   |-- eal
    |   |-- ...
    ...
    doc
@@ -40,7 +40,7 @@ The main directories that contain files related to documentation are shown below
 
 
 The API documentation is built from `Doxygen <http://www.doxygen.nl>`_ comments in the header files.
-These files are mainly in the ``lib/librte_*`` directories although some of the Poll Mode Drivers in ``drivers/net``
+These files are mainly in the ``lib/*`` directories although some of the Poll Mode Drivers in ``drivers/net``
 are also documented with Doxygen.
 
 The configuration files that are used to control the Doxygen output are in the ``doc/api`` directory.
diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst
index a95efbe0d8..277b0e7d54 100644
--- a/doc/guides/prog_guide/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/event_timer_adapter.rst
@@ -35,7 +35,7 @@ device upon timer expiration.
 
 The Event Timer Adapter API represents each event timer with a generic struct,
 which contains an event and user metadata.  The ``rte_event_timer`` struct is
-defined in ``lib/librte_event/librte_event_timer_adapter.h``.
+defined in ``lib/event/librte_event_timer_adapter.h``.
 
 .. _timer_expiry_event:
 
diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst
index 4e4ea33ccb..7d410d3cc6 100644
--- a/doc/guides/prog_guide/qos_framework.rst
+++ b/doc/guides/prog_guide/qos_framework.rst
@@ -1517,9 +1517,9 @@ Source Files Location
 
 The source files for the DPDK dropper are located at:
 
-*   DPDK/lib/librte_sched/rte_red.h
+*   DPDK/lib/sched/rte_red.h
 
-*   DPDK/lib/librte_sched/rte_red.c
+*   DPDK/lib/sched/rte_red.c
 
 Integration with the DPDK QoS Scheduler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/guides/prog_guide/rawdev.rst b/doc/guides/prog_guide/rawdev.rst
index a712c7fa99..488e0a7ef6 100644
--- a/doc/guides/prog_guide/rawdev.rst
+++ b/doc/guides/prog_guide/rawdev.rst
@@ -13,7 +13,7 @@ In terms of device flavor (type) support, DPDK currently has ethernet
 
 For a new type of device, for example an accelerator, there are not many
 options except:
-1. create another lib/librte_MySpecialDev, driver/MySpecialDrv and use it
+1. create another lib/MySpecialDev, driver/MySpecialDrv and use it
 through Bus/PMD model.
 2. Or, create a vdev and implement necessary custom APIs which are directly
 exposed from driver layer. However this may still require changes in bus code
diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst
index ee3ed1e658..43323e1a43 100644
--- a/doc/guides/rel_notes/known_issues.rst
+++ b/doc/guides/rel_notes/known_issues.rst
@@ -127,7 +127,7 @@ HPET timers do not work on the Osage customer reference platform
    work correctly, provided the BIOS supports HPET.
 
 **Driver/Module**:
-   ``lib/librte_eal/include/rte_cycles.h``
+   ``lib/eal/include/rte_cycles.h``
 
 
 Not all variants of supported NIC types have been used in testing
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index a2b07fd23c..94ce447261 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -208,7 +208,7 @@ if dlopen_ibverbs
     dlopen_install_dir = [ eal_pmd_path + '-glue' ]
     dlopen_includes = [global_inc]
     dlopen_includes += include_directories(
-        '../../../../lib/librte_eal/include/generic',
+        '../../../../lib/eal/include/generic',
     )
     shared_lib = shared_library(
         dlopen_lib_name,
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 950f411327..7ecf3aa33d 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
 
-includes += include_directories('../../../lib/librte_vhost')
+includes += include_directories('../../../lib/vhost')
 deps += 'bus_pci'
 sources = files('virtio_cryptodev.c', 'virtio_pci.c',
         'virtio_rxtx.c', 'virtqueue.c')
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index 15d848b28d..05d28e781a 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -17,8 +17,8 @@ custom_target('rte_kni',
         'M=' + meson.current_build_dir(),
         'src=' + meson.current_source_dir(),
         'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
-        ' -I' + meson.source_root() + '/lib/librte_eal/include' +
-        ' -I' + meson.source_root() + '/lib/librte_kni' +
+        ' -I' + meson.source_root() + '/lib/eal/include' +
+        ' -I' + meson.source_root() + '/lib/kni' +
         ' -I' + meson.build_root() +
         ' -I' + meson.current_source_dir(),
         'modules'] + cross_args,
diff --git a/lib/librte_acl/acl.h b/lib/acl/acl.h
similarity index 100%
rename from lib/librte_acl/acl.h
rename to lib/acl/acl.h
diff --git a/lib/librte_acl/acl_bld.c b/lib/acl/acl_bld.c
similarity index 100%
rename from lib/librte_acl/acl_bld.c
rename to lib/acl/acl_bld.c
diff --git a/lib/librte_acl/acl_gen.c b/lib/acl/acl_gen.c
similarity index 100%
rename from lib/librte_acl/acl_gen.c
rename to lib/acl/acl_gen.c
diff --git a/lib/librte_acl/acl_run.h b/lib/acl/acl_run.h
similarity index 100%
rename from lib/librte_acl/acl_run.h
rename to lib/acl/acl_run.h
diff --git a/lib/librte_acl/acl_run_altivec.c b/lib/acl/acl_run_altivec.c
similarity index 100%
rename from lib/librte_acl/acl_run_altivec.c
rename to lib/acl/acl_run_altivec.c
diff --git a/lib/librte_acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h
similarity index 100%
rename from lib/librte_acl/acl_run_altivec.h
rename to lib/acl/acl_run_altivec.h
diff --git a/lib/librte_acl/acl_run_avx2.c b/lib/acl/acl_run_avx2.c
similarity index 100%
rename from lib/librte_acl/acl_run_avx2.c
rename to lib/acl/acl_run_avx2.c
diff --git a/lib/librte_acl/acl_run_avx2.h b/lib/acl/acl_run_avx2.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx2.h
rename to lib/acl/acl_run_avx2.h
diff --git a/lib/librte_acl/acl_run_avx512.c b/lib/acl/acl_run_avx512.c
similarity index 100%
rename from lib/librte_acl/acl_run_avx512.c
rename to lib/acl/acl_run_avx512.c
diff --git a/lib/librte_acl/acl_run_avx512_common.h b/lib/acl/acl_run_avx512_common.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512_common.h
rename to lib/acl/acl_run_avx512_common.h
diff --git a/lib/librte_acl/acl_run_avx512x16.h b/lib/acl/acl_run_avx512x16.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512x16.h
rename to lib/acl/acl_run_avx512x16.h
diff --git a/lib/librte_acl/acl_run_avx512x8.h b/lib/acl/acl_run_avx512x8.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512x8.h
rename to lib/acl/acl_run_avx512x8.h
diff --git a/lib/librte_acl/acl_run_neon.c b/lib/acl/acl_run_neon.c
similarity index 100%
rename from lib/librte_acl/acl_run_neon.c
rename to lib/acl/acl_run_neon.c
diff --git a/lib/librte_acl/acl_run_neon.h b/lib/acl/acl_run_neon.h
similarity index 100%
rename from lib/librte_acl/acl_run_neon.h
rename to lib/acl/acl_run_neon.h
diff --git a/lib/librte_acl/acl_run_scalar.c b/lib/acl/acl_run_scalar.c
similarity index 100%
rename from lib/librte_acl/acl_run_scalar.c
rename to lib/acl/acl_run_scalar.c
diff --git a/lib/librte_acl/acl_run_sse.c b/lib/acl/acl_run_sse.c
similarity index 100%
rename from lib/librte_acl/acl_run_sse.c
rename to lib/acl/acl_run_sse.c
diff --git a/lib/librte_acl/acl_run_sse.h b/lib/acl/acl_run_sse.h
similarity index 100%
rename from lib/librte_acl/acl_run_sse.h
rename to lib/acl/acl_run_sse.h
diff --git a/lib/librte_acl/acl_vect.h b/lib/acl/acl_vect.h
similarity index 100%
rename from lib/librte_acl/acl_vect.h
rename to lib/acl/acl_vect.h
diff --git a/lib/librte_acl/meson.build b/lib/acl/meson.build
similarity index 100%
rename from lib/librte_acl/meson.build
rename to lib/acl/meson.build
diff --git a/lib/librte_acl/rte_acl.c b/lib/acl/rte_acl.c
similarity index 100%
rename from lib/librte_acl/rte_acl.c
rename to lib/acl/rte_acl.c
diff --git a/lib/librte_acl/rte_acl.h b/lib/acl/rte_acl.h
similarity index 100%
rename from lib/librte_acl/rte_acl.h
rename to lib/acl/rte_acl.h
diff --git a/lib/librte_acl/rte_acl_osdep.h b/lib/acl/rte_acl_osdep.h
similarity index 100%
rename from lib/librte_acl/rte_acl_osdep.h
rename to lib/acl/rte_acl_osdep.h
diff --git a/lib/librte_acl/tb_mem.c b/lib/acl/tb_mem.c
similarity index 100%
rename from lib/librte_acl/tb_mem.c
rename to lib/acl/tb_mem.c
diff --git a/lib/librte_acl/tb_mem.h b/lib/acl/tb_mem.h
similarity index 100%
rename from lib/librte_acl/tb_mem.h
rename to lib/acl/tb_mem.h
diff --git a/lib/librte_acl/version.map b/lib/acl/version.map
similarity index 100%
rename from lib/librte_acl/version.map
rename to lib/acl/version.map
diff --git a/lib/librte_bbdev/meson.build b/lib/bbdev/meson.build
similarity index 100%
rename from lib/librte_bbdev/meson.build
rename to lib/bbdev/meson.build
diff --git a/lib/librte_bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev.c
rename to lib/bbdev/rte_bbdev.c
diff --git a/lib/librte_bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev.h
rename to lib/bbdev/rte_bbdev.h
diff --git a/lib/librte_bbdev/rte_bbdev_op.h b/lib/bbdev/rte_bbdev_op.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev_op.h
rename to lib/bbdev/rte_bbdev_op.h
diff --git a/lib/librte_bbdev/rte_bbdev_pmd.h b/lib/bbdev/rte_bbdev_pmd.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev_pmd.h
rename to lib/bbdev/rte_bbdev_pmd.h
diff --git a/lib/librte_bbdev/version.map b/lib/bbdev/version.map
similarity index 100%
rename from lib/librte_bbdev/version.map
rename to lib/bbdev/version.map
diff --git a/lib/librte_bitratestats/meson.build b/lib/bitratestats/meson.build
similarity index 100%
rename from lib/librte_bitratestats/meson.build
rename to lib/bitratestats/meson.build
diff --git a/lib/librte_bitratestats/rte_bitrate.c b/lib/bitratestats/rte_bitrate.c
similarity index 100%
rename from lib/librte_bitratestats/rte_bitrate.c
rename to lib/bitratestats/rte_bitrate.c
diff --git a/lib/librte_bitratestats/rte_bitrate.h b/lib/bitratestats/rte_bitrate.h
similarity index 100%
rename from lib/librte_bitratestats/rte_bitrate.h
rename to lib/bitratestats/rte_bitrate.h
diff --git a/lib/librte_bitratestats/version.map b/lib/bitratestats/version.map
similarity index 100%
rename from lib/librte_bitratestats/version.map
rename to lib/bitratestats/version.map
diff --git a/lib/librte_bpf/bpf.c b/lib/bpf/bpf.c
similarity index 100%
rename from lib/librte_bpf/bpf.c
rename to lib/bpf/bpf.c
diff --git a/lib/librte_bpf/bpf_def.h b/lib/bpf/bpf_def.h
similarity index 100%
rename from lib/librte_bpf/bpf_def.h
rename to lib/bpf/bpf_def.h
diff --git a/lib/librte_bpf/bpf_exec.c b/lib/bpf/bpf_exec.c
similarity index 100%
rename from lib/librte_bpf/bpf_exec.c
rename to lib/bpf/bpf_exec.c
diff --git a/lib/librte_bpf/bpf_impl.h b/lib/bpf/bpf_impl.h
similarity index 100%
rename from lib/librte_bpf/bpf_impl.h
rename to lib/bpf/bpf_impl.h
diff --git a/lib/librte_bpf/bpf_jit_arm64.c b/lib/bpf/bpf_jit_arm64.c
similarity index 100%
rename from lib/librte_bpf/bpf_jit_arm64.c
rename to lib/bpf/bpf_jit_arm64.c
diff --git a/lib/librte_bpf/bpf_jit_x86.c b/lib/bpf/bpf_jit_x86.c
similarity index 100%
rename from lib/librte_bpf/bpf_jit_x86.c
rename to lib/bpf/bpf_jit_x86.c
diff --git a/lib/librte_bpf/bpf_load.c b/lib/bpf/bpf_load.c
similarity index 100%
rename from lib/librte_bpf/bpf_load.c
rename to lib/bpf/bpf_load.c
diff --git a/lib/librte_bpf/bpf_load_elf.c b/lib/bpf/bpf_load_elf.c
similarity index 100%
rename from lib/librte_bpf/bpf_load_elf.c
rename to lib/bpf/bpf_load_elf.c
diff --git a/lib/librte_bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c
similarity index 100%
rename from lib/librte_bpf/bpf_pkt.c
rename to lib/bpf/bpf_pkt.c
diff --git a/lib/librte_bpf/bpf_validate.c b/lib/bpf/bpf_validate.c
similarity index 100%
rename from lib/librte_bpf/bpf_validate.c
rename to lib/bpf/bpf_validate.c
diff --git a/lib/librte_bpf/meson.build b/lib/bpf/meson.build
similarity index 100%
rename from lib/librte_bpf/meson.build
rename to lib/bpf/meson.build
diff --git a/lib/librte_bpf/rte_bpf.h b/lib/bpf/rte_bpf.h
similarity index 100%
rename from lib/librte_bpf/rte_bpf.h
rename to lib/bpf/rte_bpf.h
diff --git a/lib/librte_bpf/rte_bpf_ethdev.h b/lib/bpf/rte_bpf_ethdev.h
similarity index 100%
rename from lib/librte_bpf/rte_bpf_ethdev.h
rename to lib/bpf/rte_bpf_ethdev.h
diff --git a/lib/librte_bpf/version.map b/lib/bpf/version.map
similarity index 100%
rename from lib/librte_bpf/version.map
rename to lib/bpf/version.map
diff --git a/lib/librte_cfgfile/meson.build b/lib/cfgfile/meson.build
similarity index 100%
rename from lib/librte_cfgfile/meson.build
rename to lib/cfgfile/meson.build
diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
similarity index 100%
rename from lib/librte_cfgfile/rte_cfgfile.c
rename to lib/cfgfile/rte_cfgfile.c
diff --git a/lib/librte_cfgfile/rte_cfgfile.h b/lib/cfgfile/rte_cfgfile.h
similarity index 100%
rename from lib/librte_cfgfile/rte_cfgfile.h
rename to lib/cfgfile/rte_cfgfile.h
diff --git a/lib/librte_cfgfile/version.map b/lib/cfgfile/version.map
similarity index 100%
rename from lib/librte_cfgfile/version.map
rename to lib/cfgfile/version.map
diff --git a/lib/librte_cmdline/cmdline.c b/lib/cmdline/cmdline.c
similarity index 100%
rename from lib/librte_cmdline/cmdline.c
rename to lib/cmdline/cmdline.c
diff --git a/lib/librte_cmdline/cmdline.h b/lib/cmdline/cmdline.h
similarity index 100%
rename from lib/librte_cmdline/cmdline.h
rename to lib/cmdline/cmdline.h
diff --git a/lib/librte_cmdline/cmdline_cirbuf.c b/lib/cmdline/cmdline_cirbuf.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_cirbuf.c
rename to lib/cmdline/cmdline_cirbuf.c
diff --git a/lib/librte_cmdline/cmdline_cirbuf.h b/lib/cmdline/cmdline_cirbuf.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_cirbuf.h
rename to lib/cmdline/cmdline_cirbuf.h
diff --git a/lib/librte_cmdline/cmdline_os_unix.c b/lib/cmdline/cmdline_os_unix.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_os_unix.c
rename to lib/cmdline/cmdline_os_unix.c
diff --git a/lib/librte_cmdline/cmdline_os_windows.c b/lib/cmdline/cmdline_os_windows.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_os_windows.c
rename to lib/cmdline/cmdline_os_windows.c
diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/cmdline/cmdline_parse.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse.c
rename to lib/cmdline/cmdline_parse.c
diff --git a/lib/librte_cmdline/cmdline_parse.h b/lib/cmdline/cmdline_parse.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse.h
rename to lib/cmdline/cmdline_parse.h
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/cmdline/cmdline_parse_etheraddr.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_etheraddr.c
rename to lib/cmdline/cmdline_parse_etheraddr.c
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.h b/lib/cmdline/cmdline_parse_etheraddr.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_etheraddr.h
rename to lib/cmdline/cmdline_parse_etheraddr.h
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/cmdline/cmdline_parse_ipaddr.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_ipaddr.c
rename to lib/cmdline/cmdline_parse_ipaddr.c
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.h b/lib/cmdline/cmdline_parse_ipaddr.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_ipaddr.h
rename to lib/cmdline/cmdline_parse_ipaddr.h
diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/cmdline/cmdline_parse_num.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_num.c
rename to lib/cmdline/cmdline_parse_num.c
diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/cmdline/cmdline_parse_num.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_num.h
rename to lib/cmdline/cmdline_parse_num.h
diff --git a/lib/librte_cmdline/cmdline_parse_portlist.c b/lib/cmdline/cmdline_parse_portlist.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_portlist.c
rename to lib/cmdline/cmdline_parse_portlist.c
diff --git a/lib/librte_cmdline/cmdline_parse_portlist.h b/lib/cmdline/cmdline_parse_portlist.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_portlist.h
rename to lib/cmdline/cmdline_parse_portlist.h
diff --git a/lib/librte_cmdline/cmdline_parse_string.c b/lib/cmdline/cmdline_parse_string.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_string.c
rename to lib/cmdline/cmdline_parse_string.c
diff --git a/lib/librte_cmdline/cmdline_parse_string.h b/lib/cmdline/cmdline_parse_string.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_string.h
rename to lib/cmdline/cmdline_parse_string.h
diff --git a/lib/librte_cmdline/cmdline_private.h b/lib/cmdline/cmdline_private.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_private.h
rename to lib/cmdline/cmdline_private.h
diff --git a/lib/librte_cmdline/cmdline_rdline.c b/lib/cmdline/cmdline_rdline.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_rdline.c
rename to lib/cmdline/cmdline_rdline.c
diff --git a/lib/librte_cmdline/cmdline_rdline.h b/lib/cmdline/cmdline_rdline.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_rdline.h
rename to lib/cmdline/cmdline_rdline.h
diff --git a/lib/librte_cmdline/cmdline_socket.c b/lib/cmdline/cmdline_socket.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_socket.c
rename to lib/cmdline/cmdline_socket.c
diff --git a/lib/librte_cmdline/cmdline_socket.h b/lib/cmdline/cmdline_socket.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_socket.h
rename to lib/cmdline/cmdline_socket.h
diff --git a/lib/librte_cmdline/cmdline_vt100.c b/lib/cmdline/cmdline_vt100.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_vt100.c
rename to lib/cmdline/cmdline_vt100.c
diff --git a/lib/librte_cmdline/cmdline_vt100.h b/lib/cmdline/cmdline_vt100.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_vt100.h
rename to lib/cmdline/cmdline_vt100.h
diff --git a/lib/librte_cmdline/meson.build b/lib/cmdline/meson.build
similarity index 100%
rename from lib/librte_cmdline/meson.build
rename to lib/cmdline/meson.build
diff --git a/lib/librte_cmdline/version.map b/lib/cmdline/version.map
similarity index 100%
rename from lib/librte_cmdline/version.map
rename to lib/cmdline/version.map
diff --git a/lib/librte_compressdev/meson.build b/lib/compressdev/meson.build
similarity index 100%
rename from lib/librte_compressdev/meson.build
rename to lib/compressdev/meson.build
diff --git a/lib/librte_compressdev/rte_comp.c b/lib/compressdev/rte_comp.c
similarity index 100%
rename from lib/librte_compressdev/rte_comp.c
rename to lib/compressdev/rte_comp.c
diff --git a/lib/librte_compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
similarity index 100%
rename from lib/librte_compressdev/rte_comp.h
rename to lib/compressdev/rte_comp.h
diff --git a/lib/librte_compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev.c
rename to lib/compressdev/rte_compressdev.c
diff --git a/lib/librte_compressdev/rte_compressdev.h b/lib/compressdev/rte_compressdev.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev.h
rename to lib/compressdev/rte_compressdev.h
diff --git a/lib/librte_compressdev/rte_compressdev_internal.h b/lib/compressdev/rte_compressdev_internal.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_internal.h
rename to lib/compressdev/rte_compressdev_internal.h
diff --git a/lib/librte_compressdev/rte_compressdev_pmd.c b/lib/compressdev/rte_compressdev_pmd.c
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_pmd.c
rename to lib/compressdev/rte_compressdev_pmd.c
diff --git a/lib/librte_compressdev/rte_compressdev_pmd.h b/lib/compressdev/rte_compressdev_pmd.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_pmd.h
rename to lib/compressdev/rte_compressdev_pmd.h
diff --git a/lib/librte_compressdev/version.map b/lib/compressdev/version.map
similarity index 100%
rename from lib/librte_compressdev/version.map
rename to lib/compressdev/version.map
diff --git a/lib/librte_cryptodev/cryptodev_trace_points.c b/lib/cryptodev/cryptodev_trace_points.c
similarity index 100%
rename from lib/librte_cryptodev/cryptodev_trace_points.c
rename to lib/cryptodev/cryptodev_trace_points.c
diff --git a/lib/librte_cryptodev/meson.build b/lib/cryptodev/meson.build
similarity index 100%
rename from lib/librte_cryptodev/meson.build
rename to lib/cryptodev/meson.build
diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/cryptodev/rte_crypto.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto.h
rename to lib/cryptodev/rte_crypto.h
diff --git a/lib/librte_cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto_asym.h
rename to lib/cryptodev/rte_crypto_asym.h
diff --git a/lib/librte_cryptodev/rte_crypto_sym.h b/lib/cryptodev/rte_crypto_sym.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto_sym.h
rename to lib/cryptodev/rte_crypto_sym.h
diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev.c
rename to lib/cryptodev/rte_cryptodev.c
diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev.h
rename to lib/cryptodev/rte_cryptodev.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/cryptodev/rte_cryptodev_pmd.c
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_pmd.c
rename to lib/cryptodev/rte_cryptodev_pmd.c
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/cryptodev/rte_cryptodev_pmd.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_pmd.h
rename to lib/cryptodev/rte_cryptodev_pmd.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_trace.h b/lib/cryptodev/rte_cryptodev_trace.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_trace.h
rename to lib/cryptodev/rte_cryptodev_trace.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_trace_fp.h b/lib/cryptodev/rte_cryptodev_trace_fp.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_trace_fp.h
rename to lib/cryptodev/rte_cryptodev_trace_fp.h
diff --git a/lib/librte_cryptodev/version.map b/lib/cryptodev/version.map
similarity index 100%
rename from lib/librte_cryptodev/version.map
rename to lib/cryptodev/version.map
diff --git a/lib/librte_distributor/distributor_private.h b/lib/distributor/distributor_private.h
similarity index 100%
rename from lib/librte_distributor/distributor_private.h
rename to lib/distributor/distributor_private.h
diff --git a/lib/librte_distributor/meson.build b/lib/distributor/meson.build
similarity index 100%
rename from lib/librte_distributor/meson.build
rename to lib/distributor/meson.build
diff --git a/lib/librte_distributor/rte_distributor.c b/lib/distributor/rte_distributor.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor.c
rename to lib/distributor/rte_distributor.c
diff --git a/lib/librte_distributor/rte_distributor.h b/lib/distributor/rte_distributor.h
similarity index 100%
rename from lib/librte_distributor/rte_distributor.h
rename to lib/distributor/rte_distributor.h
diff --git a/lib/librte_distributor/rte_distributor_match_generic.c b/lib/distributor/rte_distributor_match_generic.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_match_generic.c
rename to lib/distributor/rte_distributor_match_generic.c
diff --git a/lib/librte_distributor/rte_distributor_match_sse.c b/lib/distributor/rte_distributor_match_sse.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_match_sse.c
rename to lib/distributor/rte_distributor_match_sse.c
diff --git a/lib/librte_distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_single.c
rename to lib/distributor/rte_distributor_single.c
diff --git a/lib/librte_distributor/rte_distributor_single.h b/lib/distributor/rte_distributor_single.h
similarity index 100%
rename from lib/librte_distributor/rte_distributor_single.h
rename to lib/distributor/rte_distributor_single.h
diff --git a/lib/librte_distributor/version.map b/lib/distributor/version.map
similarity index 100%
rename from lib/librte_distributor/version.map
rename to lib/distributor/version.map
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/eal/arm/include/meson.build
similarity index 100%
rename from lib/librte_eal/arm/include/meson.build
rename to lib/eal/arm/include/meson.build
diff --git a/lib/librte_eal/arm/include/rte_atomic.h b/lib/eal/arm/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic.h
rename to lib/eal/arm/include/rte_atomic.h
diff --git a/lib/librte_eal/arm/include/rte_atomic_32.h b/lib/eal/arm/include/rte_atomic_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic_32.h
rename to lib/eal/arm/include/rte_atomic_32.h
diff --git a/lib/librte_eal/arm/include/rte_atomic_64.h b/lib/eal/arm/include/rte_atomic_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic_64.h
rename to lib/eal/arm/include/rte_atomic_64.h
diff --git a/lib/librte_eal/arm/include/rte_byteorder.h b/lib/eal/arm/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_byteorder.h
rename to lib/eal/arm/include/rte_byteorder.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags.h b/lib/eal/arm/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags.h
rename to lib/eal/arm/include/rte_cpuflags.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags_32.h b/lib/eal/arm/include/rte_cpuflags_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags_32.h
rename to lib/eal/arm/include/rte_cpuflags_32.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags_64.h b/lib/eal/arm/include/rte_cpuflags_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags_64.h
rename to lib/eal/arm/include/rte_cpuflags_64.h
diff --git a/lib/librte_eal/arm/include/rte_cycles.h b/lib/eal/arm/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles.h
rename to lib/eal/arm/include/rte_cycles.h
diff --git a/lib/librte_eal/arm/include/rte_cycles_32.h b/lib/eal/arm/include/rte_cycles_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles_32.h
rename to lib/eal/arm/include/rte_cycles_32.h
diff --git a/lib/librte_eal/arm/include/rte_cycles_64.h b/lib/eal/arm/include/rte_cycles_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles_64.h
rename to lib/eal/arm/include/rte_cycles_64.h
diff --git a/lib/librte_eal/arm/include/rte_io.h b/lib/eal/arm/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_io.h
rename to lib/eal/arm/include/rte_io.h
diff --git a/lib/librte_eal/arm/include/rte_io_64.h b/lib/eal/arm/include/rte_io_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_io_64.h
rename to lib/eal/arm/include/rte_io_64.h
diff --git a/lib/librte_eal/arm/include/rte_mcslock.h b/lib/eal/arm/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_mcslock.h
rename to lib/eal/arm/include/rte_mcslock.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy.h b/lib/eal/arm/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy.h
rename to lib/eal/arm/include/rte_memcpy.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy_32.h b/lib/eal/arm/include/rte_memcpy_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy_32.h
rename to lib/eal/arm/include/rte_memcpy_32.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy_64.h b/lib/eal/arm/include/rte_memcpy_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy_64.h
rename to lib/eal/arm/include/rte_memcpy_64.h
diff --git a/lib/librte_eal/arm/include/rte_pause.h b/lib/eal/arm/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause.h
rename to lib/eal/arm/include/rte_pause.h
diff --git a/lib/librte_eal/arm/include/rte_pause_32.h b/lib/eal/arm/include/rte_pause_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause_32.h
rename to lib/eal/arm/include/rte_pause_32.h
diff --git a/lib/librte_eal/arm/include/rte_pause_64.h b/lib/eal/arm/include/rte_pause_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause_64.h
rename to lib/eal/arm/include/rte_pause_64.h
diff --git a/lib/librte_eal/arm/include/rte_power_intrinsics.h b/lib/eal/arm/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_power_intrinsics.h
rename to lib/eal/arm/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch.h b/lib/eal/arm/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch.h
rename to lib/eal/arm/include/rte_prefetch.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch_32.h b/lib/eal/arm/include/rte_prefetch_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch_32.h
rename to lib/eal/arm/include/rte_prefetch_32.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch_64.h b/lib/eal/arm/include/rte_prefetch_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch_64.h
rename to lib/eal/arm/include/rte_prefetch_64.h
diff --git a/lib/librte_eal/arm/include/rte_rwlock.h b/lib/eal/arm/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_rwlock.h
rename to lib/eal/arm/include/rte_rwlock.h
diff --git a/lib/librte_eal/arm/include/rte_spinlock.h b/lib/eal/arm/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_spinlock.h
rename to lib/eal/arm/include/rte_spinlock.h
diff --git a/lib/librte_eal/arm/include/rte_ticketlock.h b/lib/eal/arm/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_ticketlock.h
rename to lib/eal/arm/include/rte_ticketlock.h
diff --git a/lib/librte_eal/arm/include/rte_vect.h b/lib/eal/arm/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_vect.h
rename to lib/eal/arm/include/rte_vect.h
diff --git a/lib/librte_eal/arm/meson.build b/lib/eal/arm/meson.build
similarity index 100%
rename from lib/librte_eal/arm/meson.build
rename to lib/eal/arm/meson.build
diff --git a/lib/librte_eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/arm/rte_cpuflags.c
rename to lib/eal/arm/rte_cpuflags.c
diff --git a/lib/librte_eal/arm/rte_cycles.c b/lib/eal/arm/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/arm/rte_cycles.c
rename to lib/eal/arm/rte_cycles.c
diff --git a/lib/librte_eal/arm/rte_hypervisor.c b/lib/eal/arm/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/arm/rte_hypervisor.c
rename to lib/eal/arm/rte_hypervisor.c
diff --git a/lib/librte_eal/arm/rte_power_intrinsics.c b/lib/eal/arm/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/arm/rte_power_intrinsics.c
rename to lib/eal/arm/rte_power_intrinsics.c
diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/eal/common/eal_common_bus.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_bus.c
rename to lib/eal/common/eal_common_bus.c
diff --git a/lib/librte_eal/common/eal_common_class.c b/lib/eal/common/eal_common_class.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_class.c
rename to lib/eal/common/eal_common_class.c
diff --git a/lib/librte_eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_config.c
rename to lib/eal/common/eal_common_config.c
diff --git a/lib/librte_eal/common/eal_common_cpuflags.c b/lib/eal/common/eal_common_cpuflags.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_cpuflags.c
rename to lib/eal/common/eal_common_cpuflags.c
diff --git a/lib/librte_eal/common/eal_common_debug.c b/lib/eal/common/eal_common_debug.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_debug.c
rename to lib/eal/common/eal_common_debug.c
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_dev.c
rename to lib/eal/common/eal_common_dev.c
diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_devargs.c
rename to lib/eal/common/eal_common_devargs.c
diff --git a/lib/librte_eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_dynmem.c
rename to lib/eal/common/eal_common_dynmem.c
diff --git a/lib/librte_eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_errno.c
rename to lib/eal/common/eal_common_errno.c
diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_fbarray.c
rename to lib/eal/common/eal_common_fbarray.c
diff --git a/lib/librte_eal/common/eal_common_hexdump.c b/lib/eal/common/eal_common_hexdump.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_hexdump.c
rename to lib/eal/common/eal_common_hexdump.c
diff --git a/lib/librte_eal/common/eal_common_hypervisor.c b/lib/eal/common/eal_common_hypervisor.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_hypervisor.c
rename to lib/eal/common/eal_common_hypervisor.c
diff --git a/lib/librte_eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_launch.c
rename to lib/eal/common/eal_common_launch.c
diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_lcore.c
rename to lib/eal/common/eal_common_lcore.c
diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_log.c
rename to lib/eal/common/eal_common_log.c
diff --git a/lib/librte_eal/common/eal_common_mcfg.c b/lib/eal/common/eal_common_mcfg.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_mcfg.c
rename to lib/eal/common/eal_common_mcfg.c
diff --git a/lib/librte_eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memalloc.c
rename to lib/eal/common/eal_common_memalloc.c
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memory.c
rename to lib/eal/common/eal_common_memory.c
diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memzone.c
rename to lib/eal/common/eal_common_memzone.c
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_options.c
rename to lib/eal/common/eal_common_options.c
diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_proc.c
rename to lib/eal/common/eal_common_proc.c
diff --git a/lib/librte_eal/common/eal_common_string_fns.c b/lib/eal/common/eal_common_string_fns.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_string_fns.c
rename to lib/eal/common/eal_common_string_fns.c
diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/eal/common/eal_common_tailqs.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_tailqs.c
rename to lib/eal/common/eal_common_tailqs.c
diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_thread.c
rename to lib/eal/common/eal_common_thread.c
diff --git a/lib/librte_eal/common/eal_common_timer.c b/lib/eal/common/eal_common_timer.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_timer.c
rename to lib/eal/common/eal_common_timer.c
diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace.c
rename to lib/eal/common/eal_common_trace.c
diff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/eal/common/eal_common_trace_ctf.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_ctf.c
rename to lib/eal/common/eal_common_trace_ctf.c
diff --git a/lib/librte_eal/common/eal_common_trace_points.c b/lib/eal/common/eal_common_trace_points.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_points.c
rename to lib/eal/common/eal_common_trace_points.c
diff --git a/lib/librte_eal/common/eal_common_trace_utils.c b/lib/eal/common/eal_common_trace_utils.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_utils.c
rename to lib/eal/common/eal_common_trace_utils.c
diff --git a/lib/librte_eal/common/eal_common_uuid.c b/lib/eal/common/eal_common_uuid.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_uuid.c
rename to lib/eal/common/eal_common_uuid.c
diff --git a/lib/librte_eal/common/eal_filesystem.h b/lib/eal/common/eal_filesystem.h
similarity index 100%
rename from lib/librte_eal/common/eal_filesystem.h
rename to lib/eal/common/eal_filesystem.h
diff --git a/lib/librte_eal/common/eal_hugepages.h b/lib/eal/common/eal_hugepages.h
similarity index 100%
rename from lib/librte_eal/common/eal_hugepages.h
rename to lib/eal/common/eal_hugepages.h
diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h
similarity index 100%
rename from lib/librte_eal/common/eal_internal_cfg.h
rename to lib/eal/common/eal_internal_cfg.h
diff --git a/lib/librte_eal/common/eal_memalloc.h b/lib/eal/common/eal_memalloc.h
similarity index 100%
rename from lib/librte_eal/common/eal_memalloc.h
rename to lib/eal/common/eal_memalloc.h
diff --git a/lib/librte_eal/common/eal_memcfg.h b/lib/eal/common/eal_memcfg.h
similarity index 100%
rename from lib/librte_eal/common/eal_memcfg.h
rename to lib/eal/common/eal_memcfg.h
diff --git a/lib/librte_eal/common/eal_options.h b/lib/eal/common/eal_options.h
similarity index 100%
rename from lib/librte_eal/common/eal_options.h
rename to lib/eal/common/eal_options.h
diff --git a/lib/librte_eal/common/eal_private.h b/lib/eal/common/eal_private.h
similarity index 100%
rename from lib/librte_eal/common/eal_private.h
rename to lib/eal/common/eal_private.h
diff --git a/lib/librte_eal/common/eal_thread.h b/lib/eal/common/eal_thread.h
similarity index 100%
rename from lib/librte_eal/common/eal_thread.h
rename to lib/eal/common/eal_thread.h
diff --git a/lib/librte_eal/common/eal_trace.h b/lib/eal/common/eal_trace.h
similarity index 100%
rename from lib/librte_eal/common/eal_trace.h
rename to lib/eal/common/eal_trace.h
diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/eal/common/hotplug_mp.c
similarity index 100%
rename from lib/librte_eal/common/hotplug_mp.c
rename to lib/eal/common/hotplug_mp.c
diff --git a/lib/librte_eal/common/hotplug_mp.h b/lib/eal/common/hotplug_mp.h
similarity index 100%
rename from lib/librte_eal/common/hotplug_mp.h
rename to lib/eal/common/hotplug_mp.h
diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c
similarity index 100%
rename from lib/librte_eal/common/malloc_elem.c
rename to lib/eal/common/malloc_elem.c
diff --git a/lib/librte_eal/common/malloc_elem.h b/lib/eal/common/malloc_elem.h
similarity index 100%
rename from lib/librte_eal/common/malloc_elem.h
rename to lib/eal/common/malloc_elem.h
diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
similarity index 100%
rename from lib/librte_eal/common/malloc_heap.c
rename to lib/eal/common/malloc_heap.c
diff --git a/lib/librte_eal/common/malloc_heap.h b/lib/eal/common/malloc_heap.h
similarity index 100%
rename from lib/librte_eal/common/malloc_heap.h
rename to lib/eal/common/malloc_heap.h
diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
similarity index 100%
rename from lib/librte_eal/common/malloc_mp.c
rename to lib/eal/common/malloc_mp.c
diff --git a/lib/librte_eal/common/malloc_mp.h b/lib/eal/common/malloc_mp.h
similarity index 100%
rename from lib/librte_eal/common/malloc_mp.h
rename to lib/eal/common/malloc_mp.h
diff --git a/lib/librte_eal/common/meson.build b/lib/eal/common/meson.build
similarity index 100%
rename from lib/librte_eal/common/meson.build
rename to lib/eal/common/meson.build
diff --git a/lib/librte_eal/common/rte_keepalive.c b/lib/eal/common/rte_keepalive.c
similarity index 100%
rename from lib/librte_eal/common/rte_keepalive.c
rename to lib/eal/common/rte_keepalive.c
diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
similarity index 100%
rename from lib/librte_eal/common/rte_malloc.c
rename to lib/eal/common/rte_malloc.c
diff --git a/lib/librte_eal/common/rte_random.c b/lib/eal/common/rte_random.c
similarity index 100%
rename from lib/librte_eal/common/rte_random.c
rename to lib/eal/common/rte_random.c
diff --git a/lib/librte_eal/common/rte_reciprocal.c b/lib/eal/common/rte_reciprocal.c
similarity index 100%
rename from lib/librte_eal/common/rte_reciprocal.c
rename to lib/eal/common/rte_reciprocal.c
diff --git a/lib/librte_eal/common/rte_service.c b/lib/eal/common/rte_service.c
similarity index 100%
rename from lib/librte_eal/common/rte_service.c
rename to lib/eal/common/rte_service.c
diff --git a/lib/librte_eal/common/rte_version.c b/lib/eal/common/rte_version.c
similarity index 100%
rename from lib/librte_eal/common/rte_version.c
rename to lib/eal/common/rte_version.c
diff --git a/lib/librte_eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal.c
rename to lib/eal/freebsd/eal.c
diff --git a/lib/librte_eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_alarm.c
rename to lib/eal/freebsd/eal_alarm.c
diff --git a/lib/librte_eal/freebsd/eal_alarm_private.h b/lib/eal/freebsd/eal_alarm_private.h
similarity index 100%
rename from lib/librte_eal/freebsd/eal_alarm_private.h
rename to lib/eal/freebsd/eal_alarm_private.h
diff --git a/lib/librte_eal/freebsd/eal_cpuflags.c b/lib/eal/freebsd/eal_cpuflags.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_cpuflags.c
rename to lib/eal/freebsd/eal_cpuflags.c
diff --git a/lib/librte_eal/freebsd/eal_debug.c b/lib/eal/freebsd/eal_debug.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_debug.c
rename to lib/eal/freebsd/eal_debug.c
diff --git a/lib/librte_eal/freebsd/eal_dev.c b/lib/eal/freebsd/eal_dev.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_dev.c
rename to lib/eal/freebsd/eal_dev.c
diff --git a/lib/librte_eal/freebsd/eal_hugepage_info.c b/lib/eal/freebsd/eal_hugepage_info.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_hugepage_info.c
rename to lib/eal/freebsd/eal_hugepage_info.c
diff --git a/lib/librte_eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_interrupts.c
rename to lib/eal/freebsd/eal_interrupts.c
diff --git a/lib/librte_eal/freebsd/eal_lcore.c b/lib/eal/freebsd/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_lcore.c
rename to lib/eal/freebsd/eal_lcore.c
diff --git a/lib/librte_eal/freebsd/eal_memalloc.c b/lib/eal/freebsd/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_memalloc.c
rename to lib/eal/freebsd/eal_memalloc.c
diff --git a/lib/librte_eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_memory.c
rename to lib/eal/freebsd/eal_memory.c
diff --git a/lib/librte_eal/freebsd/eal_thread.c b/lib/eal/freebsd/eal_thread.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_thread.c
rename to lib/eal/freebsd/eal_thread.c
diff --git a/lib/librte_eal/freebsd/eal_timer.c b/lib/eal/freebsd/eal_timer.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_timer.c
rename to lib/eal/freebsd/eal_timer.c
diff --git a/lib/librte_eal/freebsd/include/meson.build b/lib/eal/freebsd/include/meson.build
similarity index 100%
rename from lib/librte_eal/freebsd/include/meson.build
rename to lib/eal/freebsd/include/meson.build
diff --git a/lib/librte_eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/freebsd/include/rte_os.h
rename to lib/eal/freebsd/include/rte_os.h
diff --git a/lib/librte_eal/freebsd/meson.build b/lib/eal/freebsd/meson.build
similarity index 100%
rename from lib/librte_eal/freebsd/meson.build
rename to lib/eal/freebsd/meson.build
diff --git a/lib/librte_eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_atomic.h
rename to lib/eal/include/generic/rte_atomic.h
diff --git a/lib/librte_eal/include/generic/rte_byteorder.h b/lib/eal/include/generic/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_byteorder.h
rename to lib/eal/include/generic/rte_byteorder.h
diff --git a/lib/librte_eal/include/generic/rte_cpuflags.h b/lib/eal/include/generic/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_cpuflags.h
rename to lib/eal/include/generic/rte_cpuflags.h
diff --git a/lib/librte_eal/include/generic/rte_cycles.h b/lib/eal/include/generic/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_cycles.h
rename to lib/eal/include/generic/rte_cycles.h
diff --git a/lib/librte_eal/include/generic/rte_io.h b/lib/eal/include/generic/rte_io.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_io.h
rename to lib/eal/include/generic/rte_io.h
diff --git a/lib/librte_eal/include/generic/rte_mcslock.h b/lib/eal/include/generic/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_mcslock.h
rename to lib/eal/include/generic/rte_mcslock.h
diff --git a/lib/librte_eal/include/generic/rte_memcpy.h b/lib/eal/include/generic/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_memcpy.h
rename to lib/eal/include/generic/rte_memcpy.h
diff --git a/lib/librte_eal/include/generic/rte_pause.h b/lib/eal/include/generic/rte_pause.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_pause.h
rename to lib/eal/include/generic/rte_pause.h
diff --git a/lib/librte_eal/include/generic/rte_power_intrinsics.h b/lib/eal/include/generic/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_power_intrinsics.h
rename to lib/eal/include/generic/rte_power_intrinsics.h
diff --git a/lib/librte_eal/include/generic/rte_prefetch.h b/lib/eal/include/generic/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_prefetch.h
rename to lib/eal/include/generic/rte_prefetch.h
diff --git a/lib/librte_eal/include/generic/rte_rwlock.h b/lib/eal/include/generic/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_rwlock.h
rename to lib/eal/include/generic/rte_rwlock.h
diff --git a/lib/librte_eal/include/generic/rte_spinlock.h b/lib/eal/include/generic/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_spinlock.h
rename to lib/eal/include/generic/rte_spinlock.h
diff --git a/lib/librte_eal/include/generic/rte_ticketlock.h b/lib/eal/include/generic/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_ticketlock.h
rename to lib/eal/include/generic/rte_ticketlock.h
diff --git a/lib/librte_eal/include/generic/rte_vect.h b/lib/eal/include/generic/rte_vect.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_vect.h
rename to lib/eal/include/generic/rte_vect.h
diff --git a/lib/librte_eal/include/meson.build b/lib/eal/include/meson.build
similarity index 100%
rename from lib/librte_eal/include/meson.build
rename to lib/eal/include/meson.build
diff --git a/lib/librte_eal/include/rte_alarm.h b/lib/eal/include/rte_alarm.h
similarity index 100%
rename from lib/librte_eal/include/rte_alarm.h
rename to lib/eal/include/rte_alarm.h
diff --git a/lib/librte_eal/include/rte_bitmap.h b/lib/eal/include/rte_bitmap.h
similarity index 100%
rename from lib/librte_eal/include/rte_bitmap.h
rename to lib/eal/include/rte_bitmap.h
diff --git a/lib/librte_eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
similarity index 100%
rename from lib/librte_eal/include/rte_bitops.h
rename to lib/eal/include/rte_bitops.h
diff --git a/lib/librte_eal/include/rte_branch_prediction.h b/lib/eal/include/rte_branch_prediction.h
similarity index 100%
rename from lib/librte_eal/include/rte_branch_prediction.h
rename to lib/eal/include/rte_branch_prediction.h
diff --git a/lib/librte_eal/include/rte_bus.h b/lib/eal/include/rte_bus.h
similarity index 100%
rename from lib/librte_eal/include/rte_bus.h
rename to lib/eal/include/rte_bus.h
diff --git a/lib/librte_eal/include/rte_class.h b/lib/eal/include/rte_class.h
similarity index 100%
rename from lib/librte_eal/include/rte_class.h
rename to lib/eal/include/rte_class.h
diff --git a/lib/librte_eal/include/rte_common.h b/lib/eal/include/rte_common.h
similarity index 100%
rename from lib/librte_eal/include/rte_common.h
rename to lib/eal/include/rte_common.h
diff --git a/lib/librte_eal/include/rte_compat.h b/lib/eal/include/rte_compat.h
similarity index 100%
rename from lib/librte_eal/include/rte_compat.h
rename to lib/eal/include/rte_compat.h
diff --git a/lib/librte_eal/include/rte_debug.h b/lib/eal/include/rte_debug.h
similarity index 100%
rename from lib/librte_eal/include/rte_debug.h
rename to lib/eal/include/rte_debug.h
diff --git a/lib/librte_eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
similarity index 100%
rename from lib/librte_eal/include/rte_dev.h
rename to lib/eal/include/rte_dev.h
diff --git a/lib/librte_eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h
similarity index 100%
rename from lib/librte_eal/include/rte_devargs.h
rename to lib/eal/include/rte_devargs.h
diff --git a/lib/librte_eal/include/rte_eal.h b/lib/eal/include/rte_eal.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal.h
rename to lib/eal/include/rte_eal.h
diff --git a/lib/librte_eal/include/rte_eal_interrupts.h b/lib/eal/include/rte_eal_interrupts.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_interrupts.h
rename to lib/eal/include/rte_eal_interrupts.h
diff --git a/lib/librte_eal/include/rte_eal_memconfig.h b/lib/eal/include/rte_eal_memconfig.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_memconfig.h
rename to lib/eal/include/rte_eal_memconfig.h
diff --git a/lib/librte_eal/include/rte_eal_paging.h b/lib/eal/include/rte_eal_paging.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_paging.h
rename to lib/eal/include/rte_eal_paging.h
diff --git a/lib/librte_eal/include/rte_eal_trace.h b/lib/eal/include/rte_eal_trace.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_trace.h
rename to lib/eal/include/rte_eal_trace.h
diff --git a/lib/librte_eal/include/rte_errno.h b/lib/eal/include/rte_errno.h
similarity index 100%
rename from lib/librte_eal/include/rte_errno.h
rename to lib/eal/include/rte_errno.h
diff --git a/lib/librte_eal/include/rte_fbarray.h b/lib/eal/include/rte_fbarray.h
similarity index 100%
rename from lib/librte_eal/include/rte_fbarray.h
rename to lib/eal/include/rte_fbarray.h
diff --git a/lib/librte_eal/include/rte_function_versioning.h b/lib/eal/include/rte_function_versioning.h
similarity index 100%
rename from lib/librte_eal/include/rte_function_versioning.h
rename to lib/eal/include/rte_function_versioning.h
diff --git a/lib/librte_eal/include/rte_hexdump.h b/lib/eal/include/rte_hexdump.h
similarity index 100%
rename from lib/librte_eal/include/rte_hexdump.h
rename to lib/eal/include/rte_hexdump.h
diff --git a/lib/librte_eal/include/rte_hypervisor.h b/lib/eal/include/rte_hypervisor.h
similarity index 100%
rename from lib/librte_eal/include/rte_hypervisor.h
rename to lib/eal/include/rte_hypervisor.h
diff --git a/lib/librte_eal/include/rte_interrupts.h b/lib/eal/include/rte_interrupts.h
similarity index 100%
rename from lib/librte_eal/include/rte_interrupts.h
rename to lib/eal/include/rte_interrupts.h
diff --git a/lib/librte_eal/include/rte_keepalive.h b/lib/eal/include/rte_keepalive.h
similarity index 100%
rename from lib/librte_eal/include/rte_keepalive.h
rename to lib/eal/include/rte_keepalive.h
diff --git a/lib/librte_eal/include/rte_launch.h b/lib/eal/include/rte_launch.h
similarity index 100%
rename from lib/librte_eal/include/rte_launch.h
rename to lib/eal/include/rte_launch.h
diff --git a/lib/librte_eal/include/rte_lcore.h b/lib/eal/include/rte_lcore.h
similarity index 100%
rename from lib/librte_eal/include/rte_lcore.h
rename to lib/eal/include/rte_lcore.h
diff --git a/lib/librte_eal/include/rte_log.h b/lib/eal/include/rte_log.h
similarity index 100%
rename from lib/librte_eal/include/rte_log.h
rename to lib/eal/include/rte_log.h
diff --git a/lib/librte_eal/include/rte_malloc.h b/lib/eal/include/rte_malloc.h
similarity index 100%
rename from lib/librte_eal/include/rte_malloc.h
rename to lib/eal/include/rte_malloc.h
diff --git a/lib/librte_eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
similarity index 100%
rename from lib/librte_eal/include/rte_memory.h
rename to lib/eal/include/rte_memory.h
diff --git a/lib/librte_eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
similarity index 100%
rename from lib/librte_eal/include/rte_memzone.h
rename to lib/eal/include/rte_memzone.h
diff --git a/lib/librte_eal/include/rte_pci_dev_feature_defs.h b/lib/eal/include/rte_pci_dev_feature_defs.h
similarity index 100%
rename from lib/librte_eal/include/rte_pci_dev_feature_defs.h
rename to lib/eal/include/rte_pci_dev_feature_defs.h
diff --git a/lib/librte_eal/include/rte_pci_dev_features.h b/lib/eal/include/rte_pci_dev_features.h
similarity index 100%
rename from lib/librte_eal/include/rte_pci_dev_features.h
rename to lib/eal/include/rte_pci_dev_features.h
diff --git a/lib/librte_eal/include/rte_per_lcore.h b/lib/eal/include/rte_per_lcore.h
similarity index 100%
rename from lib/librte_eal/include/rte_per_lcore.h
rename to lib/eal/include/rte_per_lcore.h
diff --git a/lib/librte_eal/include/rte_random.h b/lib/eal/include/rte_random.h
similarity index 100%
rename from lib/librte_eal/include/rte_random.h
rename to lib/eal/include/rte_random.h
diff --git a/lib/librte_eal/include/rte_reciprocal.h b/lib/eal/include/rte_reciprocal.h
similarity index 100%
rename from lib/librte_eal/include/rte_reciprocal.h
rename to lib/eal/include/rte_reciprocal.h
diff --git a/lib/librte_eal/include/rte_service.h b/lib/eal/include/rte_service.h
similarity index 100%
rename from lib/librte_eal/include/rte_service.h
rename to lib/eal/include/rte_service.h
diff --git a/lib/librte_eal/include/rte_service_component.h b/lib/eal/include/rte_service_component.h
similarity index 100%
rename from lib/librte_eal/include/rte_service_component.h
rename to lib/eal/include/rte_service_component.h
diff --git a/lib/librte_eal/include/rte_string_fns.h b/lib/eal/include/rte_string_fns.h
similarity index 100%
rename from lib/librte_eal/include/rte_string_fns.h
rename to lib/eal/include/rte_string_fns.h
diff --git a/lib/librte_eal/include/rte_tailq.h b/lib/eal/include/rte_tailq.h
similarity index 100%
rename from lib/librte_eal/include/rte_tailq.h
rename to lib/eal/include/rte_tailq.h
diff --git a/lib/librte_eal/include/rte_test.h b/lib/eal/include/rte_test.h
similarity index 100%
rename from lib/librte_eal/include/rte_test.h
rename to lib/eal/include/rte_test.h
diff --git a/lib/librte_eal/include/rte_thread.h b/lib/eal/include/rte_thread.h
similarity index 100%
rename from lib/librte_eal/include/rte_thread.h
rename to lib/eal/include/rte_thread.h
diff --git a/lib/librte_eal/include/rte_time.h b/lib/eal/include/rte_time.h
similarity index 100%
rename from lib/librte_eal/include/rte_time.h
rename to lib/eal/include/rte_time.h
diff --git a/lib/librte_eal/include/rte_trace.h b/lib/eal/include/rte_trace.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace.h
rename to lib/eal/include/rte_trace.h
diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/eal/include/rte_trace_point.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace_point.h
rename to lib/eal/include/rte_trace_point.h
diff --git a/lib/librte_eal/include/rte_trace_point_register.h b/lib/eal/include/rte_trace_point_register.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace_point_register.h
rename to lib/eal/include/rte_trace_point_register.h
diff --git a/lib/librte_eal/include/rte_uuid.h b/lib/eal/include/rte_uuid.h
similarity index 100%
rename from lib/librte_eal/include/rte_uuid.h
rename to lib/eal/include/rte_uuid.h
diff --git a/lib/librte_eal/include/rte_version.h b/lib/eal/include/rte_version.h
similarity index 100%
rename from lib/librte_eal/include/rte_version.h
rename to lib/eal/include/rte_version.h
diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
similarity index 100%
rename from lib/librte_eal/include/rte_vfio.h
rename to lib/eal/include/rte_vfio.h
diff --git a/lib/librte_eal/linux/eal.c b/lib/eal/linux/eal.c
similarity index 100%
rename from lib/librte_eal/linux/eal.c
rename to lib/eal/linux/eal.c
diff --git a/lib/librte_eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/linux/eal_alarm.c
rename to lib/eal/linux/eal_alarm.c
diff --git a/lib/librte_eal/linux/eal_cpuflags.c b/lib/eal/linux/eal_cpuflags.c
similarity index 100%
rename from lib/librte_eal/linux/eal_cpuflags.c
rename to lib/eal/linux/eal_cpuflags.c
diff --git a/lib/librte_eal/linux/eal_debug.c b/lib/eal/linux/eal_debug.c
similarity index 100%
rename from lib/librte_eal/linux/eal_debug.c
rename to lib/eal/linux/eal_debug.c
diff --git a/lib/librte_eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c
similarity index 100%
rename from lib/librte_eal/linux/eal_dev.c
rename to lib/eal/linux/eal_dev.c
diff --git a/lib/librte_eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c
similarity index 100%
rename from lib/librte_eal/linux/eal_hugepage_info.c
rename to lib/eal/linux/eal_hugepage_info.c
diff --git a/lib/librte_eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/linux/eal_interrupts.c
rename to lib/eal/linux/eal_interrupts.c
diff --git a/lib/librte_eal/linux/eal_lcore.c b/lib/eal/linux/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/linux/eal_lcore.c
rename to lib/eal/linux/eal_lcore.c
diff --git a/lib/librte_eal/linux/eal_log.c b/lib/eal/linux/eal_log.c
similarity index 100%
rename from lib/librte_eal/linux/eal_log.c
rename to lib/eal/linux/eal_log.c
diff --git a/lib/librte_eal/linux/eal_memalloc.c b/lib/eal/linux/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/linux/eal_memalloc.c
rename to lib/eal/linux/eal_memalloc.c
diff --git a/lib/librte_eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
similarity index 100%
rename from lib/librte_eal/linux/eal_memory.c
rename to lib/eal/linux/eal_memory.c
diff --git a/lib/librte_eal/linux/eal_thread.c b/lib/eal/linux/eal_thread.c
similarity index 100%
rename from lib/librte_eal/linux/eal_thread.c
rename to lib/eal/linux/eal_thread.c
diff --git a/lib/librte_eal/linux/eal_timer.c b/lib/eal/linux/eal_timer.c
similarity index 100%
rename from lib/librte_eal/linux/eal_timer.c
rename to lib/eal/linux/eal_timer.c
diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio.c
rename to lib/eal/linux/eal_vfio.c
diff --git a/lib/librte_eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio.h
rename to lib/eal/linux/eal_vfio.h
diff --git a/lib/librte_eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio_mp_sync.c
rename to lib/eal/linux/eal_vfio_mp_sync.c
diff --git a/lib/librte_eal/linux/include/meson.build b/lib/eal/linux/include/meson.build
similarity index 100%
rename from lib/librte_eal/linux/include/meson.build
rename to lib/eal/linux/include/meson.build
diff --git a/lib/librte_eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/linux/include/rte_os.h
rename to lib/eal/linux/include/rte_os.h
diff --git a/lib/librte_eal/linux/meson.build b/lib/eal/linux/meson.build
similarity index 100%
rename from lib/librte_eal/linux/meson.build
rename to lib/eal/linux/meson.build
diff --git a/lib/librte_eal/meson.build b/lib/eal/meson.build
similarity index 100%
rename from lib/librte_eal/meson.build
rename to lib/eal/meson.build
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/eal/ppc/include/meson.build
similarity index 100%
rename from lib/librte_eal/ppc/include/meson.build
rename to lib/eal/ppc/include/meson.build
diff --git a/lib/librte_eal/ppc/include/rte_altivec.h b/lib/eal/ppc/include/rte_altivec.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_altivec.h
rename to lib/eal/ppc/include/rte_altivec.h
diff --git a/lib/librte_eal/ppc/include/rte_atomic.h b/lib/eal/ppc/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_atomic.h
rename to lib/eal/ppc/include/rte_atomic.h
diff --git a/lib/librte_eal/ppc/include/rte_byteorder.h b/lib/eal/ppc/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_byteorder.h
rename to lib/eal/ppc/include/rte_byteorder.h
diff --git a/lib/librte_eal/ppc/include/rte_cpuflags.h b/lib/eal/ppc/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_cpuflags.h
rename to lib/eal/ppc/include/rte_cpuflags.h
diff --git a/lib/librte_eal/ppc/include/rte_cycles.h b/lib/eal/ppc/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_cycles.h
rename to lib/eal/ppc/include/rte_cycles.h
diff --git a/lib/librte_eal/ppc/include/rte_io.h b/lib/eal/ppc/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_io.h
rename to lib/eal/ppc/include/rte_io.h
diff --git a/lib/librte_eal/ppc/include/rte_mcslock.h b/lib/eal/ppc/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_mcslock.h
rename to lib/eal/ppc/include/rte_mcslock.h
diff --git a/lib/librte_eal/ppc/include/rte_memcpy.h b/lib/eal/ppc/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_memcpy.h
rename to lib/eal/ppc/include/rte_memcpy.h
diff --git a/lib/librte_eal/ppc/include/rte_pause.h b/lib/eal/ppc/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_pause.h
rename to lib/eal/ppc/include/rte_pause.h
diff --git a/lib/librte_eal/ppc/include/rte_power_intrinsics.h b/lib/eal/ppc/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_power_intrinsics.h
rename to lib/eal/ppc/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/ppc/include/rte_prefetch.h b/lib/eal/ppc/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_prefetch.h
rename to lib/eal/ppc/include/rte_prefetch.h
diff --git a/lib/librte_eal/ppc/include/rte_rwlock.h b/lib/eal/ppc/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_rwlock.h
rename to lib/eal/ppc/include/rte_rwlock.h
diff --git a/lib/librte_eal/ppc/include/rte_spinlock.h b/lib/eal/ppc/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_spinlock.h
rename to lib/eal/ppc/include/rte_spinlock.h
diff --git a/lib/librte_eal/ppc/include/rte_ticketlock.h b/lib/eal/ppc/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_ticketlock.h
rename to lib/eal/ppc/include/rte_ticketlock.h
diff --git a/lib/librte_eal/ppc/include/rte_vect.h b/lib/eal/ppc/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_vect.h
rename to lib/eal/ppc/include/rte_vect.h
diff --git a/lib/librte_eal/ppc/meson.build b/lib/eal/ppc/meson.build
similarity index 100%
rename from lib/librte_eal/ppc/meson.build
rename to lib/eal/ppc/meson.build
diff --git a/lib/librte_eal/ppc/rte_cpuflags.c b/lib/eal/ppc/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_cpuflags.c
rename to lib/eal/ppc/rte_cpuflags.c
diff --git a/lib/librte_eal/ppc/rte_cycles.c b/lib/eal/ppc/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_cycles.c
rename to lib/eal/ppc/rte_cycles.c
diff --git a/lib/librte_eal/ppc/rte_hypervisor.c b/lib/eal/ppc/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_hypervisor.c
rename to lib/eal/ppc/rte_hypervisor.c
diff --git a/lib/librte_eal/ppc/rte_power_intrinsics.c b/lib/eal/ppc/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_power_intrinsics.c
rename to lib/eal/ppc/rte_power_intrinsics.c
diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/eal/rte_eal_exports.def
similarity index 100%
rename from lib/librte_eal/rte_eal_exports.def
rename to lib/eal/rte_eal_exports.def
diff --git a/lib/librte_eal/unix/eal_file.c b/lib/eal/unix/eal_file.c
similarity index 100%
rename from lib/librte_eal/unix/eal_file.c
rename to lib/eal/unix/eal_file.c
diff --git a/lib/librte_eal/unix/eal_unix_memory.c b/lib/eal/unix/eal_unix_memory.c
similarity index 100%
rename from lib/librte_eal/unix/eal_unix_memory.c
rename to lib/eal/unix/eal_unix_memory.c
diff --git a/lib/librte_eal/unix/eal_unix_timer.c b/lib/eal/unix/eal_unix_timer.c
similarity index 100%
rename from lib/librte_eal/unix/eal_unix_timer.c
rename to lib/eal/unix/eal_unix_timer.c
diff --git a/lib/librte_eal/unix/meson.build b/lib/eal/unix/meson.build
similarity index 100%
rename from lib/librte_eal/unix/meson.build
rename to lib/eal/unix/meson.build
diff --git a/lib/librte_eal/unix/rte_thread.c b/lib/eal/unix/rte_thread.c
similarity index 100%
rename from lib/librte_eal/unix/rte_thread.c
rename to lib/eal/unix/rte_thread.c
diff --git a/lib/librte_eal/version.map b/lib/eal/version.map
similarity index 100%
rename from lib/librte_eal/version.map
rename to lib/eal/version.map
diff --git a/lib/librte_eal/windows/eal.c b/lib/eal/windows/eal.c
similarity index 100%
rename from lib/librte_eal/windows/eal.c
rename to lib/eal/windows/eal.c
diff --git a/lib/librte_eal/windows/eal_alarm.c b/lib/eal/windows/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/windows/eal_alarm.c
rename to lib/eal/windows/eal_alarm.c
diff --git a/lib/librte_eal/windows/eal_debug.c b/lib/eal/windows/eal_debug.c
similarity index 100%
rename from lib/librte_eal/windows/eal_debug.c
rename to lib/eal/windows/eal_debug.c
diff --git a/lib/librte_eal/windows/eal_file.c b/lib/eal/windows/eal_file.c
similarity index 100%
rename from lib/librte_eal/windows/eal_file.c
rename to lib/eal/windows/eal_file.c
diff --git a/lib/librte_eal/windows/eal_hugepages.c b/lib/eal/windows/eal_hugepages.c
similarity index 100%
rename from lib/librte_eal/windows/eal_hugepages.c
rename to lib/eal/windows/eal_hugepages.c
diff --git a/lib/librte_eal/windows/eal_interrupts.c b/lib/eal/windows/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/windows/eal_interrupts.c
rename to lib/eal/windows/eal_interrupts.c
diff --git a/lib/librte_eal/windows/eal_lcore.c b/lib/eal/windows/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/windows/eal_lcore.c
rename to lib/eal/windows/eal_lcore.c
diff --git a/lib/librte_eal/windows/eal_log.c b/lib/eal/windows/eal_log.c
similarity index 100%
rename from lib/librte_eal/windows/eal_log.c
rename to lib/eal/windows/eal_log.c
diff --git a/lib/librte_eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/windows/eal_memalloc.c
rename to lib/eal/windows/eal_memalloc.c
diff --git a/lib/librte_eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c
similarity index 100%
rename from lib/librte_eal/windows/eal_memory.c
rename to lib/eal/windows/eal_memory.c
diff --git a/lib/librte_eal/windows/eal_mp.c b/lib/eal/windows/eal_mp.c
similarity index 100%
rename from lib/librte_eal/windows/eal_mp.c
rename to lib/eal/windows/eal_mp.c
diff --git a/lib/librte_eal/windows/eal_thread.c b/lib/eal/windows/eal_thread.c
similarity index 100%
rename from lib/librte_eal/windows/eal_thread.c
rename to lib/eal/windows/eal_thread.c
diff --git a/lib/librte_eal/windows/eal_timer.c b/lib/eal/windows/eal_timer.c
similarity index 100%
rename from lib/librte_eal/windows/eal_timer.c
rename to lib/eal/windows/eal_timer.c
diff --git a/lib/librte_eal/windows/eal_windows.h b/lib/eal/windows/eal_windows.h
similarity index 100%
rename from lib/librte_eal/windows/eal_windows.h
rename to lib/eal/windows/eal_windows.h
diff --git a/lib/librte_eal/windows/fnmatch.c b/lib/eal/windows/fnmatch.c
similarity index 100%
rename from lib/librte_eal/windows/fnmatch.c
rename to lib/eal/windows/fnmatch.c
diff --git a/lib/librte_eal/windows/getopt.c b/lib/eal/windows/getopt.c
similarity index 100%
rename from lib/librte_eal/windows/getopt.c
rename to lib/eal/windows/getopt.c
diff --git a/lib/librte_eal/windows/include/arpa/inet.h b/lib/eal/windows/include/arpa/inet.h
similarity index 100%
rename from lib/librte_eal/windows/include/arpa/inet.h
rename to lib/eal/windows/include/arpa/inet.h
diff --git a/lib/librte_eal/windows/include/dirent.h b/lib/eal/windows/include/dirent.h
similarity index 100%
rename from lib/librte_eal/windows/include/dirent.h
rename to lib/eal/windows/include/dirent.h
diff --git a/lib/librte_eal/windows/include/fnmatch.h b/lib/eal/windows/include/fnmatch.h
similarity index 100%
rename from lib/librte_eal/windows/include/fnmatch.h
rename to lib/eal/windows/include/fnmatch.h
diff --git a/lib/librte_eal/windows/include/getopt.h b/lib/eal/windows/include/getopt.h
similarity index 100%
rename from lib/librte_eal/windows/include/getopt.h
rename to lib/eal/windows/include/getopt.h
diff --git a/lib/librte_eal/windows/include/meson.build b/lib/eal/windows/include/meson.build
similarity index 100%
rename from lib/librte_eal/windows/include/meson.build
rename to lib/eal/windows/include/meson.build
diff --git a/lib/librte_eal/windows/include/netinet/in.h b/lib/eal/windows/include/netinet/in.h
similarity index 100%
rename from lib/librte_eal/windows/include/netinet/in.h
rename to lib/eal/windows/include/netinet/in.h
diff --git a/lib/librte_eal/windows/include/netinet/ip.h b/lib/eal/windows/include/netinet/ip.h
similarity index 100%
rename from lib/librte_eal/windows/include/netinet/ip.h
rename to lib/eal/windows/include/netinet/ip.h
diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/eal/windows/include/pthread.h
similarity index 100%
rename from lib/librte_eal/windows/include/pthread.h
rename to lib/eal/windows/include/pthread.h
diff --git a/lib/librte_eal/windows/include/regex.h b/lib/eal/windows/include/regex.h
similarity index 100%
rename from lib/librte_eal/windows/include/regex.h
rename to lib/eal/windows/include/regex.h
diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_os.h
rename to lib/eal/windows/include/rte_os.h
diff --git a/lib/librte_eal/windows/include/rte_virt2phys.h b/lib/eal/windows/include/rte_virt2phys.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_virt2phys.h
rename to lib/eal/windows/include/rte_virt2phys.h
diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/eal/windows/include/rte_windows.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_windows.h
rename to lib/eal/windows/include/rte_windows.h
diff --git a/lib/librte_eal/windows/include/sched.h b/lib/eal/windows/include/sched.h
similarity index 100%
rename from lib/librte_eal/windows/include/sched.h
rename to lib/eal/windows/include/sched.h
diff --git a/lib/librte_eal/windows/include/sys/queue.h b/lib/eal/windows/include/sys/queue.h
similarity index 100%
rename from lib/librte_eal/windows/include/sys/queue.h
rename to lib/eal/windows/include/sys/queue.h
diff --git a/lib/librte_eal/windows/include/sys/socket.h b/lib/eal/windows/include/sys/socket.h
similarity index 100%
rename from lib/librte_eal/windows/include/sys/socket.h
rename to lib/eal/windows/include/sys/socket.h
diff --git a/lib/librte_eal/windows/include/unistd.h b/lib/eal/windows/include/unistd.h
similarity index 100%
rename from lib/librte_eal/windows/include/unistd.h
rename to lib/eal/windows/include/unistd.h
diff --git a/lib/librte_eal/windows/meson.build b/lib/eal/windows/meson.build
similarity index 100%
rename from lib/librte_eal/windows/meson.build
rename to lib/eal/windows/meson.build
diff --git a/lib/librte_eal/windows/rte_thread.c b/lib/eal/windows/rte_thread.c
similarity index 100%
rename from lib/librte_eal/windows/rte_thread.c
rename to lib/eal/windows/rte_thread.c
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/eal/x86/include/meson.build
similarity index 100%
rename from lib/librte_eal/x86/include/meson.build
rename to lib/eal/x86/include/meson.build
diff --git a/lib/librte_eal/x86/include/rte_atomic.h b/lib/eal/x86/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic.h
rename to lib/eal/x86/include/rte_atomic.h
diff --git a/lib/librte_eal/x86/include/rte_atomic_32.h b/lib/eal/x86/include/rte_atomic_32.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic_32.h
rename to lib/eal/x86/include/rte_atomic_32.h
diff --git a/lib/librte_eal/x86/include/rte_atomic_64.h b/lib/eal/x86/include/rte_atomic_64.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic_64.h
rename to lib/eal/x86/include/rte_atomic_64.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder.h b/lib/eal/x86/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder.h
rename to lib/eal/x86/include/rte_byteorder.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder_32.h b/lib/eal/x86/include/rte_byteorder_32.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder_32.h
rename to lib/eal/x86/include/rte_byteorder_32.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder_64.h b/lib/eal/x86/include/rte_byteorder_64.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder_64.h
rename to lib/eal/x86/include/rte_byteorder_64.h
diff --git a/lib/librte_eal/x86/include/rte_cpuflags.h b/lib/eal/x86/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_cpuflags.h
rename to lib/eal/x86/include/rte_cpuflags.h
diff --git a/lib/librte_eal/x86/include/rte_cycles.h b/lib/eal/x86/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_cycles.h
rename to lib/eal/x86/include/rte_cycles.h
diff --git a/lib/librte_eal/x86/include/rte_io.h b/lib/eal/x86/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_io.h
rename to lib/eal/x86/include/rte_io.h
diff --git a/lib/librte_eal/x86/include/rte_mcslock.h b/lib/eal/x86/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_mcslock.h
rename to lib/eal/x86/include/rte_mcslock.h
diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_memcpy.h
rename to lib/eal/x86/include/rte_memcpy.h
diff --git a/lib/librte_eal/x86/include/rte_pause.h b/lib/eal/x86/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_pause.h
rename to lib/eal/x86/include/rte_pause.h
diff --git a/lib/librte_eal/x86/include/rte_power_intrinsics.h b/lib/eal/x86/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_power_intrinsics.h
rename to lib/eal/x86/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/x86/include/rte_prefetch.h b/lib/eal/x86/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_prefetch.h
rename to lib/eal/x86/include/rte_prefetch.h
diff --git a/lib/librte_eal/x86/include/rte_rtm.h b/lib/eal/x86/include/rte_rtm.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_rtm.h
rename to lib/eal/x86/include/rte_rtm.h
diff --git a/lib/librte_eal/x86/include/rte_rwlock.h b/lib/eal/x86/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_rwlock.h
rename to lib/eal/x86/include/rte_rwlock.h
diff --git a/lib/librte_eal/x86/include/rte_spinlock.h b/lib/eal/x86/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_spinlock.h
rename to lib/eal/x86/include/rte_spinlock.h
diff --git a/lib/librte_eal/x86/include/rte_ticketlock.h b/lib/eal/x86/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_ticketlock.h
rename to lib/eal/x86/include/rte_ticketlock.h
diff --git a/lib/librte_eal/x86/include/rte_vect.h b/lib/eal/x86/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_vect.h
rename to lib/eal/x86/include/rte_vect.h
diff --git a/lib/librte_eal/x86/meson.build b/lib/eal/x86/meson.build
similarity index 100%
rename from lib/librte_eal/x86/meson.build
rename to lib/eal/x86/meson.build
diff --git a/lib/librte_eal/x86/rte_cpuflags.c b/lib/eal/x86/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/x86/rte_cpuflags.c
rename to lib/eal/x86/rte_cpuflags.c
diff --git a/lib/librte_eal/x86/rte_cpuid.h b/lib/eal/x86/rte_cpuid.h
similarity index 100%
rename from lib/librte_eal/x86/rte_cpuid.h
rename to lib/eal/x86/rte_cpuid.h
diff --git a/lib/librte_eal/x86/rte_cycles.c b/lib/eal/x86/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/x86/rte_cycles.c
rename to lib/eal/x86/rte_cycles.c
diff --git a/lib/librte_eal/x86/rte_hypervisor.c b/lib/eal/x86/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/x86/rte_hypervisor.c
rename to lib/eal/x86/rte_hypervisor.c
diff --git a/lib/librte_eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/x86/rte_power_intrinsics.c
rename to lib/eal/x86/rte_power_intrinsics.c
diff --git a/lib/librte_eal/x86/rte_spinlock.c b/lib/eal/x86/rte_spinlock.c
similarity index 100%
rename from lib/librte_eal/x86/rte_spinlock.c
rename to lib/eal/x86/rte_spinlock.c
diff --git a/lib/librte_efd/meson.build b/lib/efd/meson.build
similarity index 100%
rename from lib/librte_efd/meson.build
rename to lib/efd/meson.build
diff --git a/lib/librte_efd/rte_efd.c b/lib/efd/rte_efd.c
similarity index 100%
rename from lib/librte_efd/rte_efd.c
rename to lib/efd/rte_efd.c
diff --git a/lib/librte_efd/rte_efd.h b/lib/efd/rte_efd.h
similarity index 100%
rename from lib/librte_efd/rte_efd.h
rename to lib/efd/rte_efd.h
diff --git a/lib/librte_efd/rte_efd_arm64.h b/lib/efd/rte_efd_arm64.h
similarity index 100%
rename from lib/librte_efd/rte_efd_arm64.h
rename to lib/efd/rte_efd_arm64.h
diff --git a/lib/librte_efd/rte_efd_x86.h b/lib/efd/rte_efd_x86.h
similarity index 100%
rename from lib/librte_efd/rte_efd_x86.h
rename to lib/efd/rte_efd_x86.h
diff --git a/lib/librte_efd/version.map b/lib/efd/version.map
similarity index 100%
rename from lib/librte_efd/version.map
rename to lib/efd/version.map
diff --git a/lib/librte_ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_driver.h
rename to lib/ethdev/ethdev_driver.h
diff --git a/lib/librte_ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_pci.h
rename to lib/ethdev/ethdev_pci.h
diff --git a/lib/librte_ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_private.c
rename to lib/ethdev/ethdev_private.c
diff --git a/lib/librte_ethdev/ethdev_private.h b/lib/ethdev/ethdev_private.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_private.h
rename to lib/ethdev/ethdev_private.h
diff --git a/lib/librte_ethdev/ethdev_profile.c b/lib/ethdev/ethdev_profile.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_profile.c
rename to lib/ethdev/ethdev_profile.c
diff --git a/lib/librte_ethdev/ethdev_profile.h b/lib/ethdev/ethdev_profile.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_profile.h
rename to lib/ethdev/ethdev_profile.h
diff --git a/lib/librte_ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_trace_points.c
rename to lib/ethdev/ethdev_trace_points.c
diff --git a/lib/librte_ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_vdev.h
rename to lib/ethdev/ethdev_vdev.h
diff --git a/lib/librte_ethdev/meson.build b/lib/ethdev/meson.build
similarity index 100%
rename from lib/librte_ethdev/meson.build
rename to lib/ethdev/meson.build
diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
similarity index 100%
rename from lib/librte_ethdev/rte_class_eth.c
rename to lib/ethdev/rte_class_eth.c
diff --git a/lib/librte_ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h
similarity index 100%
rename from lib/librte_ethdev/rte_dev_info.h
rename to lib/ethdev/rte_dev_info.h
diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/ethdev/rte_eth_ctrl.h
similarity index 100%
rename from lib/librte_ethdev/rte_eth_ctrl.h
rename to lib/ethdev/rte_eth_ctrl.h
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev.c
rename to lib/ethdev/rte_ethdev.c
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev.h
rename to lib/ethdev/rte_ethdev.h
diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/ethdev/rte_ethdev_core.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_core.h
rename to lib/ethdev/rte_ethdev_core.h
diff --git a/lib/librte_ethdev/rte_ethdev_trace.h b/lib/ethdev/rte_ethdev_trace.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_trace.h
rename to lib/ethdev/rte_ethdev_trace.h
diff --git a/lib/librte_ethdev/rte_ethdev_trace_fp.h b/lib/ethdev/rte_ethdev_trace_fp.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_trace_fp.h
rename to lib/ethdev/rte_ethdev_trace_fp.h
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
similarity index 100%
rename from lib/librte_ethdev/rte_flow.c
rename to lib/ethdev/rte_flow.c
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
similarity index 100%
rename from lib/librte_ethdev/rte_flow.h
rename to lib/ethdev/rte_flow.h
diff --git a/lib/librte_ethdev/rte_flow_driver.h b/lib/ethdev/rte_flow_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_flow_driver.h
rename to lib/ethdev/rte_flow_driver.h
diff --git a/lib/librte_ethdev/rte_mtr.c b/lib/ethdev/rte_mtr.c
similarity index 100%
rename from lib/librte_ethdev/rte_mtr.c
rename to lib/ethdev/rte_mtr.c
diff --git a/lib/librte_ethdev/rte_mtr.h b/lib/ethdev/rte_mtr.h
similarity index 100%
rename from lib/librte_ethdev/rte_mtr.h
rename to lib/ethdev/rte_mtr.h
diff --git a/lib/librte_ethdev/rte_mtr_driver.h b/lib/ethdev/rte_mtr_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_mtr_driver.h
rename to lib/ethdev/rte_mtr_driver.h
diff --git a/lib/librte_ethdev/rte_tm.c b/lib/ethdev/rte_tm.c
similarity index 100%
rename from lib/librte_ethdev/rte_tm.c
rename to lib/ethdev/rte_tm.c
diff --git a/lib/librte_ethdev/rte_tm.h b/lib/ethdev/rte_tm.h
similarity index 100%
rename from lib/librte_ethdev/rte_tm.h
rename to lib/ethdev/rte_tm.h
diff --git a/lib/librte_ethdev/rte_tm_driver.h b/lib/ethdev/rte_tm_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_tm_driver.h
rename to lib/ethdev/rte_tm_driver.h
diff --git a/lib/librte_ethdev/version.map b/lib/ethdev/version.map
similarity index 100%
rename from lib/librte_ethdev/version.map
rename to lib/ethdev/version.map
diff --git a/lib/librte_eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd.h
rename to lib/eventdev/eventdev_pmd.h
diff --git a/lib/librte_eventdev/eventdev_pmd_pci.h b/lib/eventdev/eventdev_pmd_pci.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd_pci.h
rename to lib/eventdev/eventdev_pmd_pci.h
diff --git a/lib/librte_eventdev/eventdev_pmd_vdev.h b/lib/eventdev/eventdev_pmd_vdev.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd_vdev.h
rename to lib/eventdev/eventdev_pmd_vdev.h
diff --git a/lib/librte_eventdev/eventdev_trace_points.c b/lib/eventdev/eventdev_trace_points.c
similarity index 100%
rename from lib/librte_eventdev/eventdev_trace_points.c
rename to lib/eventdev/eventdev_trace_points.c
diff --git a/lib/librte_eventdev/meson.build b/lib/eventdev/meson.build
similarity index 100%
rename from lib/librte_eventdev/meson.build
rename to lib/eventdev/meson.build
diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_crypto_adapter.c
rename to lib/eventdev/rte_event_crypto_adapter.c
diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.h b/lib/eventdev/rte_event_crypto_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_crypto_adapter.h
rename to lib/eventdev/rte_event_crypto_adapter.h
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_rx_adapter.c
rename to lib/eventdev/rte_event_eth_rx_adapter.c
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.h b/lib/eventdev/rte_event_eth_rx_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_rx_adapter.h
rename to lib/eventdev/rte_event_eth_rx_adapter.h
diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_tx_adapter.c
rename to lib/eventdev/rte_event_eth_tx_adapter.c
diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/eventdev/rte_event_eth_tx_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_tx_adapter.h
rename to lib/eventdev/rte_event_eth_tx_adapter.h
diff --git a/lib/librte_eventdev/rte_event_ring.c b/lib/eventdev/rte_event_ring.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_ring.c
rename to lib/eventdev/rte_event_ring.c
diff --git a/lib/librte_eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_ring.h
rename to lib/eventdev/rte_event_ring.h
diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter.c
rename to lib/eventdev/rte_event_timer_adapter.c
diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter.h
rename to lib/eventdev/rte_event_timer_adapter.h
diff --git a/lib/librte_eventdev/rte_event_timer_adapter_pmd.h b/lib/eventdev/rte_event_timer_adapter_pmd.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter_pmd.h
rename to lib/eventdev/rte_event_timer_adapter_pmd.h
diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev.c
rename to lib/eventdev/rte_eventdev.c
diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev.h
rename to lib/eventdev/rte_eventdev.h
diff --git a/lib/librte_eventdev/rte_eventdev_trace.h b/lib/eventdev/rte_eventdev_trace.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_trace.h
rename to lib/eventdev/rte_eventdev_trace.h
diff --git a/lib/librte_eventdev/rte_eventdev_trace_fp.h b/lib/eventdev/rte_eventdev_trace_fp.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_trace_fp.h
rename to lib/eventdev/rte_eventdev_trace_fp.h
diff --git a/lib/librte_eventdev/version.map b/lib/eventdev/version.map
similarity index 100%
rename from lib/librte_eventdev/version.map
rename to lib/eventdev/version.map
diff --git a/lib/librte_fib/dir24_8.c b/lib/fib/dir24_8.c
similarity index 100%
rename from lib/librte_fib/dir24_8.c
rename to lib/fib/dir24_8.c
diff --git a/lib/librte_fib/dir24_8.h b/lib/fib/dir24_8.h
similarity index 100%
rename from lib/librte_fib/dir24_8.h
rename to lib/fib/dir24_8.h
diff --git a/lib/librte_fib/dir24_8_avx512.c b/lib/fib/dir24_8_avx512.c
similarity index 100%
rename from lib/librte_fib/dir24_8_avx512.c
rename to lib/fib/dir24_8_avx512.c
diff --git a/lib/librte_fib/dir24_8_avx512.h b/lib/fib/dir24_8_avx512.h
similarity index 100%
rename from lib/librte_fib/dir24_8_avx512.h
rename to lib/fib/dir24_8_avx512.h
diff --git a/lib/librte_fib/meson.build b/lib/fib/meson.build
similarity index 100%
rename from lib/librte_fib/meson.build
rename to lib/fib/meson.build
diff --git a/lib/librte_fib/rte_fib.c b/lib/fib/rte_fib.c
similarity index 100%
rename from lib/librte_fib/rte_fib.c
rename to lib/fib/rte_fib.c
diff --git a/lib/librte_fib/rte_fib.h b/lib/fib/rte_fib.h
similarity index 100%
rename from lib/librte_fib/rte_fib.h
rename to lib/fib/rte_fib.h
diff --git a/lib/librte_fib/rte_fib6.c b/lib/fib/rte_fib6.c
similarity index 100%
rename from lib/librte_fib/rte_fib6.c
rename to lib/fib/rte_fib6.c
diff --git a/lib/librte_fib/rte_fib6.h b/lib/fib/rte_fib6.h
similarity index 100%
rename from lib/librte_fib/rte_fib6.h
rename to lib/fib/rte_fib6.h
diff --git a/lib/librte_fib/trie.c b/lib/fib/trie.c
similarity index 100%
rename from lib/librte_fib/trie.c
rename to lib/fib/trie.c
diff --git a/lib/librte_fib/trie.h b/lib/fib/trie.h
similarity index 100%
rename from lib/librte_fib/trie.h
rename to lib/fib/trie.h
diff --git a/lib/librte_fib/trie_avx512.c b/lib/fib/trie_avx512.c
similarity index 100%
rename from lib/librte_fib/trie_avx512.c
rename to lib/fib/trie_avx512.c
diff --git a/lib/librte_fib/trie_avx512.h b/lib/fib/trie_avx512.h
similarity index 100%
rename from lib/librte_fib/trie_avx512.h
rename to lib/fib/trie_avx512.h
diff --git a/lib/librte_fib/version.map b/lib/fib/version.map
similarity index 100%
rename from lib/librte_fib/version.map
rename to lib/fib/version.map
diff --git a/lib/librte_flow_classify/meson.build b/lib/flow_classify/meson.build
similarity index 100%
rename from lib/librte_flow_classify/meson.build
rename to lib/flow_classify/meson.build
diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/flow_classify/rte_flow_classify.c
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify.c
rename to lib/flow_classify/rte_flow_classify.c
diff --git a/lib/librte_flow_classify/rte_flow_classify.h b/lib/flow_classify/rte_flow_classify.h
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify.h
rename to lib/flow_classify/rte_flow_classify.h
diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.c b/lib/flow_classify/rte_flow_classify_parse.c
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify_parse.c
rename to lib/flow_classify/rte_flow_classify_parse.c
diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.h b/lib/flow_classify/rte_flow_classify_parse.h
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify_parse.h
rename to lib/flow_classify/rte_flow_classify_parse.h
diff --git a/lib/librte_flow_classify/version.map b/lib/flow_classify/version.map
similarity index 100%
rename from lib/librte_flow_classify/version.map
rename to lib/flow_classify/version.map
diff --git a/lib/librte_graph/graph.c b/lib/graph/graph.c
similarity index 100%
rename from lib/librte_graph/graph.c
rename to lib/graph/graph.c
diff --git a/lib/librte_graph/graph_debug.c b/lib/graph/graph_debug.c
similarity index 100%
rename from lib/librte_graph/graph_debug.c
rename to lib/graph/graph_debug.c
diff --git a/lib/librte_graph/graph_ops.c b/lib/graph/graph_ops.c
similarity index 100%
rename from lib/librte_graph/graph_ops.c
rename to lib/graph/graph_ops.c
diff --git a/lib/librte_graph/graph_populate.c b/lib/graph/graph_populate.c
similarity index 100%
rename from lib/librte_graph/graph_populate.c
rename to lib/graph/graph_populate.c
diff --git a/lib/librte_graph/graph_private.h b/lib/graph/graph_private.h
similarity index 100%
rename from lib/librte_graph/graph_private.h
rename to lib/graph/graph_private.h
diff --git a/lib/librte_graph/graph_stats.c b/lib/graph/graph_stats.c
similarity index 100%
rename from lib/librte_graph/graph_stats.c
rename to lib/graph/graph_stats.c
diff --git a/lib/librte_graph/meson.build b/lib/graph/meson.build
similarity index 100%
rename from lib/librte_graph/meson.build
rename to lib/graph/meson.build
diff --git a/lib/librte_graph/node.c b/lib/graph/node.c
similarity index 100%
rename from lib/librte_graph/node.c
rename to lib/graph/node.c
diff --git a/lib/librte_graph/rte_graph.h b/lib/graph/rte_graph.h
similarity index 100%
rename from lib/librte_graph/rte_graph.h
rename to lib/graph/rte_graph.h
diff --git a/lib/librte_graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h
similarity index 100%
rename from lib/librte_graph/rte_graph_worker.h
rename to lib/graph/rte_graph_worker.h
diff --git a/lib/librte_graph/version.map b/lib/graph/version.map
similarity index 100%
rename from lib/librte_graph/version.map
rename to lib/graph/version.map
diff --git a/lib/librte_gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
similarity index 100%
rename from lib/librte_gro/gro_tcp4.c
rename to lib/gro/gro_tcp4.c
diff --git a/lib/librte_gro/gro_tcp4.h b/lib/gro/gro_tcp4.h
similarity index 100%
rename from lib/librte_gro/gro_tcp4.h
rename to lib/gro/gro_tcp4.h
diff --git a/lib/librte_gro/gro_udp4.c b/lib/gro/gro_udp4.c
similarity index 100%
rename from lib/librte_gro/gro_udp4.c
rename to lib/gro/gro_udp4.c
diff --git a/lib/librte_gro/gro_udp4.h b/lib/gro/gro_udp4.h
similarity index 100%
rename from lib/librte_gro/gro_udp4.h
rename to lib/gro/gro_udp4.h
diff --git a/lib/librte_gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c
similarity index 100%
rename from lib/librte_gro/gro_vxlan_tcp4.c
rename to lib/gro/gro_vxlan_tcp4.c
diff --git a/lib/librte_gro/gro_vxlan_tcp4.h b/lib/gro/gro_vxlan_tcp4.h
similarity index 100%
rename from lib/librte_gro/gro_vxlan_tcp4.h
rename to lib/gro/gro_vxlan_tcp4.h
diff --git a/lib/librte_gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c
similarity index 100%
rename from lib/librte_gro/gro_vxlan_udp4.c
rename to lib/gro/gro_vxlan_udp4.c
diff --git a/lib/librte_gro/gro_vxlan_udp4.h b/lib/gro/gro_vxlan_udp4.h
similarity index 100%
rename from lib/librte_gro/gro_vxlan_udp4.h
rename to lib/gro/gro_vxlan_udp4.h
diff --git a/lib/librte_gro/meson.build b/lib/gro/meson.build
similarity index 100%
rename from lib/librte_gro/meson.build
rename to lib/gro/meson.build
diff --git a/lib/librte_gro/rte_gro.c b/lib/gro/rte_gro.c
similarity index 100%
rename from lib/librte_gro/rte_gro.c
rename to lib/gro/rte_gro.c
diff --git a/lib/librte_gro/rte_gro.h b/lib/gro/rte_gro.h
similarity index 100%
rename from lib/librte_gro/rte_gro.h
rename to lib/gro/rte_gro.h
diff --git a/lib/librte_gro/version.map b/lib/gro/version.map
similarity index 100%
rename from lib/librte_gro/version.map
rename to lib/gro/version.map
diff --git a/lib/librte_gso/gso_common.c b/lib/gso/gso_common.c
similarity index 100%
rename from lib/librte_gso/gso_common.c
rename to lib/gso/gso_common.c
diff --git a/lib/librte_gso/gso_common.h b/lib/gso/gso_common.h
similarity index 100%
rename from lib/librte_gso/gso_common.h
rename to lib/gso/gso_common.h
diff --git a/lib/librte_gso/gso_tcp4.c b/lib/gso/gso_tcp4.c
similarity index 100%
rename from lib/librte_gso/gso_tcp4.c
rename to lib/gso/gso_tcp4.c
diff --git a/lib/librte_gso/gso_tcp4.h b/lib/gso/gso_tcp4.h
similarity index 100%
rename from lib/librte_gso/gso_tcp4.h
rename to lib/gso/gso_tcp4.h
diff --git a/lib/librte_gso/gso_tunnel_tcp4.c b/lib/gso/gso_tunnel_tcp4.c
similarity index 100%
rename from lib/librte_gso/gso_tunnel_tcp4.c
rename to lib/gso/gso_tunnel_tcp4.c
diff --git a/lib/librte_gso/gso_tunnel_tcp4.h b/lib/gso/gso_tunnel_tcp4.h
similarity index 100%
rename from lib/librte_gso/gso_tunnel_tcp4.h
rename to lib/gso/gso_tunnel_tcp4.h
diff --git a/lib/librte_gso/gso_tunnel_udp4.c b/lib/gso/gso_tunnel_udp4.c
similarity index 100%
rename from lib/librte_gso/gso_tunnel_udp4.c
rename to lib/gso/gso_tunnel_udp4.c
diff --git a/lib/librte_gso/gso_tunnel_udp4.h b/lib/gso/gso_tunnel_udp4.h
similarity index 100%
rename from lib/librte_gso/gso_tunnel_udp4.h
rename to lib/gso/gso_tunnel_udp4.h
diff --git a/lib/librte_gso/gso_udp4.c b/lib/gso/gso_udp4.c
similarity index 100%
rename from lib/librte_gso/gso_udp4.c
rename to lib/gso/gso_udp4.c
diff --git a/lib/librte_gso/gso_udp4.h b/lib/gso/gso_udp4.h
similarity index 100%
rename from lib/librte_gso/gso_udp4.h
rename to lib/gso/gso_udp4.h
diff --git a/lib/librte_gso/meson.build b/lib/gso/meson.build
similarity index 100%
rename from lib/librte_gso/meson.build
rename to lib/gso/meson.build
diff --git a/lib/librte_gso/rte_gso.c b/lib/gso/rte_gso.c
similarity index 100%
rename from lib/librte_gso/rte_gso.c
rename to lib/gso/rte_gso.c
diff --git a/lib/librte_gso/rte_gso.h b/lib/gso/rte_gso.h
similarity index 100%
rename from lib/librte_gso/rte_gso.h
rename to lib/gso/rte_gso.h
diff --git a/lib/librte_gso/version.map b/lib/gso/version.map
similarity index 100%
rename from lib/librte_gso/version.map
rename to lib/gso/version.map
diff --git a/lib/librte_hash/meson.build b/lib/hash/meson.build
similarity index 100%
rename from lib/librte_hash/meson.build
rename to lib/hash/meson.build
diff --git a/lib/librte_hash/rte_cmp_arm64.h b/lib/hash/rte_cmp_arm64.h
similarity index 100%
rename from lib/librte_hash/rte_cmp_arm64.h
rename to lib/hash/rte_cmp_arm64.h
diff --git a/lib/librte_hash/rte_cmp_x86.h b/lib/hash/rte_cmp_x86.h
similarity index 100%
rename from lib/librte_hash/rte_cmp_x86.h
rename to lib/hash/rte_cmp_x86.h
diff --git a/lib/librte_hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h
similarity index 100%
rename from lib/librte_hash/rte_crc_arm64.h
rename to lib/hash/rte_crc_arm64.h
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
similarity index 100%
rename from lib/librte_hash/rte_cuckoo_hash.c
rename to lib/hash/rte_cuckoo_hash.c
diff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
similarity index 100%
rename from lib/librte_hash/rte_cuckoo_hash.h
rename to lib/hash/rte_cuckoo_hash.h
diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
similarity index 100%
rename from lib/librte_hash/rte_fbk_hash.c
rename to lib/hash/rte_fbk_hash.c
diff --git a/lib/librte_hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
similarity index 100%
rename from lib/librte_hash/rte_fbk_hash.h
rename to lib/hash/rte_fbk_hash.h
diff --git a/lib/librte_hash/rte_hash.h b/lib/hash/rte_hash.h
similarity index 100%
rename from lib/librte_hash/rte_hash.h
rename to lib/hash/rte_hash.h
diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/hash/rte_hash_crc.h
similarity index 100%
rename from lib/librte_hash/rte_hash_crc.h
rename to lib/hash/rte_hash_crc.h
diff --git a/lib/librte_hash/rte_jhash.h b/lib/hash/rte_jhash.h
similarity index 100%
rename from lib/librte_hash/rte_jhash.h
rename to lib/hash/rte_jhash.h
diff --git a/lib/librte_hash/rte_thash.h b/lib/hash/rte_thash.h
similarity index 100%
rename from lib/librte_hash/rte_thash.h
rename to lib/hash/rte_thash.h
diff --git a/lib/librte_hash/version.map b/lib/hash/version.map
similarity index 100%
rename from lib/librte_hash/version.map
rename to lib/hash/version.map
diff --git a/lib/librte_ip_frag/ip_frag_common.h b/lib/ip_frag/ip_frag_common.h
similarity index 100%
rename from lib/librte_ip_frag/ip_frag_common.h
rename to lib/ip_frag/ip_frag_common.h
diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/ip_frag/ip_frag_internal.c
similarity index 100%
rename from lib/librte_ip_frag/ip_frag_internal.c
rename to lib/ip_frag/ip_frag_internal.c
diff --git a/lib/librte_ip_frag/meson.build b/lib/ip_frag/meson.build
similarity index 100%
rename from lib/librte_ip_frag/meson.build
rename to lib/ip_frag/meson.build
diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h
similarity index 100%
rename from lib/librte_ip_frag/rte_ip_frag.h
rename to lib/ip_frag/rte_ip_frag.h
diff --git a/lib/librte_ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ip_frag_common.c
rename to lib/ip_frag/rte_ip_frag_common.c
diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv4_fragmentation.c
rename to lib/ip_frag/rte_ipv4_fragmentation.c
diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/ip_frag/rte_ipv4_reassembly.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv4_reassembly.c
rename to lib/ip_frag/rte_ipv4_reassembly.c
diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/ip_frag/rte_ipv6_fragmentation.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv6_fragmentation.c
rename to lib/ip_frag/rte_ipv6_fragmentation.c
diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/ip_frag/rte_ipv6_reassembly.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv6_reassembly.c
rename to lib/ip_frag/rte_ipv6_reassembly.c
diff --git a/lib/librte_ip_frag/version.map b/lib/ip_frag/version.map
similarity index 100%
rename from lib/librte_ip_frag/version.map
rename to lib/ip_frag/version.map
diff --git a/lib/librte_ipsec/crypto.h b/lib/ipsec/crypto.h
similarity index 100%
rename from lib/librte_ipsec/crypto.h
rename to lib/ipsec/crypto.h
diff --git a/lib/librte_ipsec/esp_inb.c b/lib/ipsec/esp_inb.c
similarity index 100%
rename from lib/librte_ipsec/esp_inb.c
rename to lib/ipsec/esp_inb.c
diff --git a/lib/librte_ipsec/esp_outb.c b/lib/ipsec/esp_outb.c
similarity index 100%
rename from lib/librte_ipsec/esp_outb.c
rename to lib/ipsec/esp_outb.c
diff --git a/lib/librte_ipsec/iph.h b/lib/ipsec/iph.h
similarity index 100%
rename from lib/librte_ipsec/iph.h
rename to lib/ipsec/iph.h
diff --git a/lib/librte_ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c
similarity index 100%
rename from lib/librte_ipsec/ipsec_sad.c
rename to lib/ipsec/ipsec_sad.c
diff --git a/lib/librte_ipsec/ipsec_sqn.h b/lib/ipsec/ipsec_sqn.h
similarity index 100%
rename from lib/librte_ipsec/ipsec_sqn.h
rename to lib/ipsec/ipsec_sqn.h
diff --git a/lib/librte_ipsec/meson.build b/lib/ipsec/meson.build
similarity index 100%
rename from lib/librte_ipsec/meson.build
rename to lib/ipsec/meson.build
diff --git a/lib/librte_ipsec/misc.h b/lib/ipsec/misc.h
similarity index 100%
rename from lib/librte_ipsec/misc.h
rename to lib/ipsec/misc.h
diff --git a/lib/librte_ipsec/pad.h b/lib/ipsec/pad.h
similarity index 100%
rename from lib/librte_ipsec/pad.h
rename to lib/ipsec/pad.h
diff --git a/lib/librte_ipsec/rte_ipsec.h b/lib/ipsec/rte_ipsec.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec.h
rename to lib/ipsec/rte_ipsec.h
diff --git a/lib/librte_ipsec/rte_ipsec_group.h b/lib/ipsec/rte_ipsec_group.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_group.h
rename to lib/ipsec/rte_ipsec_group.h
diff --git a/lib/librte_ipsec/rte_ipsec_sa.h b/lib/ipsec/rte_ipsec_sa.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_sa.h
rename to lib/ipsec/rte_ipsec_sa.h
diff --git a/lib/librte_ipsec/rte_ipsec_sad.h b/lib/ipsec/rte_ipsec_sad.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_sad.h
rename to lib/ipsec/rte_ipsec_sad.h
diff --git a/lib/librte_ipsec/sa.c b/lib/ipsec/sa.c
similarity index 100%
rename from lib/librte_ipsec/sa.c
rename to lib/ipsec/sa.c
diff --git a/lib/librte_ipsec/sa.h b/lib/ipsec/sa.h
similarity index 100%
rename from lib/librte_ipsec/sa.h
rename to lib/ipsec/sa.h
diff --git a/lib/librte_ipsec/ses.c b/lib/ipsec/ses.c
similarity index 100%
rename from lib/librte_ipsec/ses.c
rename to lib/ipsec/ses.c
diff --git a/lib/librte_ipsec/version.map b/lib/ipsec/version.map
similarity index 100%
rename from lib/librte_ipsec/version.map
rename to lib/ipsec/version.map
diff --git a/lib/librte_jobstats/meson.build b/lib/jobstats/meson.build
similarity index 100%
rename from lib/librte_jobstats/meson.build
rename to lib/jobstats/meson.build
diff --git a/lib/librte_jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
similarity index 100%
rename from lib/librte_jobstats/rte_jobstats.c
rename to lib/jobstats/rte_jobstats.c
diff --git a/lib/librte_jobstats/rte_jobstats.h b/lib/jobstats/rte_jobstats.h
similarity index 100%
rename from lib/librte_jobstats/rte_jobstats.h
rename to lib/jobstats/rte_jobstats.h
diff --git a/lib/librte_jobstats/version.map b/lib/jobstats/version.map
similarity index 100%
rename from lib/librte_jobstats/version.map
rename to lib/jobstats/version.map
diff --git a/lib/librte_kni/meson.build b/lib/kni/meson.build
similarity index 100%
rename from lib/librte_kni/meson.build
rename to lib/kni/meson.build
diff --git a/lib/librte_kni/rte_kni.c b/lib/kni/rte_kni.c
similarity index 100%
rename from lib/librte_kni/rte_kni.c
rename to lib/kni/rte_kni.c
diff --git a/lib/librte_kni/rte_kni.h b/lib/kni/rte_kni.h
similarity index 100%
rename from lib/librte_kni/rte_kni.h
rename to lib/kni/rte_kni.h
diff --git a/lib/librte_kni/rte_kni_common.h b/lib/kni/rte_kni_common.h
similarity index 100%
rename from lib/librte_kni/rte_kni_common.h
rename to lib/kni/rte_kni_common.h
diff --git a/lib/librte_kni/rte_kni_fifo.h b/lib/kni/rte_kni_fifo.h
similarity index 100%
rename from lib/librte_kni/rte_kni_fifo.h
rename to lib/kni/rte_kni_fifo.h
diff --git a/lib/librte_kni/version.map b/lib/kni/version.map
similarity index 100%
rename from lib/librte_kni/version.map
rename to lib/kni/version.map
diff --git a/lib/librte_kvargs/meson.build b/lib/kvargs/meson.build
similarity index 100%
rename from lib/librte_kvargs/meson.build
rename to lib/kvargs/meson.build
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c
similarity index 100%
rename from lib/librte_kvargs/rte_kvargs.c
rename to lib/kvargs/rte_kvargs.c
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/kvargs/rte_kvargs.h
similarity index 100%
rename from lib/librte_kvargs/rte_kvargs.h
rename to lib/kvargs/rte_kvargs.h
diff --git a/lib/librte_kvargs/version.map b/lib/kvargs/version.map
similarity index 100%
rename from lib/librte_kvargs/version.map
rename to lib/kvargs/version.map
diff --git a/lib/librte_latencystats/meson.build b/lib/latencystats/meson.build
similarity index 100%
rename from lib/librte_latencystats/meson.build
rename to lib/latencystats/meson.build
diff --git a/lib/librte_latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c
similarity index 100%
rename from lib/librte_latencystats/rte_latencystats.c
rename to lib/latencystats/rte_latencystats.c
diff --git a/lib/librte_latencystats/rte_latencystats.h b/lib/latencystats/rte_latencystats.h
similarity index 100%
rename from lib/librte_latencystats/rte_latencystats.h
rename to lib/latencystats/rte_latencystats.h
diff --git a/lib/librte_latencystats/version.map b/lib/latencystats/version.map
similarity index 100%
rename from lib/librte_latencystats/version.map
rename to lib/latencystats/version.map
diff --git a/lib/librte_lpm/meson.build b/lib/lpm/meson.build
similarity index 100%
rename from lib/librte_lpm/meson.build
rename to lib/lpm/meson.build
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
similarity index 100%
rename from lib/librte_lpm/rte_lpm.c
rename to lib/lpm/rte_lpm.c
diff --git a/lib/librte_lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm.h
rename to lib/lpm/rte_lpm.h
diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
similarity index 100%
rename from lib/librte_lpm/rte_lpm6.c
rename to lib/lpm/rte_lpm6.c
diff --git a/lib/librte_lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm6.h
rename to lib/lpm/rte_lpm6.h
diff --git a/lib/librte_lpm/rte_lpm_altivec.h b/lib/lpm/rte_lpm_altivec.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_altivec.h
rename to lib/lpm/rte_lpm_altivec.h
diff --git a/lib/librte_lpm/rte_lpm_neon.h b/lib/lpm/rte_lpm_neon.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_neon.h
rename to lib/lpm/rte_lpm_neon.h
diff --git a/lib/librte_lpm/rte_lpm_sse.h b/lib/lpm/rte_lpm_sse.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_sse.h
rename to lib/lpm/rte_lpm_sse.h
diff --git a/lib/librte_lpm/rte_lpm_sve.h b/lib/lpm/rte_lpm_sve.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_sve.h
rename to lib/lpm/rte_lpm_sve.h
diff --git a/lib/librte_lpm/version.map b/lib/lpm/version.map
similarity index 100%
rename from lib/librte_lpm/version.map
rename to lib/lpm/version.map
diff --git a/lib/librte_mbuf/meson.build b/lib/mbuf/meson.build
similarity index 100%
rename from lib/librte_mbuf/meson.build
rename to lib/mbuf/meson.build
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf.c
rename to lib/mbuf/rte_mbuf.c
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf.h
rename to lib/mbuf/rte_mbuf.h
diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_core.h
rename to lib/mbuf/rte_mbuf_core.h
diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_dyn.c
rename to lib/mbuf/rte_mbuf_dyn.c
diff --git a/lib/librte_mbuf/rte_mbuf_dyn.h b/lib/mbuf/rte_mbuf_dyn.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_dyn.h
rename to lib/mbuf/rte_mbuf_dyn.h
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_pool_ops.c
rename to lib/mbuf/rte_mbuf_pool_ops.c
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.h b/lib/mbuf/rte_mbuf_pool_ops.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_pool_ops.h
rename to lib/mbuf/rte_mbuf_pool_ops.h
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.c b/lib/mbuf/rte_mbuf_ptype.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_ptype.c
rename to lib/mbuf/rte_mbuf_ptype.c
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/mbuf/rte_mbuf_ptype.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_ptype.h
rename to lib/mbuf/rte_mbuf_ptype.h
diff --git a/lib/librte_mbuf/version.map b/lib/mbuf/version.map
similarity index 100%
rename from lib/librte_mbuf/version.map
rename to lib/mbuf/version.map
diff --git a/lib/librte_member/meson.build b/lib/member/meson.build
similarity index 100%
rename from lib/librte_member/meson.build
rename to lib/member/meson.build
diff --git a/lib/librte_member/rte_member.c b/lib/member/rte_member.c
similarity index 100%
rename from lib/librte_member/rte_member.c
rename to lib/member/rte_member.c
diff --git a/lib/librte_member/rte_member.h b/lib/member/rte_member.h
similarity index 100%
rename from lib/librte_member/rte_member.h
rename to lib/member/rte_member.h
diff --git a/lib/librte_member/rte_member_ht.c b/lib/member/rte_member_ht.c
similarity index 100%
rename from lib/librte_member/rte_member_ht.c
rename to lib/member/rte_member_ht.c
diff --git a/lib/librte_member/rte_member_ht.h b/lib/member/rte_member_ht.h
similarity index 100%
rename from lib/librte_member/rte_member_ht.h
rename to lib/member/rte_member_ht.h
diff --git a/lib/librte_member/rte_member_vbf.c b/lib/member/rte_member_vbf.c
similarity index 100%
rename from lib/librte_member/rte_member_vbf.c
rename to lib/member/rte_member_vbf.c
diff --git a/lib/librte_member/rte_member_vbf.h b/lib/member/rte_member_vbf.h
similarity index 100%
rename from lib/librte_member/rte_member_vbf.h
rename to lib/member/rte_member_vbf.h
diff --git a/lib/librte_member/rte_member_x86.h b/lib/member/rte_member_x86.h
similarity index 100%
rename from lib/librte_member/rte_member_x86.h
rename to lib/member/rte_member_x86.h
diff --git a/lib/librte_member/version.map b/lib/member/version.map
similarity index 100%
rename from lib/librte_member/version.map
rename to lib/member/version.map
diff --git a/lib/librte_mempool/mempool_trace_points.c b/lib/mempool/mempool_trace_points.c
similarity index 100%
rename from lib/librte_mempool/mempool_trace_points.c
rename to lib/mempool/mempool_trace_points.c
diff --git a/lib/librte_mempool/meson.build b/lib/mempool/meson.build
similarity index 100%
rename from lib/librte_mempool/meson.build
rename to lib/mempool/meson.build
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool.c
rename to lib/mempool/rte_mempool.c
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool.h
rename to lib/mempool/rte_mempool.h
diff --git a/lib/librte_mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool_ops.c
rename to lib/mempool/rte_mempool_ops.c
diff --git a/lib/librte_mempool/rte_mempool_ops_default.c b/lib/mempool/rte_mempool_ops_default.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool_ops_default.c
rename to lib/mempool/rte_mempool_ops_default.c
diff --git a/lib/librte_mempool/rte_mempool_trace.h b/lib/mempool/rte_mempool_trace.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool_trace.h
rename to lib/mempool/rte_mempool_trace.h
diff --git a/lib/librte_mempool/rte_mempool_trace_fp.h b/lib/mempool/rte_mempool_trace_fp.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool_trace_fp.h
rename to lib/mempool/rte_mempool_trace_fp.h
diff --git a/lib/librte_mempool/version.map b/lib/mempool/version.map
similarity index 100%
rename from lib/librte_mempool/version.map
rename to lib/mempool/version.map
diff --git a/lib/meson.build b/lib/meson.build
index 7821dc9290..dc236c06de 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -81,8 +81,10 @@ foreach l:libraries
         deps += ['eal']
     endif
 
-    dir_name = 'librte_' + l
-    subdir(dir_name)
+    subdir(l)
+    if name != l
+        warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
+    endif
 
     if not build
         dpdk_libs_disabled += name
@@ -95,7 +97,7 @@ foreach l:libraries
     foreach d:deps
         if not is_variable('shared_rte_' + d)
             error('Missing internal dependency "@0@" for @1@ [@2@]'
-                    .format(d, name, 'lib/' + dir_name))
+                    .format(d, name, 'lib/' + l))
         endif
         shared_deps += [get_variable('shared_rte_' + d)]
         static_deps += [get_variable('static_rte_' + d)]
@@ -108,7 +110,7 @@ foreach l:libraries
     dpdk_chkinc_headers += headers
 
     libname = 'rte_' + name
-    includes += include_directories(dir_name)
+    includes += include_directories(l)
 
     if is_windows and use_function_versioning
         message('@0@: Function versioning is not supported by Windows.'.format(name))
@@ -140,8 +142,8 @@ foreach l:libraries
         cflags += '-DRTE_BUILD_SHARED_LIB'
     endif
     version_map = '@0@/@1@/version.map'.format(
-            meson.current_source_dir(), dir_name)
-    implib = dir_name + '.dll.a'
+            meson.current_source_dir(), l)
+    implib = 'librte_' + l + '.dll.a'
 
     def_file = custom_target(libname + '_def',
             command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
@@ -199,5 +201,5 @@ foreach l:libraries
 
     set_variable('shared_rte_' + name, shared_dep)
     set_variable('static_rte_' + name, static_dep)
-    message('lib/@0@: Defining dependency "@1@"'.format(dir_name, name))
+    message('lib/@0@: Defining dependency "@1@"'.format(l, name))
 endforeach
diff --git a/lib/librte_meter/meson.build b/lib/meter/meson.build
similarity index 100%
rename from lib/librte_meter/meson.build
rename to lib/meter/meson.build
diff --git a/lib/librte_meter/rte_meter.c b/lib/meter/rte_meter.c
similarity index 100%
rename from lib/librte_meter/rte_meter.c
rename to lib/meter/rte_meter.c
diff --git a/lib/librte_meter/rte_meter.h b/lib/meter/rte_meter.h
similarity index 100%
rename from lib/librte_meter/rte_meter.h
rename to lib/meter/rte_meter.h
diff --git a/lib/librte_meter/version.map b/lib/meter/version.map
similarity index 100%
rename from lib/librte_meter/version.map
rename to lib/meter/version.map
diff --git a/lib/librte_metrics/meson.build b/lib/metrics/meson.build
similarity index 100%
rename from lib/librte_metrics/meson.build
rename to lib/metrics/meson.build
diff --git a/lib/librte_metrics/rte_metrics.c b/lib/metrics/rte_metrics.c
similarity index 100%
rename from lib/librte_metrics/rte_metrics.c
rename to lib/metrics/rte_metrics.c
diff --git a/lib/librte_metrics/rte_metrics.h b/lib/metrics/rte_metrics.h
similarity index 100%
rename from lib/librte_metrics/rte_metrics.h
rename to lib/metrics/rte_metrics.h
diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/metrics/rte_metrics_telemetry.c
similarity index 100%
rename from lib/librte_metrics/rte_metrics_telemetry.c
rename to lib/metrics/rte_metrics_telemetry.c
diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/metrics/rte_metrics_telemetry.h
similarity index 100%
rename from lib/librte_metrics/rte_metrics_telemetry.h
rename to lib/metrics/rte_metrics_telemetry.h
diff --git a/lib/librte_metrics/version.map b/lib/metrics/version.map
similarity index 100%
rename from lib/librte_metrics/version.map
rename to lib/metrics/version.map
diff --git a/lib/librte_net/meson.build b/lib/net/meson.build
similarity index 100%
rename from lib/librte_net/meson.build
rename to lib/net/meson.build
diff --git a/lib/librte_net/net_crc.h b/lib/net/net_crc.h
similarity index 100%
rename from lib/librte_net/net_crc.h
rename to lib/net/net_crc.h
diff --git a/lib/librte_net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
similarity index 100%
rename from lib/librte_net/net_crc_avx512.c
rename to lib/net/net_crc_avx512.c
diff --git a/lib/librte_net/net_crc_neon.c b/lib/net/net_crc_neon.c
similarity index 100%
rename from lib/librte_net/net_crc_neon.c
rename to lib/net/net_crc_neon.c
diff --git a/lib/librte_net/net_crc_sse.c b/lib/net/net_crc_sse.c
similarity index 100%
rename from lib/librte_net/net_crc_sse.c
rename to lib/net/net_crc_sse.c
diff --git a/lib/librte_net/rte_arp.c b/lib/net/rte_arp.c
similarity index 100%
rename from lib/librte_net/rte_arp.c
rename to lib/net/rte_arp.c
diff --git a/lib/librte_net/rte_arp.h b/lib/net/rte_arp.h
similarity index 100%
rename from lib/librte_net/rte_arp.h
rename to lib/net/rte_arp.h
diff --git a/lib/librte_net/rte_ecpri.h b/lib/net/rte_ecpri.h
similarity index 100%
rename from lib/librte_net/rte_ecpri.h
rename to lib/net/rte_ecpri.h
diff --git a/lib/librte_net/rte_esp.h b/lib/net/rte_esp.h
similarity index 100%
rename from lib/librte_net/rte_esp.h
rename to lib/net/rte_esp.h
diff --git a/lib/librte_net/rte_ether.c b/lib/net/rte_ether.c
similarity index 100%
rename from lib/librte_net/rte_ether.c
rename to lib/net/rte_ether.c
diff --git a/lib/librte_net/rte_ether.h b/lib/net/rte_ether.h
similarity index 100%
rename from lib/librte_net/rte_ether.h
rename to lib/net/rte_ether.h
diff --git a/lib/librte_net/rte_geneve.h b/lib/net/rte_geneve.h
similarity index 100%
rename from lib/librte_net/rte_geneve.h
rename to lib/net/rte_geneve.h
diff --git a/lib/librte_net/rte_gre.h b/lib/net/rte_gre.h
similarity index 100%
rename from lib/librte_net/rte_gre.h
rename to lib/net/rte_gre.h
diff --git a/lib/librte_net/rte_gtp.h b/lib/net/rte_gtp.h
similarity index 100%
rename from lib/librte_net/rte_gtp.h
rename to lib/net/rte_gtp.h
diff --git a/lib/librte_net/rte_higig.h b/lib/net/rte_higig.h
similarity index 100%
rename from lib/librte_net/rte_higig.h
rename to lib/net/rte_higig.h
diff --git a/lib/librte_net/rte_icmp.h b/lib/net/rte_icmp.h
similarity index 100%
rename from lib/librte_net/rte_icmp.h
rename to lib/net/rte_icmp.h
diff --git a/lib/librte_net/rte_ip.h b/lib/net/rte_ip.h
similarity index 100%
rename from lib/librte_net/rte_ip.h
rename to lib/net/rte_ip.h
diff --git a/lib/librte_net/rte_mpls.h b/lib/net/rte_mpls.h
similarity index 100%
rename from lib/librte_net/rte_mpls.h
rename to lib/net/rte_mpls.h
diff --git a/lib/librte_net/rte_net.c b/lib/net/rte_net.c
similarity index 100%
rename from lib/librte_net/rte_net.c
rename to lib/net/rte_net.c
diff --git a/lib/librte_net/rte_net.h b/lib/net/rte_net.h
similarity index 100%
rename from lib/librte_net/rte_net.h
rename to lib/net/rte_net.h
diff --git a/lib/librte_net/rte_net_crc.c b/lib/net/rte_net_crc.c
similarity index 100%
rename from lib/librte_net/rte_net_crc.c
rename to lib/net/rte_net_crc.c
diff --git a/lib/librte_net/rte_net_crc.h b/lib/net/rte_net_crc.h
similarity index 100%
rename from lib/librte_net/rte_net_crc.h
rename to lib/net/rte_net_crc.h
diff --git a/lib/librte_net/rte_sctp.h b/lib/net/rte_sctp.h
similarity index 100%
rename from lib/librte_net/rte_sctp.h
rename to lib/net/rte_sctp.h
diff --git a/lib/librte_net/rte_tcp.h b/lib/net/rte_tcp.h
similarity index 100%
rename from lib/librte_net/rte_tcp.h
rename to lib/net/rte_tcp.h
diff --git a/lib/librte_net/rte_udp.h b/lib/net/rte_udp.h
similarity index 100%
rename from lib/librte_net/rte_udp.h
rename to lib/net/rte_udp.h
diff --git a/lib/librte_net/rte_vxlan.h b/lib/net/rte_vxlan.h
similarity index 100%
rename from lib/librte_net/rte_vxlan.h
rename to lib/net/rte_vxlan.h
diff --git a/lib/librte_net/version.map b/lib/net/version.map
similarity index 100%
rename from lib/librte_net/version.map
rename to lib/net/version.map
diff --git a/lib/librte_node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
similarity index 100%
rename from lib/librte_node/ethdev_ctrl.c
rename to lib/node/ethdev_ctrl.c
diff --git a/lib/librte_node/ethdev_rx.c b/lib/node/ethdev_rx.c
similarity index 100%
rename from lib/librte_node/ethdev_rx.c
rename to lib/node/ethdev_rx.c
diff --git a/lib/librte_node/ethdev_rx_priv.h b/lib/node/ethdev_rx_priv.h
similarity index 100%
rename from lib/librte_node/ethdev_rx_priv.h
rename to lib/node/ethdev_rx_priv.h
diff --git a/lib/librte_node/ethdev_tx.c b/lib/node/ethdev_tx.c
similarity index 100%
rename from lib/librte_node/ethdev_tx.c
rename to lib/node/ethdev_tx.c
diff --git a/lib/librte_node/ethdev_tx_priv.h b/lib/node/ethdev_tx_priv.h
similarity index 100%
rename from lib/librte_node/ethdev_tx_priv.h
rename to lib/node/ethdev_tx_priv.h
diff --git a/lib/librte_node/ip4_lookup.c b/lib/node/ip4_lookup.c
similarity index 100%
rename from lib/librte_node/ip4_lookup.c
rename to lib/node/ip4_lookup.c
diff --git a/lib/librte_node/ip4_lookup_neon.h b/lib/node/ip4_lookup_neon.h
similarity index 100%
rename from lib/librte_node/ip4_lookup_neon.h
rename to lib/node/ip4_lookup_neon.h
diff --git a/lib/librte_node/ip4_lookup_sse.h b/lib/node/ip4_lookup_sse.h
similarity index 100%
rename from lib/librte_node/ip4_lookup_sse.h
rename to lib/node/ip4_lookup_sse.h
diff --git a/lib/librte_node/ip4_rewrite.c b/lib/node/ip4_rewrite.c
similarity index 100%
rename from lib/librte_node/ip4_rewrite.c
rename to lib/node/ip4_rewrite.c
diff --git a/lib/librte_node/ip4_rewrite_priv.h b/lib/node/ip4_rewrite_priv.h
similarity index 100%
rename from lib/librte_node/ip4_rewrite_priv.h
rename to lib/node/ip4_rewrite_priv.h
diff --git a/lib/librte_node/log.c b/lib/node/log.c
similarity index 100%
rename from lib/librte_node/log.c
rename to lib/node/log.c
diff --git a/lib/librte_node/meson.build b/lib/node/meson.build
similarity index 100%
rename from lib/librte_node/meson.build
rename to lib/node/meson.build
diff --git a/lib/librte_node/node_private.h b/lib/node/node_private.h
similarity index 100%
rename from lib/librte_node/node_private.h
rename to lib/node/node_private.h
diff --git a/lib/librte_node/null.c b/lib/node/null.c
similarity index 100%
rename from lib/librte_node/null.c
rename to lib/node/null.c
diff --git a/lib/librte_node/pkt_cls.c b/lib/node/pkt_cls.c
similarity index 100%
rename from lib/librte_node/pkt_cls.c
rename to lib/node/pkt_cls.c
diff --git a/lib/librte_node/pkt_cls_priv.h b/lib/node/pkt_cls_priv.h
similarity index 100%
rename from lib/librte_node/pkt_cls_priv.h
rename to lib/node/pkt_cls_priv.h
diff --git a/lib/librte_node/pkt_drop.c b/lib/node/pkt_drop.c
similarity index 100%
rename from lib/librte_node/pkt_drop.c
rename to lib/node/pkt_drop.c
diff --git a/lib/librte_node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
similarity index 100%
rename from lib/librte_node/rte_node_eth_api.h
rename to lib/node/rte_node_eth_api.h
diff --git a/lib/librte_node/rte_node_ip4_api.h b/lib/node/rte_node_ip4_api.h
similarity index 100%
rename from lib/librte_node/rte_node_ip4_api.h
rename to lib/node/rte_node_ip4_api.h
diff --git a/lib/librte_node/version.map b/lib/node/version.map
similarity index 100%
rename from lib/librte_node/version.map
rename to lib/node/version.map
diff --git a/lib/librte_pci/meson.build b/lib/pci/meson.build
similarity index 100%
rename from lib/librte_pci/meson.build
rename to lib/pci/meson.build
diff --git a/lib/librte_pci/rte_pci.c b/lib/pci/rte_pci.c
similarity index 100%
rename from lib/librte_pci/rte_pci.c
rename to lib/pci/rte_pci.c
diff --git a/lib/librte_pci/rte_pci.h b/lib/pci/rte_pci.h
similarity index 100%
rename from lib/librte_pci/rte_pci.h
rename to lib/pci/rte_pci.h
diff --git a/lib/librte_pci/version.map b/lib/pci/version.map
similarity index 100%
rename from lib/librte_pci/version.map
rename to lib/pci/version.map
diff --git a/lib/librte_pdump/meson.build b/lib/pdump/meson.build
similarity index 100%
rename from lib/librte_pdump/meson.build
rename to lib/pdump/meson.build
diff --git a/lib/librte_pdump/rte_pdump.c b/lib/pdump/rte_pdump.c
similarity index 100%
rename from lib/librte_pdump/rte_pdump.c
rename to lib/pdump/rte_pdump.c
diff --git a/lib/librte_pdump/rte_pdump.h b/lib/pdump/rte_pdump.h
similarity index 100%
rename from lib/librte_pdump/rte_pdump.h
rename to lib/pdump/rte_pdump.h
diff --git a/lib/librte_pdump/version.map b/lib/pdump/version.map
similarity index 100%
rename from lib/librte_pdump/version.map
rename to lib/pdump/version.map
diff --git a/lib/librte_pipeline/meson.build b/lib/pipeline/meson.build
similarity index 100%
rename from lib/librte_pipeline/meson.build
rename to lib/pipeline/meson.build
diff --git a/lib/librte_pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
similarity index 100%
rename from lib/librte_pipeline/rte_pipeline.c
rename to lib/pipeline/rte_pipeline.c
diff --git a/lib/librte_pipeline/rte_pipeline.h b/lib/pipeline/rte_pipeline.h
similarity index 100%
rename from lib/librte_pipeline/rte_pipeline.h
rename to lib/pipeline/rte_pipeline.h
diff --git a/lib/librte_pipeline/rte_port_in_action.c b/lib/pipeline/rte_port_in_action.c
similarity index 100%
rename from lib/librte_pipeline/rte_port_in_action.c
rename to lib/pipeline/rte_port_in_action.c
diff --git a/lib/librte_pipeline/rte_port_in_action.h b/lib/pipeline/rte_port_in_action.h
similarity index 100%
rename from lib/librte_pipeline/rte_port_in_action.h
rename to lib/pipeline/rte_port_in_action.h
diff --git a/lib/librte_pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_ctl.c
rename to lib/pipeline/rte_swx_ctl.c
diff --git a/lib/librte_pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_ctl.h
rename to lib/pipeline/rte_swx_ctl.h
diff --git a/lib/librte_pipeline/rte_swx_extern.h b/lib/pipeline/rte_swx_extern.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_extern.h
rename to lib/pipeline/rte_swx_extern.h
diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline.c
rename to lib/pipeline/rte_swx_pipeline.c
diff --git a/lib/librte_pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline.h
rename to lib/pipeline/rte_swx_pipeline.h
diff --git a/lib/librte_pipeline/rte_swx_pipeline_spec.c b/lib/pipeline/rte_swx_pipeline_spec.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline_spec.c
rename to lib/pipeline/rte_swx_pipeline_spec.c
diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c
similarity index 100%
rename from lib/librte_pipeline/rte_table_action.c
rename to lib/pipeline/rte_table_action.c
diff --git a/lib/librte_pipeline/rte_table_action.h b/lib/pipeline/rte_table_action.h
similarity index 100%
rename from lib/librte_pipeline/rte_table_action.h
rename to lib/pipeline/rte_table_action.h
diff --git a/lib/librte_pipeline/version.map b/lib/pipeline/version.map
similarity index 100%
rename from lib/librte_pipeline/version.map
rename to lib/pipeline/version.map
diff --git a/lib/librte_port/meson.build b/lib/port/meson.build
similarity index 100%
rename from lib/librte_port/meson.build
rename to lib/port/meson.build
diff --git a/lib/librte_port/rte_port.h b/lib/port/rte_port.h
similarity index 100%
rename from lib/librte_port/rte_port.h
rename to lib/port/rte_port.h
diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/port/rte_port_ethdev.c
similarity index 100%
rename from lib/librte_port/rte_port_ethdev.c
rename to lib/port/rte_port_ethdev.c
diff --git a/lib/librte_port/rte_port_ethdev.h b/lib/port/rte_port_ethdev.h
similarity index 100%
rename from lib/librte_port/rte_port_ethdev.h
rename to lib/port/rte_port_ethdev.h
diff --git a/lib/librte_port/rte_port_eventdev.c b/lib/port/rte_port_eventdev.c
similarity index 100%
rename from lib/librte_port/rte_port_eventdev.c
rename to lib/port/rte_port_eventdev.c
diff --git a/lib/librte_port/rte_port_eventdev.h b/lib/port/rte_port_eventdev.h
similarity index 100%
rename from lib/librte_port/rte_port_eventdev.h
rename to lib/port/rte_port_eventdev.h
diff --git a/lib/librte_port/rte_port_fd.c b/lib/port/rte_port_fd.c
similarity index 100%
rename from lib/librte_port/rte_port_fd.c
rename to lib/port/rte_port_fd.c
diff --git a/lib/librte_port/rte_port_fd.h b/lib/port/rte_port_fd.h
similarity index 100%
rename from lib/librte_port/rte_port_fd.h
rename to lib/port/rte_port_fd.h
diff --git a/lib/librte_port/rte_port_frag.c b/lib/port/rte_port_frag.c
similarity index 100%
rename from lib/librte_port/rte_port_frag.c
rename to lib/port/rte_port_frag.c
diff --git a/lib/librte_port/rte_port_frag.h b/lib/port/rte_port_frag.h
similarity index 100%
rename from lib/librte_port/rte_port_frag.h
rename to lib/port/rte_port_frag.h
diff --git a/lib/librte_port/rte_port_kni.c b/lib/port/rte_port_kni.c
similarity index 100%
rename from lib/librte_port/rte_port_kni.c
rename to lib/port/rte_port_kni.c
diff --git a/lib/librte_port/rte_port_kni.h b/lib/port/rte_port_kni.h
similarity index 100%
rename from lib/librte_port/rte_port_kni.h
rename to lib/port/rte_port_kni.h
diff --git a/lib/librte_port/rte_port_ras.c b/lib/port/rte_port_ras.c
similarity index 100%
rename from lib/librte_port/rte_port_ras.c
rename to lib/port/rte_port_ras.c
diff --git a/lib/librte_port/rte_port_ras.h b/lib/port/rte_port_ras.h
similarity index 100%
rename from lib/librte_port/rte_port_ras.h
rename to lib/port/rte_port_ras.h
diff --git a/lib/librte_port/rte_port_ring.c b/lib/port/rte_port_ring.c
similarity index 100%
rename from lib/librte_port/rte_port_ring.c
rename to lib/port/rte_port_ring.c
diff --git a/lib/librte_port/rte_port_ring.h b/lib/port/rte_port_ring.h
similarity index 100%
rename from lib/librte_port/rte_port_ring.h
rename to lib/port/rte_port_ring.h
diff --git a/lib/librte_port/rte_port_sched.c b/lib/port/rte_port_sched.c
similarity index 100%
rename from lib/librte_port/rte_port_sched.c
rename to lib/port/rte_port_sched.c
diff --git a/lib/librte_port/rte_port_sched.h b/lib/port/rte_port_sched.h
similarity index 100%
rename from lib/librte_port/rte_port_sched.h
rename to lib/port/rte_port_sched.h
diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/port/rte_port_source_sink.c
similarity index 100%
rename from lib/librte_port/rte_port_source_sink.c
rename to lib/port/rte_port_source_sink.c
diff --git a/lib/librte_port/rte_port_source_sink.h b/lib/port/rte_port_source_sink.h
similarity index 100%
rename from lib/librte_port/rte_port_source_sink.h
rename to lib/port/rte_port_source_sink.h
diff --git a/lib/librte_port/rte_port_sym_crypto.c b/lib/port/rte_port_sym_crypto.c
similarity index 100%
rename from lib/librte_port/rte_port_sym_crypto.c
rename to lib/port/rte_port_sym_crypto.c
diff --git a/lib/librte_port/rte_port_sym_crypto.h b/lib/port/rte_port_sym_crypto.h
similarity index 100%
rename from lib/librte_port/rte_port_sym_crypto.h
rename to lib/port/rte_port_sym_crypto.h
diff --git a/lib/librte_port/rte_swx_port.h b/lib/port/rte_swx_port.h
similarity index 100%
rename from lib/librte_port/rte_swx_port.h
rename to lib/port/rte_swx_port.h
diff --git a/lib/librte_port/rte_swx_port_ethdev.c b/lib/port/rte_swx_port_ethdev.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_ethdev.c
rename to lib/port/rte_swx_port_ethdev.c
diff --git a/lib/librte_port/rte_swx_port_ethdev.h b/lib/port/rte_swx_port_ethdev.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_ethdev.h
rename to lib/port/rte_swx_port_ethdev.h
diff --git a/lib/librte_port/rte_swx_port_fd.c b/lib/port/rte_swx_port_fd.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_fd.c
rename to lib/port/rte_swx_port_fd.c
diff --git a/lib/librte_port/rte_swx_port_fd.h b/lib/port/rte_swx_port_fd.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_fd.h
rename to lib/port/rte_swx_port_fd.h
diff --git a/lib/librte_port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_ring.c
rename to lib/port/rte_swx_port_ring.c
diff --git a/lib/librte_port/rte_swx_port_ring.h b/lib/port/rte_swx_port_ring.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_ring.h
rename to lib/port/rte_swx_port_ring.h
diff --git a/lib/librte_port/rte_swx_port_source_sink.c b/lib/port/rte_swx_port_source_sink.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_source_sink.c
rename to lib/port/rte_swx_port_source_sink.c
diff --git a/lib/librte_port/rte_swx_port_source_sink.h b/lib/port/rte_swx_port_source_sink.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_source_sink.h
rename to lib/port/rte_swx_port_source_sink.h
diff --git a/lib/librte_port/version.map b/lib/port/version.map
similarity index 100%
rename from lib/librte_port/version.map
rename to lib/port/version.map
diff --git a/lib/librte_power/guest_channel.c b/lib/power/guest_channel.c
similarity index 100%
rename from lib/librte_power/guest_channel.c
rename to lib/power/guest_channel.c
diff --git a/lib/librte_power/guest_channel.h b/lib/power/guest_channel.h
similarity index 100%
rename from lib/librte_power/guest_channel.h
rename to lib/power/guest_channel.h
diff --git a/lib/librte_power/meson.build b/lib/power/meson.build
similarity index 100%
rename from lib/librte_power/meson.build
rename to lib/power/meson.build
diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
similarity index 100%
rename from lib/librte_power/power_acpi_cpufreq.c
rename to lib/power/power_acpi_cpufreq.c
diff --git a/lib/librte_power/power_acpi_cpufreq.h b/lib/power/power_acpi_cpufreq.h
similarity index 100%
rename from lib/librte_power/power_acpi_cpufreq.h
rename to lib/power/power_acpi_cpufreq.h
diff --git a/lib/librte_power/power_common.c b/lib/power/power_common.c
similarity index 100%
rename from lib/librte_power/power_common.c
rename to lib/power/power_common.c
diff --git a/lib/librte_power/power_common.h b/lib/power/power_common.h
similarity index 100%
rename from lib/librte_power/power_common.h
rename to lib/power/power_common.h
diff --git a/lib/librte_power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
similarity index 100%
rename from lib/librte_power/power_kvm_vm.c
rename to lib/power/power_kvm_vm.c
diff --git a/lib/librte_power/power_kvm_vm.h b/lib/power/power_kvm_vm.h
similarity index 100%
rename from lib/librte_power/power_kvm_vm.h
rename to lib/power/power_kvm_vm.h
diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c
similarity index 100%
rename from lib/librte_power/power_pstate_cpufreq.c
rename to lib/power/power_pstate_cpufreq.c
diff --git a/lib/librte_power/power_pstate_cpufreq.h b/lib/power/power_pstate_cpufreq.h
similarity index 100%
rename from lib/librte_power/power_pstate_cpufreq.h
rename to lib/power/power_pstate_cpufreq.h
diff --git a/lib/librte_power/rte_power.c b/lib/power/rte_power.c
similarity index 100%
rename from lib/librte_power/rte_power.c
rename to lib/power/rte_power.c
diff --git a/lib/librte_power/rte_power.h b/lib/power/rte_power.h
similarity index 100%
rename from lib/librte_power/rte_power.h
rename to lib/power/rte_power.h
diff --git a/lib/librte_power/rte_power_empty_poll.c b/lib/power/rte_power_empty_poll.c
similarity index 100%
rename from lib/librte_power/rte_power_empty_poll.c
rename to lib/power/rte_power_empty_poll.c
diff --git a/lib/librte_power/rte_power_empty_poll.h b/lib/power/rte_power_empty_poll.h
similarity index 100%
rename from lib/librte_power/rte_power_empty_poll.h
rename to lib/power/rte_power_empty_poll.h
diff --git a/lib/librte_power/rte_power_guest_channel.h b/lib/power/rte_power_guest_channel.h
similarity index 100%
rename from lib/librte_power/rte_power_guest_channel.h
rename to lib/power/rte_power_guest_channel.h
diff --git a/lib/librte_power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
similarity index 100%
rename from lib/librte_power/rte_power_pmd_mgmt.c
rename to lib/power/rte_power_pmd_mgmt.c
diff --git a/lib/librte_power/rte_power_pmd_mgmt.h b/lib/power/rte_power_pmd_mgmt.h
similarity index 100%
rename from lib/librte_power/rte_power_pmd_mgmt.h
rename to lib/power/rte_power_pmd_mgmt.h
diff --git a/lib/librte_power/version.map b/lib/power/version.map
similarity index 100%
rename from lib/librte_power/version.map
rename to lib/power/version.map
diff --git a/lib/librte_rawdev/meson.build b/lib/rawdev/meson.build
similarity index 100%
rename from lib/librte_rawdev/meson.build
rename to lib/rawdev/meson.build
diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev.c
rename to lib/rawdev/rte_rawdev.c
diff --git a/lib/librte_rawdev/rte_rawdev.h b/lib/rawdev/rte_rawdev.h
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev.h
rename to lib/rawdev/rte_rawdev.h
diff --git a/lib/librte_rawdev/rte_rawdev_pmd.h b/lib/rawdev/rte_rawdev_pmd.h
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev_pmd.h
rename to lib/rawdev/rte_rawdev_pmd.h
diff --git a/lib/librte_rawdev/version.map b/lib/rawdev/version.map
similarity index 100%
rename from lib/librte_rawdev/version.map
rename to lib/rawdev/version.map
diff --git a/lib/librte_rcu/meson.build b/lib/rcu/meson.build
similarity index 100%
rename from lib/librte_rcu/meson.build
rename to lib/rcu/meson.build
diff --git a/lib/librte_rcu/rcu_qsbr_pvt.h b/lib/rcu/rcu_qsbr_pvt.h
similarity index 100%
rename from lib/librte_rcu/rcu_qsbr_pvt.h
rename to lib/rcu/rcu_qsbr_pvt.h
diff --git a/lib/librte_rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
similarity index 100%
rename from lib/librte_rcu/rte_rcu_qsbr.c
rename to lib/rcu/rte_rcu_qsbr.c
diff --git a/lib/librte_rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
similarity index 100%
rename from lib/librte_rcu/rte_rcu_qsbr.h
rename to lib/rcu/rte_rcu_qsbr.h
diff --git a/lib/librte_rcu/version.map b/lib/rcu/version.map
similarity index 100%
rename from lib/librte_rcu/version.map
rename to lib/rcu/version.map
diff --git a/lib/librte_regexdev/meson.build b/lib/regexdev/meson.build
similarity index 100%
rename from lib/librte_regexdev/meson.build
rename to lib/regexdev/meson.build
diff --git a/lib/librte_regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev.c
rename to lib/regexdev/rte_regexdev.c
diff --git a/lib/librte_regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev.h
rename to lib/regexdev/rte_regexdev.h
diff --git a/lib/librte_regexdev/rte_regexdev_core.h b/lib/regexdev/rte_regexdev_core.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev_core.h
rename to lib/regexdev/rte_regexdev_core.h
diff --git a/lib/librte_regexdev/rte_regexdev_driver.h b/lib/regexdev/rte_regexdev_driver.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev_driver.h
rename to lib/regexdev/rte_regexdev_driver.h
diff --git a/lib/librte_regexdev/version.map b/lib/regexdev/version.map
similarity index 100%
rename from lib/librte_regexdev/version.map
rename to lib/regexdev/version.map
diff --git a/lib/librte_reorder/meson.build b/lib/reorder/meson.build
similarity index 100%
rename from lib/librte_reorder/meson.build
rename to lib/reorder/meson.build
diff --git a/lib/librte_reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
similarity index 100%
rename from lib/librte_reorder/rte_reorder.c
rename to lib/reorder/rte_reorder.c
diff --git a/lib/librte_reorder/rte_reorder.h b/lib/reorder/rte_reorder.h
similarity index 100%
rename from lib/librte_reorder/rte_reorder.h
rename to lib/reorder/rte_reorder.h
diff --git a/lib/librte_reorder/version.map b/lib/reorder/version.map
similarity index 100%
rename from lib/librte_reorder/version.map
rename to lib/reorder/version.map
diff --git a/lib/librte_rib/meson.build b/lib/rib/meson.build
similarity index 100%
rename from lib/librte_rib/meson.build
rename to lib/rib/meson.build
diff --git a/lib/librte_rib/rte_rib.c b/lib/rib/rte_rib.c
similarity index 100%
rename from lib/librte_rib/rte_rib.c
rename to lib/rib/rte_rib.c
diff --git a/lib/librte_rib/rte_rib.h b/lib/rib/rte_rib.h
similarity index 100%
rename from lib/librte_rib/rte_rib.h
rename to lib/rib/rte_rib.h
diff --git a/lib/librte_rib/rte_rib6.c b/lib/rib/rte_rib6.c
similarity index 100%
rename from lib/librte_rib/rte_rib6.c
rename to lib/rib/rte_rib6.c
diff --git a/lib/librte_rib/rte_rib6.h b/lib/rib/rte_rib6.h
similarity index 100%
rename from lib/librte_rib/rte_rib6.h
rename to lib/rib/rte_rib6.h
diff --git a/lib/librte_rib/version.map b/lib/rib/version.map
similarity index 100%
rename from lib/librte_rib/version.map
rename to lib/rib/version.map
diff --git a/lib/librte_ring/meson.build b/lib/ring/meson.build
similarity index 100%
rename from lib/librte_ring/meson.build
rename to lib/ring/meson.build
diff --git a/lib/librte_ring/rte_ring.c b/lib/ring/rte_ring.c
similarity index 100%
rename from lib/librte_ring/rte_ring.c
rename to lib/ring/rte_ring.c
diff --git a/lib/librte_ring/rte_ring.h b/lib/ring/rte_ring.h
similarity index 100%
rename from lib/librte_ring/rte_ring.h
rename to lib/ring/rte_ring.h
diff --git a/lib/librte_ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_c11_pvt.h
rename to lib/ring/rte_ring_c11_pvt.h
diff --git a/lib/librte_ring/rte_ring_core.h b/lib/ring/rte_ring_core.h
similarity index 100%
rename from lib/librte_ring/rte_ring_core.h
rename to lib/ring/rte_ring_core.h
diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/ring/rte_ring_elem.h
similarity index 100%
rename from lib/librte_ring/rte_ring_elem.h
rename to lib/ring/rte_ring_elem.h
diff --git a/lib/librte_ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_elem_pvt.h
rename to lib/ring/rte_ring_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_generic_pvt.h
rename to lib/ring/rte_ring_generic_pvt.h
diff --git a/lib/librte_ring/rte_ring_hts.h b/lib/ring/rte_ring_hts.h
similarity index 100%
rename from lib/librte_ring/rte_ring_hts.h
rename to lib/ring/rte_ring_hts.h
diff --git a/lib/librte_ring/rte_ring_hts_elem_pvt.h b/lib/ring/rte_ring_hts_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_hts_elem_pvt.h
rename to lib/ring/rte_ring_hts_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_peek.h b/lib/ring/rte_ring_peek.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek.h
rename to lib/ring/rte_ring_peek.h
diff --git a/lib/librte_ring/rte_ring_peek_elem_pvt.h b/lib/ring/rte_ring_peek_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek_elem_pvt.h
rename to lib/ring/rte_ring_peek_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_peek_zc.h b/lib/ring/rte_ring_peek_zc.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek_zc.h
rename to lib/ring/rte_ring_peek_zc.h
diff --git a/lib/librte_ring/rte_ring_rts.h b/lib/ring/rte_ring_rts.h
similarity index 100%
rename from lib/librte_ring/rte_ring_rts.h
rename to lib/ring/rte_ring_rts.h
diff --git a/lib/librte_ring/rte_ring_rts_elem_pvt.h b/lib/ring/rte_ring_rts_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_rts_elem_pvt.h
rename to lib/ring/rte_ring_rts_elem_pvt.h
diff --git a/lib/librte_ring/version.map b/lib/ring/version.map
similarity index 100%
rename from lib/librte_ring/version.map
rename to lib/ring/version.map
diff --git a/lib/librte_sched/meson.build b/lib/sched/meson.build
similarity index 100%
rename from lib/librte_sched/meson.build
rename to lib/sched/meson.build
diff --git a/lib/librte_sched/rte_approx.c b/lib/sched/rte_approx.c
similarity index 100%
rename from lib/librte_sched/rte_approx.c
rename to lib/sched/rte_approx.c
diff --git a/lib/librte_sched/rte_approx.h b/lib/sched/rte_approx.h
similarity index 100%
rename from lib/librte_sched/rte_approx.h
rename to lib/sched/rte_approx.h
diff --git a/lib/librte_sched/rte_red.c b/lib/sched/rte_red.c
similarity index 100%
rename from lib/librte_sched/rte_red.c
rename to lib/sched/rte_red.c
diff --git a/lib/librte_sched/rte_red.h b/lib/sched/rte_red.h
similarity index 100%
rename from lib/librte_sched/rte_red.h
rename to lib/sched/rte_red.h
diff --git a/lib/librte_sched/rte_sched.c b/lib/sched/rte_sched.c
similarity index 100%
rename from lib/librte_sched/rte_sched.c
rename to lib/sched/rte_sched.c
diff --git a/lib/librte_sched/rte_sched.h b/lib/sched/rte_sched.h
similarity index 100%
rename from lib/librte_sched/rte_sched.h
rename to lib/sched/rte_sched.h
diff --git a/lib/librte_sched/rte_sched_common.h b/lib/sched/rte_sched_common.h
similarity index 100%
rename from lib/librte_sched/rte_sched_common.h
rename to lib/sched/rte_sched_common.h
diff --git a/lib/librte_sched/version.map b/lib/sched/version.map
similarity index 100%
rename from lib/librte_sched/version.map
rename to lib/sched/version.map
diff --git a/lib/librte_security/meson.build b/lib/security/meson.build
similarity index 100%
rename from lib/librte_security/meson.build
rename to lib/security/meson.build
diff --git a/lib/librte_security/rte_security.c b/lib/security/rte_security.c
similarity index 100%
rename from lib/librte_security/rte_security.c
rename to lib/security/rte_security.c
diff --git a/lib/librte_security/rte_security.h b/lib/security/rte_security.h
similarity index 100%
rename from lib/librte_security/rte_security.h
rename to lib/security/rte_security.h
diff --git a/lib/librte_security/rte_security_driver.h b/lib/security/rte_security_driver.h
similarity index 100%
rename from lib/librte_security/rte_security_driver.h
rename to lib/security/rte_security_driver.h
diff --git a/lib/librte_security/version.map b/lib/security/version.map
similarity index 100%
rename from lib/librte_security/version.map
rename to lib/security/version.map
diff --git a/lib/librte_stack/meson.build b/lib/stack/meson.build
similarity index 100%
rename from lib/librte_stack/meson.build
rename to lib/stack/meson.build
diff --git a/lib/librte_stack/rte_stack.c b/lib/stack/rte_stack.c
similarity index 100%
rename from lib/librte_stack/rte_stack.c
rename to lib/stack/rte_stack.c
diff --git a/lib/librte_stack/rte_stack.h b/lib/stack/rte_stack.h
similarity index 100%
rename from lib/librte_stack/rte_stack.h
rename to lib/stack/rte_stack.h
diff --git a/lib/librte_stack/rte_stack_lf.c b/lib/stack/rte_stack_lf.c
similarity index 100%
rename from lib/librte_stack/rte_stack_lf.c
rename to lib/stack/rte_stack_lf.c
diff --git a/lib/librte_stack/rte_stack_lf.h b/lib/stack/rte_stack_lf.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf.h
rename to lib/stack/rte_stack_lf.h
diff --git a/lib/librte_stack/rte_stack_lf_c11.h b/lib/stack/rte_stack_lf_c11.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_c11.h
rename to lib/stack/rte_stack_lf_c11.h
diff --git a/lib/librte_stack/rte_stack_lf_generic.h b/lib/stack/rte_stack_lf_generic.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_generic.h
rename to lib/stack/rte_stack_lf_generic.h
diff --git a/lib/librte_stack/rte_stack_lf_stubs.h b/lib/stack/rte_stack_lf_stubs.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_stubs.h
rename to lib/stack/rte_stack_lf_stubs.h
diff --git a/lib/librte_stack/rte_stack_std.c b/lib/stack/rte_stack_std.c
similarity index 100%
rename from lib/librte_stack/rte_stack_std.c
rename to lib/stack/rte_stack_std.c
diff --git a/lib/librte_stack/rte_stack_std.h b/lib/stack/rte_stack_std.h
similarity index 100%
rename from lib/librte_stack/rte_stack_std.h
rename to lib/stack/rte_stack_std.h
diff --git a/lib/librte_stack/stack_pvt.h b/lib/stack/stack_pvt.h
similarity index 100%
rename from lib/librte_stack/stack_pvt.h
rename to lib/stack/stack_pvt.h
diff --git a/lib/librte_stack/version.map b/lib/stack/version.map
similarity index 100%
rename from lib/librte_stack/version.map
rename to lib/stack/version.map
diff --git a/lib/librte_table/meson.build b/lib/table/meson.build
similarity index 100%
rename from lib/librte_table/meson.build
rename to lib/table/meson.build
diff --git a/lib/librte_table/rte_lru.h b/lib/table/rte_lru.h
similarity index 100%
rename from lib/librte_table/rte_lru.h
rename to lib/table/rte_lru.h
diff --git a/lib/librte_table/rte_lru_arm64.h b/lib/table/rte_lru_arm64.h
similarity index 100%
rename from lib/librte_table/rte_lru_arm64.h
rename to lib/table/rte_lru_arm64.h
diff --git a/lib/librte_table/rte_lru_x86.h b/lib/table/rte_lru_x86.h
similarity index 100%
rename from lib/librte_table/rte_lru_x86.h
rename to lib/table/rte_lru_x86.h
diff --git a/lib/librte_table/rte_swx_table.h b/lib/table/rte_swx_table.h
similarity index 100%
rename from lib/librte_table/rte_swx_table.h
rename to lib/table/rte_swx_table.h
diff --git a/lib/librte_table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
similarity index 100%
rename from lib/librte_table/rte_swx_table_em.c
rename to lib/table/rte_swx_table_em.c
diff --git a/lib/librte_table/rte_swx_table_em.h b/lib/table/rte_swx_table_em.h
similarity index 100%
rename from lib/librte_table/rte_swx_table_em.h
rename to lib/table/rte_swx_table_em.h
diff --git a/lib/librte_table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
similarity index 100%
rename from lib/librte_table/rte_swx_table_wm.c
rename to lib/table/rte_swx_table_wm.c
diff --git a/lib/librte_table/rte_swx_table_wm.h b/lib/table/rte_swx_table_wm.h
similarity index 100%
rename from lib/librte_table/rte_swx_table_wm.h
rename to lib/table/rte_swx_table_wm.h
diff --git a/lib/librte_table/rte_table.h b/lib/table/rte_table.h
similarity index 100%
rename from lib/librte_table/rte_table.h
rename to lib/table/rte_table.h
diff --git a/lib/librte_table/rte_table_acl.c b/lib/table/rte_table_acl.c
similarity index 100%
rename from lib/librte_table/rte_table_acl.c
rename to lib/table/rte_table_acl.c
diff --git a/lib/librte_table/rte_table_acl.h b/lib/table/rte_table_acl.h
similarity index 100%
rename from lib/librte_table/rte_table_acl.h
rename to lib/table/rte_table_acl.h
diff --git a/lib/librte_table/rte_table_array.c b/lib/table/rte_table_array.c
similarity index 100%
rename from lib/librte_table/rte_table_array.c
rename to lib/table/rte_table_array.c
diff --git a/lib/librte_table/rte_table_array.h b/lib/table/rte_table_array.h
similarity index 100%
rename from lib/librte_table/rte_table_array.h
rename to lib/table/rte_table_array.h
diff --git a/lib/librte_table/rte_table_hash.h b/lib/table/rte_table_hash.h
similarity index 100%
rename from lib/librte_table/rte_table_hash.h
rename to lib/table/rte_table_hash.h
diff --git a/lib/librte_table/rte_table_hash_cuckoo.c b/lib/table/rte_table_hash_cuckoo.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_cuckoo.c
rename to lib/table/rte_table_hash_cuckoo.c
diff --git a/lib/librte_table/rte_table_hash_cuckoo.h b/lib/table/rte_table_hash_cuckoo.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_cuckoo.h
rename to lib/table/rte_table_hash_cuckoo.h
diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/table/rte_table_hash_ext.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_ext.c
rename to lib/table/rte_table_hash_ext.c
diff --git a/lib/librte_table/rte_table_hash_func.h b/lib/table/rte_table_hash_func.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_func.h
rename to lib/table/rte_table_hash_func.h
diff --git a/lib/librte_table/rte_table_hash_func_arm64.h b/lib/table/rte_table_hash_func_arm64.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_func_arm64.h
rename to lib/table/rte_table_hash_func_arm64.h
diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key16.c
rename to lib/table/rte_table_hash_key16.c
diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key32.c
rename to lib/table/rte_table_hash_key32.c
diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key8.c
rename to lib/table/rte_table_hash_key8.c
diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/table/rte_table_hash_lru.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_lru.c
rename to lib/table/rte_table_hash_lru.c
diff --git a/lib/librte_table/rte_table_lpm.c b/lib/table/rte_table_lpm.c
similarity index 100%
rename from lib/librte_table/rte_table_lpm.c
rename to lib/table/rte_table_lpm.c
diff --git a/lib/librte_table/rte_table_lpm.h b/lib/table/rte_table_lpm.h
similarity index 100%
rename from lib/librte_table/rte_table_lpm.h
rename to lib/table/rte_table_lpm.h
diff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/table/rte_table_lpm_ipv6.c
similarity index 100%
rename from lib/librte_table/rte_table_lpm_ipv6.c
rename to lib/table/rte_table_lpm_ipv6.c
diff --git a/lib/librte_table/rte_table_lpm_ipv6.h b/lib/table/rte_table_lpm_ipv6.h
similarity index 100%
rename from lib/librte_table/rte_table_lpm_ipv6.h
rename to lib/table/rte_table_lpm_ipv6.h
diff --git a/lib/librte_table/rte_table_stub.c b/lib/table/rte_table_stub.c
similarity index 100%
rename from lib/librte_table/rte_table_stub.c
rename to lib/table/rte_table_stub.c
diff --git a/lib/librte_table/rte_table_stub.h b/lib/table/rte_table_stub.h
similarity index 100%
rename from lib/librte_table/rte_table_stub.h
rename to lib/table/rte_table_stub.h
diff --git a/lib/librte_table/version.map b/lib/table/version.map
similarity index 100%
rename from lib/librte_table/version.map
rename to lib/table/version.map
diff --git a/lib/librte_telemetry/meson.build b/lib/telemetry/meson.build
similarity index 80%
rename from lib/librte_telemetry/meson.build
rename to lib/telemetry/meson.build
index 719973ff92..f84c9aa3be 100644
--- a/lib/librte_telemetry/meson.build
+++ b/lib/telemetry/meson.build
@@ -5,4 +5,4 @@ includes = [global_inc]
 
 sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c')
 headers = files('rte_telemetry.h')
-includes += include_directories('../librte_metrics')
+includes += include_directories('../metrics')
diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
similarity index 100%
rename from lib/librte_telemetry/rte_telemetry.h
rename to lib/telemetry/rte_telemetry.h
diff --git a/lib/librte_telemetry/telemetry.c b/lib/telemetry/telemetry.c
similarity index 100%
rename from lib/librte_telemetry/telemetry.c
rename to lib/telemetry/telemetry.c
diff --git a/lib/librte_telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c
similarity index 100%
rename from lib/librte_telemetry/telemetry_data.c
rename to lib/telemetry/telemetry_data.c
diff --git a/lib/librte_telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_data.h
rename to lib/telemetry/telemetry_data.h
diff --git a/lib/librte_telemetry/telemetry_internal.h b/lib/telemetry/telemetry_internal.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_internal.h
rename to lib/telemetry/telemetry_internal.h
diff --git a/lib/librte_telemetry/telemetry_json.h b/lib/telemetry/telemetry_json.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_json.h
rename to lib/telemetry/telemetry_json.h
diff --git a/lib/librte_telemetry/telemetry_legacy.c b/lib/telemetry/telemetry_legacy.c
similarity index 100%
rename from lib/librte_telemetry/telemetry_legacy.c
rename to lib/telemetry/telemetry_legacy.c
diff --git a/lib/librte_telemetry/version.map b/lib/telemetry/version.map
similarity index 100%
rename from lib/librte_telemetry/version.map
rename to lib/telemetry/version.map
diff --git a/lib/librte_timer/meson.build b/lib/timer/meson.build
similarity index 100%
rename from lib/librte_timer/meson.build
rename to lib/timer/meson.build
diff --git a/lib/librte_timer/rte_timer.c b/lib/timer/rte_timer.c
similarity index 100%
rename from lib/librte_timer/rte_timer.c
rename to lib/timer/rte_timer.c
diff --git a/lib/librte_timer/rte_timer.h b/lib/timer/rte_timer.h
similarity index 100%
rename from lib/librte_timer/rte_timer.h
rename to lib/timer/rte_timer.h
diff --git a/lib/librte_timer/version.map b/lib/timer/version.map
similarity index 100%
rename from lib/librte_timer/version.map
rename to lib/timer/version.map
diff --git a/lib/librte_vhost/fd_man.c b/lib/vhost/fd_man.c
similarity index 100%
rename from lib/librte_vhost/fd_man.c
rename to lib/vhost/fd_man.c
diff --git a/lib/librte_vhost/fd_man.h b/lib/vhost/fd_man.h
similarity index 100%
rename from lib/librte_vhost/fd_man.h
rename to lib/vhost/fd_man.h
diff --git a/lib/librte_vhost/iotlb.c b/lib/vhost/iotlb.c
similarity index 100%
rename from lib/librte_vhost/iotlb.c
rename to lib/vhost/iotlb.c
diff --git a/lib/librte_vhost/iotlb.h b/lib/vhost/iotlb.h
similarity index 100%
rename from lib/librte_vhost/iotlb.h
rename to lib/vhost/iotlb.h
diff --git a/lib/librte_vhost/meson.build b/lib/vhost/meson.build
similarity index 100%
rename from lib/librte_vhost/meson.build
rename to lib/vhost/meson.build
diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/vhost/rte_vdpa.h
similarity index 100%
rename from lib/librte_vhost/rte_vdpa.h
rename to lib/vhost/rte_vdpa.h
diff --git a/lib/librte_vhost/rte_vdpa_dev.h b/lib/vhost/rte_vdpa_dev.h
similarity index 100%
rename from lib/librte_vhost/rte_vdpa_dev.h
rename to lib/vhost/rte_vdpa_dev.h
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/vhost/rte_vhost.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost.h
rename to lib/vhost/rte_vhost.h
diff --git a/lib/librte_vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost_async.h
rename to lib/vhost/rte_vhost_async.h
diff --git a/lib/librte_vhost/rte_vhost_crypto.h b/lib/vhost/rte_vhost_crypto.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost_crypto.h
rename to lib/vhost/rte_vhost_crypto.h
diff --git a/lib/librte_vhost/socket.c b/lib/vhost/socket.c
similarity index 100%
rename from lib/librte_vhost/socket.c
rename to lib/vhost/socket.c
diff --git a/lib/librte_vhost/vdpa.c b/lib/vhost/vdpa.c
similarity index 100%
rename from lib/librte_vhost/vdpa.c
rename to lib/vhost/vdpa.c
diff --git a/lib/librte_vhost/version.map b/lib/vhost/version.map
similarity index 100%
rename from lib/librte_vhost/version.map
rename to lib/vhost/version.map
diff --git a/lib/librte_vhost/vhost.c b/lib/vhost/vhost.c
similarity index 100%
rename from lib/librte_vhost/vhost.c
rename to lib/vhost/vhost.c
diff --git a/lib/librte_vhost/vhost.h b/lib/vhost/vhost.h
similarity index 100%
rename from lib/librte_vhost/vhost.h
rename to lib/vhost/vhost.h
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
similarity index 100%
rename from lib/librte_vhost/vhost_crypto.c
rename to lib/vhost/vhost_crypto.c
diff --git a/lib/librte_vhost/vhost_user.c b/lib/vhost/vhost_user.c
similarity index 100%
rename from lib/librte_vhost/vhost_user.c
rename to lib/vhost/vhost_user.c
diff --git a/lib/librte_vhost/vhost_user.h b/lib/vhost/vhost_user.h
similarity index 100%
rename from lib/librte_vhost/vhost_user.h
rename to lib/vhost/vhost_user.h
diff --git a/lib/librte_vhost/virtio_crypto.h b/lib/vhost/virtio_crypto.h
similarity index 100%
rename from lib/librte_vhost/virtio_crypto.h
rename to lib/vhost/virtio_crypto.h
diff --git a/lib/librte_vhost/virtio_net.c b/lib/vhost/virtio_net.c
similarity index 100%
rename from lib/librte_vhost/virtio_net.c
rename to lib/vhost/virtio_net.c
diff --git a/license/exceptions.txt b/license/exceptions.txt
index 636c69b9bf..1bd4dbf8f7 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -12,8 +12,8 @@ Note that following licenses are not exceptions:-
 ---------------------------------------------------------------------------------------------------
 SPDX Identifier     TB Approval Date  GB Approval Date  File name
 ---------------------------------------------------------------------------------------------------
-1.MIT               10/23/2019        02/10/2020        lib/librte_eal/windows/include/dirent.h
-2.BSD-2-Clause      10/23/2019        12/18/2019        lib/librte_eal/windows/include/getopt.h
+1.MIT               10/23/2019        02/10/2020        lib/eal/windows/include/dirent.h
+2.BSD-2-Clause      10/23/2019        12/18/2019        lib/eal/windows/include/getopt.h
 3.ISC AND
-  BSD-2-Clause      10/23/2019        12/18/2019        lib/librte_eal/windows/getopt.c
+  BSD-2-Clause      10/23/2019        12/18/2019        lib/eal/windows/getopt.c
 ---------------------------------------------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 30b5a43794..882aaf4211 100644
--- a/meson.build
+++ b/meson.build
@@ -36,9 +36,9 @@ endif
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
 global_inc = include_directories('.', 'config',
-    'lib/librte_eal/include',
-    'lib/librte_eal/@0@/include'.format(host_machine.system()),
-    'lib/librte_eal/@0@/include'.format(arch_subdir),
+    'lib/eal/include',
+    'lib/eal/@0@/include'.format(host_machine.system()),
+    'lib/eal/@0@/include'.format(arch_subdir),
 )
 
 # do configuration and get tool paths
-- 
2.27.0

Re: [dpdk-dev] [RFC PATCH 13/14] lib: remove librte_ prefix from directory names

[Thomas Monjalon]

01/04/2021 13:50, Bruce Richardson:
> There is no reason for the DPDK libraries to all have 'librte_' prefix on
> the directory names. This prefix makes the directory names longer and also
> makes it awkward to add features referring to individual libraries in the
> build - should the lib names be specified with or without the prefix.
> Therefore, we can just remove the library prefix and use the library's
> unique name as the directory name, i.e. 'eal' rather than 'librte_eal'

I agree and I wanted to do that for long, but never proposed.
There are 2 drawbacks:
	- git history (fixed by ignore-rev file as Lucas proposed)
	- backport

I think we need to propose a script in devtools to convert some patches
for backport, given the targetted version.

[dpdk-dev] [RFC PATCH 14/14] lib: allow disabling optional libraries

[Bruce Richardson]

Add support for the disable_libs option, to allow disabling the build of
particular libraries. As part of this, maintain a list of what libraries
can safely be disabled, without breaking the build - for now this list is
solely those libraries which are not built on FreeBSD, kni, power and
vhost. This list can be expanded by future patches.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build   | 24 +++++++++++++++++++++++-
 meson_options.txt |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/meson.build b/lib/meson.build
index dc236c06de..aedc345c7f 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -49,6 +49,23 @@ if is_windows
     ] # only supported libraries for windows
 endif
 
+optional_libs = [
+    'kni',
+    'power',
+    'vhost',
+]
+
+disabled_libs = []
+opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs')).stdout().split()
+foreach l:opt_disabled_libs
+    if not optional_libs.contains(l)
+        warning('Cannot disable mandatory library "@0@"'.format(l))
+        continue
+    endif
+    disabled_libs += l
+endforeach
+
+
 default_cflags = machine_args
 default_cflags += ['-DALLOW_EXPERIMENTAL_API']
 default_cflags += ['-DALLOW_INTERNAL_API']
@@ -81,7 +98,12 @@ foreach l:libraries
         deps += ['eal']
     endif
 
-    subdir(l)
+    if disabled_libs.contains(l)
+        build = false
+        reason = 'explicitly disabled via build config'
+    else
+        subdir(l)
+    endif
     if name != l
         warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
     endif
diff --git a/meson_options.txt b/meson_options.txt
index f22db9fb7d..4a9d41127d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,6 +4,8 @@ option('check_includes', type: 'boolean', value: false,
     description: 'build "chkincs" to verify each header file can compile alone')
 option('disable_drivers', type: 'string', value: '',
     description: 'Comma-separated list of drivers to explicitly disable.')
+option('disable_libs', type: 'string', value: '',
+    description: 'Comma-separated list of libraries to explicitly disable. [NOTE: not all libs can be disabled]')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
     description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
 option('enable_docs', type: 'boolean', value: false,
-- 
2.27.0

Re: [dpdk-dev] [RFC PATCH 00/14] Build file update proposals

[Andrew Rybchenko]

On 4/1/21 2:49 PM, Bruce Richardson wrote:
> This RFC contains 5 changes/updates to the DPDK build and build files. These
> updates all assume that the minimum version for DPDK has increased to at least
> meson 0.49 as proposed in [1].
> 
> The changes in this set are:
> 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
>    in the foreach loops when building library or driver components.
> 2. For libraries, drop support for header-only libraries, which was added just
>    for the "compat" lib which had a single header, and is now part of EAL. This
>    similarly reduces indentation levels and makes the code easier to follow
> 3. Since the larger blocks of meson code in our repo is seeing massive
>    whitespace changes, take the opportunity to switch our indentation style for
>    meson files from that of C-files using tabs, to Meson/Python style using
>    spaces. [More below on this for discussion]
> 4. Remove the "librte_" prefix from all our library directories. While as useful
>    cleanup, the main driver for this was that it simplifies the matching for #5
>    below.
> 5. Add a "disable_libs" build option to allow the user to optionally not build
>    certain components. Include in this an explicit list of libraries which are
>    "known safe" to disable in the build. For now this is a short list of three
>    libs, all of which are safe because they are not buildable on FreeBSD. More
>    work is needed to expand this list in future.
> 
> Of these changes, I expect #3 to be most controversial. The initial
> implementation of meson build for DPDK should have originally been done using
> the correct meson style using spaces[2], but sadly it was not done that way. If
> we are to ever change, I believe it should be now while other rework such as
> this is being done. Here are the arguments for/against, as I see them.
> 
> Reasons to change:
> * Align with official meson style, used on other projects
> * Reduce indentation levels in code. NOTE: While not normally a consideration in
>   programming, this is a possible issue with meson compared to C or Python,
>   because we cannot create separate functions to move inner loops to lower
>   indentation levels.
> * It's probably now or never.

+1 and I think it is better to do it now, not never

> Reasons not to change:
> * Outstanding patches for meson would need respin
> * More work involved in backports - though with the more complicated meson
>   blocks changing whitespace levels anyway due to #1 and #2 above, it's probably
>   no more difficult than it would otherwise be. The extra changes to e.g. list
>   indentation, require work to adjust whitespace, but are trivial to fix.
> * Code churn
> 
> Feedback on these patches and proposed changes welcome, as always.
> 
> [1] http://patches.dpdk.org/project/dpdk/list/?series=15827
> [2] https://mesonbuild.com/Style-guide.html#tabs-or-spaces

Re: [dpdk-dev] [RFC PATCH 00/14] Build file update proposals

[Luca Boccassi]

On Thu, 2021-04-01 at 15:27 +0300, Andrew Rybchenko wrote:
> On 4/1/21 2:49 PM, Bruce Richardson wrote:
> > This RFC contains 5 changes/updates to the DPDK build and build files. These
> > updates all assume that the minimum version for DPDK has increased to at least
> > meson 0.49 as proposed in [1].
> > 
> > The changes in this set are:
> > 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
> >    in the foreach loops when building library or driver components.
> > 2. For libraries, drop support for header-only libraries, which was added just
> >    for the "compat" lib which had a single header, and is now part of EAL. This
> >    similarly reduces indentation levels and makes the code easier to follow
> > 3. Since the larger blocks of meson code in our repo is seeing massive
> >    whitespace changes, take the opportunity to switch our indentation style for
> >    meson files from that of C-files using tabs, to Meson/Python style using
> >    spaces. [More below on this for discussion]
> > 4. Remove the "librte_" prefix from all our library directories. While as useful
> >    cleanup, the main driver for this was that it simplifies the matching for #5
> >    below.
> > 5. Add a "disable_libs" build option to allow the user to optionally not build
> >    certain components. Include in this an explicit list of libraries which are
> >    "known safe" to disable in the build. For now this is a short list of three
> >    libs, all of which are safe because they are not buildable on FreeBSD. More
> >    work is needed to expand this list in future.
> > 
> > Of these changes, I expect #3 to be most controversial. The initial
> > implementation of meson build for DPDK should have originally been done using
> > the correct meson style using spaces[2], but sadly it was not done that way. If
> > we are to ever change, I believe it should be now while other rework such as
> > this is being done. Here are the arguments for/against, as I see them.
> > 
> > Reasons to change:
> > * Align with official meson style, used on other projects
> > * Reduce indentation levels in code. NOTE: While not normally a consideration in
> >   programming, this is a possible issue with meson compared to C or Python,
> >   because we cannot create separate functions to move inner loops to lower
> >   indentation levels.
> > * It's probably now or never.
> 
> +1 and I think it is better to do it now, not never

+1, with the addendum that we should add an ignore-rev file so that git
blame keeps working (needs to be done after merge, for the commit
hash):

https://www.moxio.com/blog/43/ignoring-bulk-change-commits-with-git-blame

-- 
Kind regards,
Luca Boccassi

Re: [dpdk-dev] [RFC PATCH 00/14] Build file update proposals

[Thomas Monjalon]

01/04/2021 13:49, Bruce Richardson:
> This RFC contains 5 changes/updates to the DPDK build and build files. These
> updates all assume that the minimum version for DPDK has increased to at least
> meson 0.49 as proposed in [1].
> 
> The changes in this set are:
> 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
>    in the foreach loops when building library or driver components.
> 2. For libraries, drop support for header-only libraries, which was added just
>    for the "compat" lib which had a single header, and is now part of EAL. This
>    similarly reduces indentation levels and makes the code easier to follow
> 3. Since the larger blocks of meson code in our repo is seeing massive
>    whitespace changes, take the opportunity to switch our indentation style for
>    meson files from that of C-files using tabs, to Meson/Python style using
>    spaces. [More below on this for discussion]
> 4. Remove the "librte_" prefix from all our library directories. While as useful
>    cleanup, the main driver for this was that it simplifies the matching for #5
>    below.
> 5. Add a "disable_libs" build option to allow the user to optionally not build
>    certain components. Include in this an explicit list of libraries which are
>    "known safe" to disable in the build. For now this is a short list of three
>    libs, all of which are safe because they are not buildable on FreeBSD. More
>    work is needed to expand this list in future.
> 
> Of these changes, I expect #3 to be most controversial.

Did you choose April 1st on purpose?

Re: [dpdk-dev] [RFC PATCH 00/14] Build file update proposals

[Bruce Richardson]

On Thu, Apr 01, 2021 at 03:36:39PM +0200, Thomas Monjalon wrote:
> 01/04/2021 13:49, Bruce Richardson:
> > This RFC contains 5 changes/updates to the DPDK build and build files. These
> > updates all assume that the minimum version for DPDK has increased to at least
> > meson 0.49 as proposed in [1].
> > 
> > The changes in this set are:
> > 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
> >    in the foreach loops when building library or driver components.
> > 2. For libraries, drop support for header-only libraries, which was added just
> >    for the "compat" lib which had a single header, and is now part of EAL. This
> >    similarly reduces indentation levels and makes the code easier to follow
> > 3. Since the larger blocks of meson code in our repo is seeing massive
> >    whitespace changes, take the opportunity to switch our indentation style for
> >    meson files from that of C-files using tabs, to Meson/Python style using
> >    spaces. [More below on this for discussion]
> > 4. Remove the "librte_" prefix from all our library directories. While as useful
> >    cleanup, the main driver for this was that it simplifies the matching for #5
> >    below.
> > 5. Add a "disable_libs" build option to allow the user to optionally not build
> >    certain components. Include in this an explicit list of libraries which are
> >    "known safe" to disable in the build. For now this is a short list of three
> >    libs, all of which are safe because they are not buildable on FreeBSD. More
> >    work is needed to expand this list in future.
> > 
> > Of these changes, I expect #3 to be most controversial.
> 
> Did you choose April 1st on purpose?
> 
It kinda just happened that way. This patchset has been in the works for
some time, but never got to an RFC point before now. And what with more
serious things, I never got the opportunity to prepare a *proper* April 1st
patchset. :-)

[dpdk-dev] [PATCH 00/14] Build file updates

[Bruce Richardson]

This RFC contains 5 changes/updates to the DPDK build and build files.

The changes in this set are:
1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
   in the foreach loops when building library or driver components.
2. For libraries, drop support for header-only libraries, which was added just
   for the "compat" lib which had a single header, and is now part of EAL. This
   similarly reduces indentation levels and makes the code easier to follow
3. Since the larger blocks of meson code in our repo is seeing massive
   whitespace changes, take the opportunity to switch our indentation style for
   meson files from that of C-files using tabs, to Meson/Python style using
   spaces. [More below on this for discussion]
4. Remove the "librte_" prefix from all our library directories. While as useful
   cleanup, the main driver for this was that it simplifies the matching for #5
   below.
5. Add a "disable_libs" build option to allow the user to optionally not build
   certain components. Include in this an explicit list of libraries which are
   "known safe" to disable in the build. For now this is a short list of three
   libs, all of which are safe because they are not buildable on FreeBSD. More
   work is needed to expand this list in future.

Of these changes, I expect #3 to be most controversial. The initial
implementation of meson build for DPDK should have originally been done using
the correct meson style using spaces[1], but sadly it was not done that way. If
we are to ever change, I believe it should be now while other rework such as
this is being done. Here are the arguments for/against, as I see them.

Reasons to change:
* Align with official meson style, used on other projects
* Reduce indentation levels in code. NOTE: While not normally a consideration in
  programming, this is a possible issue with meson compared to C or Python,
  because we cannot create separate functions to move inner loops to lower
  indentation levels.
* It's probably now or never.

Reasons not to change:
* Outstanding patches for meson would need respin
* More work involved in backports - though with the more complicated meson
  blocks changing whitespace levels anyway due to #1 and #2 above, it's probably
  no more difficult than it would otherwise be. The extra changes to e.g. list
  indentation, require work to adjust whitespace, but are trivial to fix.
* Code churn

Feedback on these patches and proposed changes welcome, as always.

[1] https://mesonbuild.com/Style-guide.html#tabs-or-spaces

RFC -> V1:
* rebased to current main branch
* performed cleanup on many meson.build files to ensure correct formatting of
  lists:
   * split lists with >3 or >4 entries to be one per line
   * first entry on own line
   * last entry on own line with ","
   * closing braces dedented to original indent level
   * alphabetical ordering
  Files in "lib" folder should be mostly ok now - files in the drivers
  directory have not been done to the same level, as there are so many of
  them to work on.
* other general whitespace changes, including merging lines where possible,
  since indent levels are reduced


Bruce Richardson (14):
  build: simplify library build file
  build: tidy up list of libraries to build
  build: simplify the driver build configuration file
  build: clean up driver lists
  build: reduce indentation in app build spec
  build: reduce indentation in examples build spec
  build: change infrastructure file tabs to spaces
  lib: cleanup whitespace in meson build files
  drivers: change meson file tabs to spaces
  examples: change meson file tabs to spaces
  app: change meson file tabs to spaces
  editorconfig: add entry for meson files
  lib: remove librte_ prefix from directory names
  lib: allow disabling optional libraries

 .editorconfig                                 |   5 +
 MAINTAINERS                                   | 210 +++---
 app/meson.build                               | 101 +--
 app/test-bbdev/meson.build                    |  12 +-
 app/test-compress-perf/meson.build            |  10 +-
 app/test-crypto-perf/meson.build              |  20 +-
 app/test-eventdev/meson.build                 |  24 +-
 app/test-flow-perf/meson.build                |   8 +-
 app/test-pipeline/meson.build                 |  18 +-
 app/test-pmd/meson.build                      |  60 +-
 app/test/meson.build                          | 530 +++++++--------
 app/test/test_eal_fs.c                        |   2 +-
 app/test/test_memzone.c                       |   2 +-
 app/test/test_telemetry_json.c                |   2 +-
 buildtools/chkincs/meson.build                |  24 +-
 buildtools/meson.build                        |  34 +-
 buildtools/pkg-config/meson.build             |  34 +-
 config/arm/meson.build                        | 630 +++++++++---------
 config/meson.build                            | 286 ++++----
 config/ppc/meson.build                        |   8 +-
 config/x86/meson.build                        |  64 +-
 devtools/build-tags.sh                        |  14 +-
 doc/api/doxy-api.conf.in                      | 104 +--
 doc/api/meson.build                           |  36 +-
 doc/guides/contributing/abi_versioning.rst    |  12 +-
 doc/guides/contributing/coding_style.rst      |   4 +-
 doc/guides/contributing/documentation.rst     |  10 +-
 doc/guides/meson.build                        |  25 +-
 doc/guides/prog_guide/event_timer_adapter.rst |   2 +-
 doc/guides/prog_guide/qos_framework.rst       |   4 +-
 doc/guides/prog_guide/rawdev.rst              |   2 +-
 doc/guides/rel_notes/known_issues.rst         |   2 +-
 doc/meson.build                               |   6 +-
 drivers/baseband/meson.build                  |  10 +-
 drivers/baseband/turbo_sw/meson.build         |  46 +-
 drivers/bus/dpaa/meson.build                  |  28 +-
 drivers/bus/fslmc/meson.build                 |  30 +-
 drivers/bus/ifpga/meson.build                 |   6 +-
 drivers/bus/meson.build                       |   9 +-
 drivers/bus/pci/meson.build                   |  24 +-
 drivers/bus/vdev/meson.build                  |   2 +-
 drivers/bus/vmbus/meson.build                 |  22 +-
 drivers/common/cpt/meson.build                |   9 +-
 drivers/common/dpaax/meson.build              |   8 +-
 drivers/common/meson.build                    |   9 +-
 drivers/common/mlx5/linux/meson.build         | 349 +++++-----
 drivers/common/mlx5/meson.build               |  40 +-
 drivers/common/mlx5/windows/meson.build       |  30 +-
 drivers/common/mvep/meson.build               |   6 +-
 drivers/common/octeontx2/meson.build          |  29 +-
 drivers/common/qat/meson.build                |  71 +-
 drivers/common/sfc_efx/base/meson.build       | 142 ++--
 drivers/common/sfc_efx/meson.build            |  24 +-
 drivers/compress/isal/meson.build             |   4 +-
 drivers/compress/meson.build                  |   9 +-
 drivers/compress/mlx5/meson.build             |  24 +-
 drivers/compress/zlib/meson.build             |   4 +-
 drivers/crypto/aesni_gcm/meson.build          |  22 +-
 drivers/crypto/aesni_mb/meson.build           |  22 +-
 drivers/crypto/armv8/meson.build              |   6 +-
 drivers/crypto/bcmfs/meson.build              |  26 +-
 drivers/crypto/caam_jr/meson.build            |  10 +-
 drivers/crypto/ccp/meson.build                |  16 +-
 drivers/crypto/dpaa2_sec/meson.build          |   6 +-
 drivers/crypto/dpaa_sec/meson.build           |   4 +-
 drivers/crypto/kasumi/meson.build             |  20 +-
 drivers/crypto/meson.build                    |  42 +-
 drivers/crypto/mvsam/meson.build              |   6 +-
 drivers/crypto/nitrox/meson.build             |  20 +-
 drivers/crypto/octeontx/meson.build           |  12 +-
 drivers/crypto/octeontx2/meson.build          |  16 +-
 drivers/crypto/openssl/meson.build            |   4 +-
 drivers/crypto/qat/meson.build                |  20 +-
 drivers/crypto/scheduler/meson.build          |  18 +-
 drivers/crypto/snow3g/meson.build             |  18 +-
 drivers/crypto/virtio/meson.build             |   4 +-
 drivers/crypto/zuc/meson.build                |  20 +-
 drivers/event/dlb2/meson.build                |  14 +-
 drivers/event/dpaa/meson.build                |   4 +-
 drivers/event/dpaa2/meson.build               |   8 +-
 drivers/event/dsw/meson.build                 |   2 +-
 drivers/event/meson.build                     |  18 +-
 drivers/event/octeontx/meson.build            |  12 +-
 drivers/event/octeontx2/meson.build           |  24 +-
 drivers/event/opdl/meson.build                |  10 +-
 drivers/event/sw/meson.build                  |   8 +-
 drivers/mempool/bucket/meson.build            |   4 +-
 drivers/mempool/dpaa/meson.build              |   4 +-
 drivers/mempool/dpaa2/meson.build             |   4 +-
 drivers/mempool/meson.build                   |  12 +-
 drivers/mempool/octeontx/meson.build          |   6 +-
 drivers/mempool/octeontx2/meson.build         |  20 +-
 drivers/mempool/stack/meson.build             |   4 +-
 drivers/meson.build                           | 422 ++++++------
 drivers/net/af_packet/meson.build             |   4 +-
 drivers/net/af_xdp/meson.build                |  24 +-
 drivers/net/ark/meson.build                   |  28 +-
 drivers/net/atlantic/meson.build              |  22 +-
 drivers/net/avp/meson.build                   |   4 +-
 drivers/net/axgbe/meson.build                 |  16 +-
 drivers/net/bnx2x/meson.build                 |  18 +-
 drivers/net/bnxt/meson.build                  | 124 ++--
 drivers/net/bonding/meson.build               |   8 +-
 drivers/net/cxgbe/meson.build                 |  30 +-
 drivers/net/dpaa/meson.build                  |  16 +-
 drivers/net/dpaa2/meson.build                 |  26 +-
 drivers/net/e1000/base/meson.build            |  50 +-
 drivers/net/e1000/meson.build                 |  20 +-
 drivers/net/ena/meson.build                   |  10 +-
 drivers/net/enetc/meson.build                 |   6 +-
 drivers/net/enic/meson.build                  |  46 +-
 drivers/net/failsafe/meson.build              |  24 +-
 drivers/net/fm10k/base/meson.build            |  28 +-
 drivers/net/fm10k/meson.build                 |  12 +-
 drivers/net/hinic/base/meson.build            |  26 +-
 drivers/net/hinic/meson.build                 |  16 +-
 drivers/net/hns3/meson.build                  |  52 +-
 drivers/net/i40e/base/meson.build             |  32 +-
 drivers/net/i40e/meson.build                  | 110 +--
 drivers/net/iavf/meson.build                  |  94 +--
 drivers/net/ice/base/meson.build              |  45 +-
 drivers/net/ice/meson.build                   | 102 +--
 drivers/net/igc/base/meson.build              |  20 +-
 drivers/net/igc/meson.build                   |  16 +-
 drivers/net/ionic/meson.build                 |  20 +-
 drivers/net/ipn3ke/meson.build                |  18 +-
 drivers/net/ixgbe/base/meson.build            |  42 +-
 drivers/net/ixgbe/meson.build                 |  32 +-
 drivers/net/kni/meson.build                   |   6 +-
 drivers/net/liquidio/meson.build              |  12 +-
 drivers/net/memif/meson.build                 |   6 +-
 drivers/net/meson.build                       | 108 +--
 drivers/net/mlx4/meson.build                  | 160 ++---
 drivers/net/mlx5/linux/meson.build            |  14 +-
 drivers/net/mlx5/meson.build                  |  78 +--
 drivers/net/mlx5/windows/meson.build          |  10 +-
 drivers/net/mvneta/meson.build                |  16 +-
 drivers/net/mvpp2/meson.build                 |  22 +-
 drivers/net/netvsc/meson.build                |   6 +-
 drivers/net/nfb/meson.build                   |   6 +-
 drivers/net/nfp/meson.build                   |  28 +-
 drivers/net/null/meson.build                  |   6 +-
 drivers/net/octeontx/base/meson.build         |  18 +-
 drivers/net/octeontx/meson.build              |  12 +-
 drivers/net/octeontx2/meson.build             |  62 +-
 drivers/net/pcap/meson.build                  |  10 +-
 drivers/net/pfe/meson.build                   |  12 +-
 drivers/net/qede/base/meson.build             |  78 +--
 drivers/net/qede/meson.build                  |  22 +-
 drivers/net/ring/meson.build                  |   6 +-
 drivers/net/sfc/meson.build                   |  64 +-
 drivers/net/softnic/meson.build               |  32 +-
 drivers/net/szedata2/meson.build              |   6 +-
 drivers/net/tap/meson.build                   |  42 +-
 drivers/net/thunderx/base/meson.build         |  10 +-
 drivers/net/thunderx/meson.build              |  14 +-
 drivers/net/txgbe/base/meson.build            |  26 +-
 drivers/net/txgbe/meson.build                 |  24 +-
 drivers/net/vdev_netvsc/meson.build           |   4 +-
 drivers/net/vhost/meson.build                 |   6 +-
 drivers/net/virtio/meson.build                |  78 +--
 drivers/net/vmxnet3/meson.build               |  10 +-
 drivers/raw/ifpga/base/meson.build            |  54 +-
 drivers/raw/ifpga/meson.build                 |   8 +-
 drivers/raw/ioat/meson.build                  |  18 +-
 drivers/raw/meson.build                       |  17 +-
 drivers/raw/ntb/meson.build                   |   2 +-
 drivers/raw/octeontx2_dma/meson.build         |   8 +-
 drivers/raw/octeontx2_ep/meson.build          |   6 +-
 drivers/regex/meson.build                     |   5 +-
 drivers/regex/mlx5/meson.build                |  32 +-
 drivers/regex/octeontx2/meson.build           |  22 +-
 drivers/vdpa/meson.build                      |   8 +-
 drivers/vdpa/mlx5/meson.build                 |  38 +-
 examples/bbdev_app/meson.build                |   2 +-
 examples/bond/meson.build                     |   2 +-
 examples/cmdline/meson.build                  |   2 +-
 examples/distributor/meson.build              |   4 +-
 examples/ethtool/meson.build                  |   8 +-
 examples/eventdev_pipeline/meson.build        |   6 +-
 examples/fips_validation/meson.build          |  22 +-
 examples/flow_classify/meson.build            |   2 +-
 examples/flow_filtering/meson.build           |   2 +-
 examples/helloworld/meson.build               |   2 +-
 examples/ioat/meson.build                     |   4 +-
 examples/ip_fragmentation/meson.build         |   2 +-
 examples/ip_pipeline/meson.build              |  30 +-
 examples/ip_reassembly/meson.build            |   2 +-
 examples/ipsec-secgw/meson.build              |  26 +-
 examples/ipv4_multicast/meson.build           |   2 +-
 examples/kni/meson.build                      |   4 +-
 examples/l2fwd-cat/meson.build                |   4 +-
 examples/l2fwd-crypto/meson.build             |   4 +-
 examples/l2fwd-event/meson.build              |  12 +-
 examples/l2fwd-jobstats/meson.build           |   2 +-
 examples/l2fwd-keepalive/meson.build          |   6 +-
 examples/l2fwd/meson.build                    |   2 +-
 examples/l3fwd-acl/meson.build                |   2 +-
 examples/l3fwd-graph/meson.build              |   2 +-
 examples/l3fwd-power/meson.build              |   2 +-
 examples/l3fwd/meson.build                    |   4 +-
 examples/link_status_interrupt/meson.build    |   2 +-
 examples/meson.build                          | 177 ++---
 .../client_server_mp/mp_client/meson.build    |   2 +-
 .../client_server_mp/mp_server/meson.build    |   2 +-
 examples/multi_process/hotplug_mp/meson.build |   2 +-
 examples/multi_process/simple_mp/meson.build  |   2 +-
 .../multi_process/symmetric_mp/meson.build    |   2 +-
 examples/ntb/meson.build                      |   8 +-
 examples/packet_ordering/meson.build          |   2 +-
 .../l3fwd-thread/meson.build                  |  20 +-
 .../pthread_shim/meson.build                  |  22 +-
 examples/pipeline/meson.build                 |  12 +-
 examples/ptpclient/meson.build                |   2 +-
 examples/qos_meter/meson.build                |   2 +-
 examples/qos_sched/meson.build                |   4 +-
 examples/rxtx_callbacks/meson.build           |   2 +-
 examples/service_cores/meson.build            |   2 +-
 examples/skeleton/meson.build                 |   2 +-
 examples/timer/meson.build                    |   2 +-
 examples/vdpa/meson.build                     |   6 +-
 examples/vhost/meson.build                    |  10 +-
 examples/vhost_blk/meson.build                |  10 +-
 examples/vhost_crypto/meson.build             |   4 +-
 .../vm_power_manager/guest_cli/meson.build    |   2 +-
 examples/vm_power_manager/meson.build         |  20 +-
 examples/vmdq/meson.build                     |   2 +-
 examples/vmdq_dcb/meson.build                 |   2 +-
 kernel/freebsd/meson.build                    |  32 +-
 kernel/linux/kni/meson.build                  |  41 +-
 kernel/linux/meson.build                      | 111 ++-
 lib/{librte_acl => acl}/acl.h                 |   0
 lib/{librte_acl => acl}/acl_bld.c             |   0
 lib/{librte_acl => acl}/acl_gen.c             |   0
 lib/{librte_acl => acl}/acl_run.h             |   0
 lib/{librte_acl => acl}/acl_run_altivec.c     |   0
 lib/{librte_acl => acl}/acl_run_altivec.h     |   0
 lib/{librte_acl => acl}/acl_run_avx2.c        |   0
 lib/{librte_acl => acl}/acl_run_avx2.h        |   0
 lib/{librte_acl => acl}/acl_run_avx512.c      |   0
 .../acl_run_avx512_common.h                   |   0
 lib/{librte_acl => acl}/acl_run_avx512x16.h   |   0
 lib/{librte_acl => acl}/acl_run_avx512x8.h    |   0
 lib/{librte_acl => acl}/acl_run_neon.c        |   0
 lib/{librte_acl => acl}/acl_run_neon.h        |   0
 lib/{librte_acl => acl}/acl_run_scalar.c      |   0
 lib/{librte_acl => acl}/acl_run_sse.c         |   0
 lib/{librte_acl => acl}/acl_run_sse.h         |   0
 lib/{librte_acl => acl}/acl_vect.h            |   0
 lib/acl/meson.build                           |  83 +++
 lib/{librte_acl => acl}/rte_acl.c             |   0
 lib/{librte_acl => acl}/rte_acl.h             |   0
 lib/{librte_acl => acl}/rte_acl_osdep.h       |   0
 lib/{librte_acl => acl}/tb_mem.c              |   0
 lib/{librte_acl => acl}/tb_mem.h              |   0
 lib/{librte_acl => acl}/version.map           |   0
 lib/{librte_bbdev => bbdev}/meson.build       |   4 +-
 lib/{librte_bbdev => bbdev}/rte_bbdev.c       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.h       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_op.h    |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h   |   0
 lib/{librte_bbdev => bbdev}/version.map       |   0
 .../meson.build                               |   0
 .../rte_bitrate.c                             |   0
 .../rte_bitrate.h                             |   0
 .../version.map                               |   0
 lib/{librte_bpf => bpf}/bpf.c                 |   0
 lib/{librte_bpf => bpf}/bpf_def.h             |   0
 lib/{librte_bpf => bpf}/bpf_exec.c            |   0
 lib/{librte_bpf => bpf}/bpf_impl.h            |   0
 lib/{librte_bpf => bpf}/bpf_jit_arm64.c       |   0
 lib/{librte_bpf => bpf}/bpf_jit_x86.c         |   0
 lib/{librte_bpf => bpf}/bpf_load.c            |   0
 lib/{librte_bpf => bpf}/bpf_load_elf.c        |   0
 lib/{librte_bpf => bpf}/bpf_pkt.c             |   0
 lib/{librte_bpf => bpf}/bpf_validate.c        |   0
 lib/{librte_bpf => bpf}/meson.build           |  22 +-
 lib/{librte_bpf => bpf}/rte_bpf.h             |   0
 lib/{librte_bpf => bpf}/rte_bpf_ethdev.h      |   0
 lib/{librte_bpf => bpf}/version.map           |   0
 lib/{librte_cfgfile => cfgfile}/meson.build   |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h |   0
 lib/{librte_cfgfile => cfgfile}/version.map   |   0
 lib/{librte_cmdline => cmdline}/cmdline.c     |   0
 lib/{librte_cmdline => cmdline}/cmdline.h     |   0
 .../cmdline_cirbuf.c                          |   0
 .../cmdline_cirbuf.h                          |   0
 .../cmdline_os_unix.c                         |   0
 .../cmdline_os_windows.c                      |   0
 .../cmdline_parse.c                           |   0
 .../cmdline_parse.h                           |   0
 .../cmdline_parse_etheraddr.c                 |   0
 .../cmdline_parse_etheraddr.h                 |   0
 .../cmdline_parse_ipaddr.c                    |   0
 .../cmdline_parse_ipaddr.h                    |   0
 .../cmdline_parse_num.c                       |   0
 .../cmdline_parse_num.h                       |   0
 .../cmdline_parse_portlist.c                  |   0
 .../cmdline_parse_portlist.h                  |   0
 .../cmdline_parse_string.c                    |   0
 .../cmdline_parse_string.h                    |   0
 .../cmdline_private.h                         |   0
 .../cmdline_rdline.c                          |   0
 .../cmdline_rdline.h                          |   0
 .../cmdline_socket.c                          |   0
 .../cmdline_socket.h                          |   0
 .../cmdline_vt100.c                           |   0
 .../cmdline_vt100.h                           |   0
 lib/cmdline/meson.build                       |  34 +
 lib/{librte_cmdline => cmdline}/version.map   |   0
 .../meson.build                               |  10 +-
 .../rte_comp.c                                |   0
 .../rte_comp.h                                |   0
 .../rte_compressdev.c                         |   0
 .../rte_compressdev.h                         |   0
 .../rte_compressdev_internal.h                |   0
 .../rte_compressdev_pmd.c                     |   0
 .../rte_compressdev_pmd.h                     |   0
 .../version.map                               |   0
 .../cryptodev_trace_points.c                  |   0
 .../meson.build                               |  12 +-
 .../rte_crypto.h                              |   0
 .../rte_crypto_asym.h                         |   0
 .../rte_crypto_sym.h                          |   0
 .../rte_cryptodev.c                           |   0
 .../rte_cryptodev.h                           |   0
 .../rte_cryptodev_pmd.c                       |   0
 .../rte_cryptodev_pmd.h                       |   0
 .../rte_cryptodev_trace.h                     |   0
 .../rte_cryptodev_trace_fp.h                  |   0
 .../version.map                               |   0
 .../distributor_private.h                     |   0
 .../meson.build                               |   4 +-
 .../rte_distributor.c                         |   0
 .../rte_distributor.h                         |   0
 .../rte_distributor_match_generic.c           |   0
 .../rte_distributor_match_sse.c               |   0
 .../rte_distributor_single.c                  |   0
 .../rte_distributor_single.h                  |   0
 .../version.map                               |   0
 lib/eal/arm/include/meson.build               |  34 +
 .../arm/include/rte_atomic.h                  |   0
 .../arm/include/rte_atomic_32.h               |   0
 .../arm/include/rte_atomic_64.h               |   0
 .../arm/include/rte_byteorder.h               |   0
 .../arm/include/rte_cpuflags.h                |   0
 .../arm/include/rte_cpuflags_32.h             |   0
 .../arm/include/rte_cpuflags_64.h             |   0
 .../arm/include/rte_cycles.h                  |   0
 .../arm/include/rte_cycles_32.h               |   0
 .../arm/include/rte_cycles_64.h               |   0
 lib/{librte_eal => eal}/arm/include/rte_io.h  |   0
 .../arm/include/rte_io_64.h                   |   0
 .../arm/include/rte_mcslock.h                 |   0
 .../arm/include/rte_memcpy.h                  |   0
 .../arm/include/rte_memcpy_32.h               |   0
 .../arm/include/rte_memcpy_64.h               |   0
 .../arm/include/rte_pause.h                   |   0
 .../arm/include/rte_pause_32.h                |   0
 .../arm/include/rte_pause_64.h                |   0
 .../arm/include/rte_pflock.h                  |   0
 .../arm/include/rte_power_intrinsics.h        |   0
 .../arm/include/rte_prefetch.h                |   0
 .../arm/include/rte_prefetch_32.h             |   0
 .../arm/include/rte_prefetch_64.h             |   0
 .../arm/include/rte_rwlock.h                  |   0
 .../arm/include/rte_spinlock.h                |   0
 .../arm/include/rte_ticketlock.h              |   0
 .../arm/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/arm/meson.build       |   8 +-
 lib/{librte_eal => eal}/arm/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/arm/rte_cycles.c      |   0
 lib/{librte_eal => eal}/arm/rte_hypervisor.c  |   0
 .../arm/rte_power_intrinsics.c                |   0
 .../common/eal_common_bus.c                   |   0
 .../common/eal_common_class.c                 |   0
 .../common/eal_common_config.c                |   0
 .../common/eal_common_cpuflags.c              |   0
 .../common/eal_common_debug.c                 |   0
 .../common/eal_common_dev.c                   |   0
 .../common/eal_common_devargs.c               |   0
 .../common/eal_common_dynmem.c                |   0
 .../common/eal_common_errno.c                 |   0
 .../common/eal_common_fbarray.c               |   0
 .../common/eal_common_hexdump.c               |   0
 .../common/eal_common_hypervisor.c            |   0
 .../common/eal_common_launch.c                |   0
 .../common/eal_common_lcore.c                 |   0
 .../common/eal_common_log.c                   |   0
 .../common/eal_common_mcfg.c                  |   0
 .../common/eal_common_memalloc.c              |   0
 .../common/eal_common_memory.c                |   0
 .../common/eal_common_memzone.c               |   0
 .../common/eal_common_options.c               |   0
 .../common/eal_common_proc.c                  |   0
 .../common/eal_common_string_fns.c            |   0
 .../common/eal_common_tailqs.c                |   0
 .../common/eal_common_thread.c                |   0
 .../common/eal_common_timer.c                 |   0
 .../common/eal_common_trace.c                 |   0
 .../common/eal_common_trace_ctf.c             |   0
 .../common/eal_common_trace_points.c          |   0
 .../common/eal_common_trace_utils.c           |   0
 .../common/eal_common_uuid.c                  |   0
 .../common/eal_filesystem.h                   |   0
 .../common/eal_hugepages.h                    |   0
 .../common/eal_internal_cfg.h                 |   0
 lib/{librte_eal => eal}/common/eal_log.h      |   0
 lib/{librte_eal => eal}/common/eal_memalloc.h |   0
 lib/{librte_eal => eal}/common/eal_memcfg.h   |   0
 lib/{librte_eal => eal}/common/eal_options.h  |   0
 lib/{librte_eal => eal}/common/eal_private.h  |   0
 lib/{librte_eal => eal}/common/eal_thread.h   |   0
 lib/{librte_eal => eal}/common/eal_trace.h    |   0
 lib/{librte_eal => eal}/common/hotplug_mp.c   |   0
 lib/{librte_eal => eal}/common/hotplug_mp.h   |   0
 lib/{librte_eal => eal}/common/malloc_elem.c  |   0
 lib/{librte_eal => eal}/common/malloc_elem.h  |   0
 lib/{librte_eal => eal}/common/malloc_heap.c  |   0
 lib/{librte_eal => eal}/common/malloc_heap.h  |   0
 lib/{librte_eal => eal}/common/malloc_mp.c    |   0
 lib/{librte_eal => eal}/common/malloc_mp.h    |   0
 lib/eal/common/meson.build                    |  88 +++
 .../common/rte_keepalive.c                    |   0
 lib/{librte_eal => eal}/common/rte_malloc.c   |   0
 lib/{librte_eal => eal}/common/rte_random.c   |   0
 .../common/rte_reciprocal.c                   |   0
 lib/{librte_eal => eal}/common/rte_service.c  |   0
 lib/{librte_eal => eal}/common/rte_version.c  |   0
 lib/{librte_eal => eal}/freebsd/eal.c         |   0
 lib/{librte_eal => eal}/freebsd/eal_alarm.c   |   0
 .../freebsd/eal_alarm_private.h               |   0
 .../freebsd/eal_cpuflags.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_debug.c   |   0
 lib/{librte_eal => eal}/freebsd/eal_dev.c     |   0
 .../freebsd/eal_hugepage_info.c               |   0
 .../freebsd/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/freebsd/eal_lcore.c   |   0
 .../freebsd/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_memory.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_thread.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_timer.c   |   0
 .../freebsd/include/meson.build               |   0
 .../freebsd/include/rte_os.h                  |   0
 .../freebsd/include/rte_os_shim.h             |   0
 lib/eal/freebsd/meson.build                   |  21 +
 .../include/generic/rte_atomic.h              |   0
 .../include/generic/rte_byteorder.h           |   0
 .../include/generic/rte_cpuflags.h            |   0
 .../include/generic/rte_cycles.h              |   0
 .../include/generic/rte_io.h                  |   0
 .../include/generic/rte_mcslock.h             |   0
 .../include/generic/rte_memcpy.h              |   0
 .../include/generic/rte_pause.h               |   0
 .../include/generic/rte_pflock.h              |   0
 .../include/generic/rte_power_intrinsics.h    |   0
 .../include/generic/rte_prefetch.h            |   0
 .../include/generic/rte_rwlock.h              |   0
 .../include/generic/rte_spinlock.h            |   0
 .../include/generic/rte_ticketlock.h          |   0
 .../include/generic/rte_vect.h                |   0
 lib/eal/include/meson.build                   |  70 ++
 lib/{librte_eal => eal}/include/rte_alarm.h   |   0
 lib/{librte_eal => eal}/include/rte_bitmap.h  |   0
 lib/{librte_eal => eal}/include/rte_bitops.h  |   0
 .../include/rte_branch_prediction.h           |   0
 lib/{librte_eal => eal}/include/rte_bus.h     |   0
 lib/{librte_eal => eal}/include/rte_class.h   |   0
 lib/{librte_eal => eal}/include/rte_common.h  |   0
 lib/{librte_eal => eal}/include/rte_compat.h  |   0
 lib/{librte_eal => eal}/include/rte_debug.h   |   0
 lib/{librte_eal => eal}/include/rte_dev.h     |   0
 lib/{librte_eal => eal}/include/rte_devargs.h |   0
 lib/{librte_eal => eal}/include/rte_eal.h     |   0
 .../include/rte_eal_interrupts.h              |   0
 .../include/rte_eal_memconfig.h               |   0
 .../include/rte_eal_paging.h                  |   0
 .../include/rte_eal_trace.h                   |   0
 lib/{librte_eal => eal}/include/rte_errno.h   |   0
 lib/{librte_eal => eal}/include/rte_fbarray.h |   0
 .../include/rte_function_versioning.h         |   0
 lib/{librte_eal => eal}/include/rte_hexdump.h |   0
 .../include/rte_hypervisor.h                  |   0
 .../include/rte_interrupts.h                  |   0
 .../include/rte_keepalive.h                   |   0
 lib/{librte_eal => eal}/include/rte_launch.h  |   0
 lib/{librte_eal => eal}/include/rte_lcore.h   |   0
 lib/{librte_eal => eal}/include/rte_log.h     |   0
 lib/{librte_eal => eal}/include/rte_malloc.h  |   0
 lib/{librte_eal => eal}/include/rte_memory.h  |   0
 lib/{librte_eal => eal}/include/rte_memzone.h |   0
 .../include/rte_pci_dev_feature_defs.h        |   0
 .../include/rte_pci_dev_features.h            |   0
 .../include/rte_per_lcore.h                   |   0
 lib/{librte_eal => eal}/include/rte_random.h  |   0
 .../include/rte_reciprocal.h                  |   0
 lib/{librte_eal => eal}/include/rte_service.h |   0
 .../include/rte_service_component.h           |   0
 .../include/rte_string_fns.h                  |   0
 lib/{librte_eal => eal}/include/rte_tailq.h   |   0
 lib/{librte_eal => eal}/include/rte_test.h    |   0
 lib/{librte_eal => eal}/include/rte_thread.h  |   0
 lib/{librte_eal => eal}/include/rte_time.h    |   0
 lib/{librte_eal => eal}/include/rte_trace.h   |   0
 .../include/rte_trace_point.h                 |   0
 .../include/rte_trace_point_register.h        |   0
 lib/{librte_eal => eal}/include/rte_uuid.h    |   0
 lib/{librte_eal => eal}/include/rte_version.h |   0
 lib/{librte_eal => eal}/include/rte_vfio.h    |   0
 lib/{librte_eal => eal}/linux/eal.c           |   0
 lib/{librte_eal => eal}/linux/eal_alarm.c     |   0
 lib/{librte_eal => eal}/linux/eal_cpuflags.c  |   0
 lib/{librte_eal => eal}/linux/eal_debug.c     |   0
 lib/{librte_eal => eal}/linux/eal_dev.c       |   0
 .../linux/eal_hugepage_info.c                 |   0
 .../linux/eal_interrupts.c                    |   0
 lib/{librte_eal => eal}/linux/eal_lcore.c     |   0
 lib/{librte_eal => eal}/linux/eal_log.c       |   0
 lib/{librte_eal => eal}/linux/eal_memalloc.c  |   0
 lib/{librte_eal => eal}/linux/eal_memory.c    |   0
 lib/{librte_eal => eal}/linux/eal_thread.c    |   0
 lib/{librte_eal => eal}/linux/eal_timer.c     |   0
 lib/{librte_eal => eal}/linux/eal_vfio.c      |   0
 lib/{librte_eal => eal}/linux/eal_vfio.h      |   0
 .../linux/eal_vfio_mp_sync.c                  |   0
 .../linux/include/meson.build                 |   0
 .../linux/include/rte_os.h                    |   0
 .../linux/include/rte_os_shim.h               |   0
 lib/eal/linux/meson.build                     |  27 +
 lib/{librte_eal => eal}/meson.build           |   8 +-
 lib/eal/ppc/include/meson.build               |  22 +
 .../ppc/include/rte_altivec.h                 |   0
 .../ppc/include/rte_atomic.h                  |   0
 .../ppc/include/rte_byteorder.h               |   0
 .../ppc/include/rte_cpuflags.h                |   0
 .../ppc/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/ppc/include/rte_io.h  |   0
 .../ppc/include/rte_mcslock.h                 |   0
 .../ppc/include/rte_memcpy.h                  |   0
 .../ppc/include/rte_pause.h                   |   0
 .../ppc/include/rte_pflock.h                  |   0
 .../ppc/include/rte_power_intrinsics.h        |   0
 .../ppc/include/rte_prefetch.h                |   0
 .../ppc/include/rte_rwlock.h                  |   0
 .../ppc/include/rte_spinlock.h                |   0
 .../ppc/include/rte_ticketlock.h              |   0
 .../ppc/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/ppc/meson.build       |   8 +-
 lib/{librte_eal => eal}/ppc/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/ppc/rte_cycles.c      |   0
 lib/{librte_eal => eal}/ppc/rte_hypervisor.c  |   0
 .../ppc/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/unix/eal_file.c       |   0
 .../unix/eal_unix_memory.c                    |   0
 lib/{librte_eal => eal}/unix/eal_unix_timer.c |   0
 lib/eal/unix/meson.build                      |   9 +
 lib/{librte_eal => eal}/unix/rte_thread.c     |   0
 lib/{librte_eal => eal}/version.map           |   0
 lib/{librte_eal => eal}/windows/eal.c         |   0
 lib/{librte_eal => eal}/windows/eal_alarm.c   |   0
 lib/{librte_eal => eal}/windows/eal_debug.c   |   0
 lib/{librte_eal => eal}/windows/eal_file.c    |   0
 .../windows/eal_hugepages.c                   |   0
 .../windows/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/windows/eal_lcore.c   |   0
 lib/{librte_eal => eal}/windows/eal_log.c     |   0
 .../windows/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/windows/eal_memory.c  |   0
 lib/{librte_eal => eal}/windows/eal_mp.c      |   0
 lib/{librte_eal => eal}/windows/eal_thread.c  |   0
 lib/{librte_eal => eal}/windows/eal_timer.c   |   0
 lib/{librte_eal => eal}/windows/eal_windows.h |   0
 lib/{librte_eal => eal}/windows/fnmatch.c     |   0
 lib/{librte_eal => eal}/windows/getopt.c      |   0
 .../windows/include/dirent.h                  |   0
 .../windows/include/fnmatch.h                 |   0
 .../windows/include/getopt.h                  |   0
 .../windows/include/meson.build               |   0
 .../windows/include/pthread.h                 |   0
 .../windows/include/regex.h                   |   0
 .../windows/include/rte_os.h                  |   0
 .../windows/include/rte_os_shim.h             |   0
 .../windows/include/rte_virt2phys.h           |   0
 .../windows/include/rte_windows.h             |   0
 .../windows/include/sched.h                   |   0
 .../windows/include/sys/queue.h               |   0
 .../windows/include/unistd.h                  |   0
 lib/eal/windows/meson.build                   |  25 +
 lib/{librte_eal => eal}/windows/rte_thread.c  |   0
 lib/eal/x86/include/meson.build               |  29 +
 .../x86/include/rte_atomic.h                  |   0
 .../x86/include/rte_atomic_32.h               |   0
 .../x86/include/rte_atomic_64.h               |   0
 .../x86/include/rte_byteorder.h               |   0
 .../x86/include/rte_byteorder_32.h            |   0
 .../x86/include/rte_byteorder_64.h            |   0
 .../x86/include/rte_cpuflags.h                |   0
 .../x86/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/x86/include/rte_io.h  |   0
 .../x86/include/rte_mcslock.h                 |   0
 .../x86/include/rte_memcpy.h                  |   0
 .../x86/include/rte_pause.h                   |   0
 .../x86/include/rte_pflock.h                  |   0
 .../x86/include/rte_power_intrinsics.h        |   0
 .../x86/include/rte_prefetch.h                |   0
 lib/{librte_eal => eal}/x86/include/rte_rtm.h |   0
 .../x86/include/rte_rwlock.h                  |   0
 .../x86/include/rte_spinlock.h                |   0
 .../x86/include/rte_ticketlock.h              |   0
 .../x86/include/rte_vect.h                    |   0
 lib/eal/x86/meson.build                       |  12 +
 lib/{librte_eal => eal}/x86/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/x86/rte_cpuid.h       |   0
 lib/{librte_eal => eal}/x86/rte_cycles.c      |   0
 lib/{librte_eal => eal}/x86/rte_hypervisor.c  |   0
 .../x86/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/x86/rte_spinlock.c    |   0
 lib/{librte_efd => efd}/meson.build           |   0
 lib/{librte_efd => efd}/rte_efd.c             |   0
 lib/{librte_efd => efd}/rte_efd.h             |   0
 lib/{librte_efd => efd}/rte_efd_arm64.h       |   0
 lib/{librte_efd => efd}/rte_efd_x86.h         |   0
 lib/{librte_efd => efd}/version.map           |   0
 lib/{librte_ethdev => ethdev}/ethdev_driver.h |   0
 lib/{librte_ethdev => ethdev}/ethdev_pci.h    |   0
 .../ethdev_private.c                          |   0
 .../ethdev_private.h                          |   0
 .../ethdev_profile.c                          |   0
 .../ethdev_profile.h                          |   0
 .../ethdev_trace_points.c                     |   0
 lib/{librte_ethdev => ethdev}/ethdev_vdev.h   |   0
 lib/ethdev/meson.build                        |  39 ++
 lib/{librte_ethdev => ethdev}/rte_class_eth.c |   0
 lib/{librte_ethdev => ethdev}/rte_dev_info.h  |   0
 lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h  |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.c    |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.h    |   0
 .../rte_ethdev_core.h                         |   0
 .../rte_ethdev_trace.h                        |   0
 .../rte_ethdev_trace_fp.h                     |   0
 lib/{librte_ethdev => ethdev}/rte_flow.c      |   0
 lib/{librte_ethdev => ethdev}/rte_flow.h      |   0
 .../rte_flow_driver.h                         |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.c       |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.h       |   0
 .../rte_mtr_driver.h                          |   0
 lib/{librte_ethdev => ethdev}/rte_tm.c        |   0
 lib/{librte_ethdev => ethdev}/rte_tm.h        |   0
 lib/{librte_ethdev => ethdev}/rte_tm_driver.h |   0
 lib/{librte_ethdev => ethdev}/version.map     |   0
 .../eventdev_pmd.h                            |   0
 .../eventdev_pmd_pci.h                        |   0
 .../eventdev_pmd_vdev.h                       |   0
 .../eventdev_trace_points.c                   |   0
 lib/eventdev/meson.build                      |  31 +
 .../rte_event_crypto_adapter.c                |   0
 .../rte_event_crypto_adapter.h                |   0
 .../rte_event_eth_rx_adapter.c                |   0
 .../rte_event_eth_rx_adapter.h                |   0
 .../rte_event_eth_tx_adapter.c                |   0
 .../rte_event_eth_tx_adapter.h                |   0
 .../rte_event_ring.c                          |   0
 .../rte_event_ring.h                          |   0
 .../rte_event_timer_adapter.c                 |   0
 .../rte_event_timer_adapter.h                 |   0
 .../rte_event_timer_adapter_pmd.h             |   0
 .../rte_eventdev.c                            |   0
 .../rte_eventdev.h                            |   0
 .../rte_eventdev_trace.h                      |   0
 .../rte_eventdev_trace_fp.h                   |   0
 lib/{librte_eventdev => eventdev}/version.map |   0
 lib/{librte_fib => fib}/dir24_8.c             |   0
 lib/{librte_fib => fib}/dir24_8.h             |   0
 lib/{librte_fib => fib}/dir24_8_avx512.c      |   0
 lib/{librte_fib => fib}/dir24_8_avx512.h      |   0
 lib/fib/meson.build                           |  58 ++
 lib/{librte_fib => fib}/rte_fib.c             |   0
 lib/{librte_fib => fib}/rte_fib.h             |   0
 lib/{librte_fib => fib}/rte_fib6.c            |   0
 lib/{librte_fib => fib}/rte_fib6.h            |   0
 lib/{librte_fib => fib}/trie.c                |   0
 lib/{librte_fib => fib}/trie.h                |   0
 lib/{librte_fib => fib}/trie_avx512.c         |   0
 lib/{librte_fib => fib}/trie_avx512.h         |   0
 lib/{librte_fib => fib}/version.map           |   0
 .../meson.build                               |   0
 .../rte_flow_classify.c                       |   0
 .../rte_flow_classify.h                       |   0
 .../rte_flow_classify_parse.c                 |   0
 .../rte_flow_classify_parse.h                 |   0
 .../version.map                               |   0
 lib/{librte_graph => graph}/graph.c           |   0
 lib/{librte_graph => graph}/graph_debug.c     |   0
 lib/{librte_graph => graph}/graph_ops.c       |   0
 lib/{librte_graph => graph}/graph_populate.c  |   0
 lib/{librte_graph => graph}/graph_private.h   |   0
 lib/{librte_graph => graph}/graph_stats.c     |   0
 lib/{librte_graph => graph}/meson.build       |   9 +-
 lib/{librte_graph => graph}/node.c            |   0
 lib/{librte_graph => graph}/rte_graph.h       |   0
 .../rte_graph_worker.h                        |   0
 lib/{librte_graph => graph}/version.map       |   0
 lib/{librte_gro => gro}/gro_tcp4.c            |   0
 lib/{librte_gro => gro}/gro_tcp4.h            |   0
 lib/{librte_gro => gro}/gro_udp4.c            |   0
 lib/{librte_gro => gro}/gro_udp4.h            |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.h      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.h      |   0
 lib/gro/meson.build                           |  12 +
 lib/{librte_gro => gro}/rte_gro.c             |   0
 lib/{librte_gro => gro}/rte_gro.h             |   0
 lib/{librte_gro => gro}/version.map           |   0
 lib/{librte_gso => gso}/gso_common.c          |   0
 lib/{librte_gso => gso}/gso_common.h          |   0
 lib/{librte_gso => gso}/gso_tcp4.c            |   0
 lib/{librte_gso => gso}/gso_tcp4.h            |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.h     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.h     |   0
 lib/{librte_gso => gso}/gso_udp4.c            |   0
 lib/{librte_gso => gso}/gso_udp4.h            |   0
 lib/gso/meson.build                           |  13 +
 lib/{librte_gso => gso}/rte_gso.c             |   0
 lib/{librte_gso => gso}/rte_gso.h             |   0
 lib/{librte_gso => gso}/version.map           |   0
 lib/{librte_hash => hash}/meson.build         |  12 +-
 lib/{librte_hash => hash}/rte_cmp_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cmp_x86.h       |   0
 lib/{librte_hash => hash}/rte_crc_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.c   |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.h   |   0
 lib/{librte_hash => hash}/rte_fbk_hash.c      |   0
 lib/{librte_hash => hash}/rte_fbk_hash.h      |   0
 lib/{librte_hash => hash}/rte_hash.h          |   0
 lib/{librte_hash => hash}/rte_hash_crc.h      |   0
 lib/{librte_hash => hash}/rte_jhash.h         |   0
 lib/{librte_hash => hash}/rte_thash.h         |   0
 lib/{librte_hash => hash}/version.map         |   0
 .../ip_frag_common.h                          |   0
 .../ip_frag_internal.c                        |   0
 lib/ip_frag/meson.build                       |  13 +
 lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h |   0
 .../rte_ip_frag_common.c                      |   0
 .../rte_ipv4_fragmentation.c                  |   0
 .../rte_ipv4_reassembly.c                     |   0
 .../rte_ipv6_fragmentation.c                  |   0
 .../rte_ipv6_reassembly.c                     |   0
 lib/{librte_ip_frag => ip_frag}/version.map   |   0
 lib/{librte_ipsec => ipsec}/crypto.h          |   0
 lib/{librte_ipsec => ipsec}/esp_inb.c         |   0
 lib/{librte_ipsec => ipsec}/esp_outb.c        |   0
 lib/{librte_ipsec => ipsec}/iph.h             |   0
 lib/{librte_ipsec => ipsec}/ipsec_sad.c       |   0
 lib/{librte_ipsec => ipsec}/ipsec_sqn.h       |   0
 lib/{librte_ipsec => ipsec}/meson.build       |   0
 lib/{librte_ipsec => ipsec}/misc.h            |   0
 lib/{librte_ipsec => ipsec}/pad.h             |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec.h       |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_group.h |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h    |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h   |   0
 lib/{librte_ipsec => ipsec}/sa.c              |   0
 lib/{librte_ipsec => ipsec}/sa.h              |   0
 lib/{librte_ipsec => ipsec}/ses.c             |   0
 lib/{librte_ipsec => ipsec}/version.map       |   0
 lib/{librte_jobstats => jobstats}/meson.build |   0
 .../rte_jobstats.c                            |   0
 .../rte_jobstats.h                            |   0
 lib/{librte_jobstats => jobstats}/version.map |   0
 lib/{librte_kni => kni}/meson.build           |   4 +-
 lib/{librte_kni => kni}/rte_kni.c             |   0
 lib/{librte_kni => kni}/rte_kni.h             |   0
 lib/{librte_kni => kni}/rte_kni_common.h      |   0
 lib/{librte_kni => kni}/rte_kni_fifo.h        |   0
 lib/{librte_kni => kni}/version.map           |   0
 lib/{librte_kvargs => kvargs}/meson.build     |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.c    |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.h    |   0
 lib/{librte_kvargs => kvargs}/version.map     |   0
 .../meson.build                               |   0
 .../rte_latencystats.c                        |   0
 .../rte_latencystats.h                        |   0
 .../version.map                               |   0
 lib/librte_acl/meson.build                    |  83 ---
 lib/librte_cmdline/meson.build                |  34 -
 lib/librte_eal/arm/include/meson.build        |  34 -
 lib/librte_eal/common/meson.build             |  88 ---
 lib/librte_eal/freebsd/meson.build            |  21 -
 lib/librte_eal/include/meson.build            |  70 --
 lib/librte_eal/linux/meson.build              |  27 -
 lib/librte_eal/ppc/include/meson.build        |  22 -
 lib/librte_eal/unix/meson.build               |   9 -
 lib/librte_eal/windows/meson.build            |  25 -
 lib/librte_eal/x86/include/meson.build        |  30 -
 lib/librte_eal/x86/meson.build                |  12 -
 lib/librte_ethdev/meson.build                 |  33 -
 lib/librte_eventdev/meson.build               |  27 -
 lib/librte_fib/meson.build                    |  58 --
 lib/librte_gro/meson.build                    |   6 -
 lib/librte_gso/meson.build                    |   7 -
 lib/librte_ip_frag/meson.build                |  11 -
 lib/librte_mbuf/meson.build                   |   9 -
 lib/librte_mempool/meson.build                |  16 -
 lib/librte_net/meson.build                    | 110 ---
 lib/librte_pipeline/meson.build               |  16 -
 lib/librte_port/meson.build                   |  46 --
 lib/librte_power/meson.build                  |  17 -
 lib/librte_ring/meson.build                   |  19 -
 lib/librte_table/meson.build                  |  36 -
 lib/librte_vhost/meson.build                  |  26 -
 lib/{librte_lpm => lpm}/meson.build           |   7 +-
 lib/{librte_lpm => lpm}/rte_lpm.c             |   0
 lib/{librte_lpm => lpm}/rte_lpm.h             |   0
 lib/{librte_lpm => lpm}/rte_lpm6.c            |   0
 lib/{librte_lpm => lpm}/rte_lpm6.h            |   0
 lib/{librte_lpm => lpm}/rte_lpm_altivec.h     |   0
 lib/{librte_lpm => lpm}/rte_lpm_neon.h        |   0
 lib/{librte_lpm => lpm}/rte_lpm_sse.h         |   0
 lib/{librte_lpm => lpm}/rte_lpm_sve.h         |   0
 lib/{librte_lpm => lpm}/version.map           |   0
 lib/mbuf/meson.build                          |  17 +
 lib/{librte_mbuf => mbuf}/rte_mbuf.c          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.h          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_core.h     |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c    |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h    |   0
 lib/{librte_mbuf => mbuf}/version.map         |   0
 lib/{librte_member => member}/meson.build     |   0
 lib/{librte_member => member}/rte_member.c    |   0
 lib/{librte_member => member}/rte_member.h    |   0
 lib/{librte_member => member}/rte_member_ht.c |   0
 lib/{librte_member => member}/rte_member_ht.h |   0
 .../rte_member_vbf.c                          |   0
 .../rte_member_vbf.h                          |   0
 .../rte_member_x86.h                          |   0
 lib/{librte_member => member}/version.map     |   0
 .../mempool_trace_points.c                    |   0
 lib/mempool/meson.build                       |  23 +
 lib/{librte_mempool => mempool}/rte_mempool.c |   0
 lib/{librte_mempool => mempool}/rte_mempool.h |   0
 .../rte_mempool_ops.c                         |   0
 .../rte_mempool_ops_default.c                 |   0
 .../rte_mempool_trace.h                       |   0
 .../rte_mempool_trace_fp.h                    |   0
 lib/{librte_mempool => mempool}/version.map   |   0
 lib/meson.build                               | 431 ++++++------
 lib/{librte_meter => meter}/meson.build       |   0
 lib/{librte_meter => meter}/rte_meter.c       |   0
 lib/{librte_meter => meter}/rte_meter.h       |   0
 lib/{librte_meter => meter}/version.map       |   0
 lib/{librte_metrics => metrics}/meson.build   |   4 +-
 lib/{librte_metrics => metrics}/rte_metrics.c |   0
 lib/{librte_metrics => metrics}/rte_metrics.h |   0
 .../rte_metrics_telemetry.c                   |   0
 .../rte_metrics_telemetry.h                   |   0
 lib/{librte_metrics => metrics}/version.map   |   0
 lib/net/meson.build                           | 121 ++++
 lib/{librte_net => net}/net_crc.h             |   0
 lib/{librte_net => net}/net_crc_avx512.c      |   0
 lib/{librte_net => net}/net_crc_neon.c        |   0
 lib/{librte_net => net}/net_crc_sse.c         |   0
 lib/{librte_net => net}/rte_arp.c             |   0
 lib/{librte_net => net}/rte_arp.h             |   0
 lib/{librte_net => net}/rte_ecpri.h           |   0
 lib/{librte_net => net}/rte_esp.h             |   0
 lib/{librte_net => net}/rte_ether.c           |   0
 lib/{librte_net => net}/rte_ether.h           |   0
 lib/{librte_net => net}/rte_geneve.h          |   0
 lib/{librte_net => net}/rte_gre.h             |   0
 lib/{librte_net => net}/rte_gtp.h             |   0
 lib/{librte_net => net}/rte_higig.h           |   0
 lib/{librte_net => net}/rte_icmp.h            |   0
 lib/{librte_net => net}/rte_ip.h              |   0
 lib/{librte_net => net}/rte_mpls.h            |   0
 lib/{librte_net => net}/rte_net.c             |   0
 lib/{librte_net => net}/rte_net.h             |   0
 lib/{librte_net => net}/rte_net_crc.c         |   0
 lib/{librte_net => net}/rte_net_crc.h         |   0
 lib/{librte_net => net}/rte_sctp.h            |   0
 lib/{librte_net => net}/rte_tcp.h             |   0
 lib/{librte_net => net}/rte_udp.h             |   0
 lib/{librte_net => net}/rte_vxlan.h           |   0
 lib/{librte_net => net}/version.map           |   0
 lib/{librte_node => node}/ethdev_ctrl.c       |   0
 lib/{librte_node => node}/ethdev_rx.c         |   0
 lib/{librte_node => node}/ethdev_rx_priv.h    |   0
 lib/{librte_node => node}/ethdev_tx.c         |   0
 lib/{librte_node => node}/ethdev_tx_priv.h    |   0
 lib/{librte_node => node}/ip4_lookup.c        |   0
 lib/{librte_node => node}/ip4_lookup_neon.h   |   0
 lib/{librte_node => node}/ip4_lookup_sse.h    |   0
 lib/{librte_node => node}/ip4_rewrite.c       |   0
 lib/{librte_node => node}/ip4_rewrite_priv.h  |   0
 lib/{librte_node => node}/log.c               |   0
 lib/{librte_node => node}/meson.build         |  13 +-
 lib/{librte_node => node}/node_private.h      |   0
 lib/{librte_node => node}/null.c              |   0
 lib/{librte_node => node}/pkt_cls.c           |   0
 lib/{librte_node => node}/pkt_cls_priv.h      |   0
 lib/{librte_node => node}/pkt_drop.c          |   0
 lib/{librte_node => node}/rte_node_eth_api.h  |   0
 lib/{librte_node => node}/rte_node_ip4_api.h  |   0
 lib/{librte_node => node}/version.map         |   0
 lib/{librte_pci => pci}/meson.build           |   0
 lib/{librte_pci => pci}/rte_pci.c             |   0
 lib/{librte_pci => pci}/rte_pci.h             |   0
 lib/{librte_pci => pci}/version.map           |   0
 lib/{librte_pdump => pdump}/meson.build       |   0
 lib/{librte_pdump => pdump}/rte_pdump.c       |   0
 lib/{librte_pdump => pdump}/rte_pdump.h       |   0
 lib/{librte_pdump => pdump}/version.map       |   0
 lib/pipeline/meson.build                      |  20 +
 .../rte_pipeline.c                            |   0
 .../rte_pipeline.h                            |   0
 .../rte_port_in_action.c                      |   0
 .../rte_port_in_action.h                      |   0
 .../rte_swx_ctl.c                             |   0
 .../rte_swx_ctl.h                             |   0
 .../rte_swx_extern.h                          |   0
 .../rte_swx_pipeline.c                        |   0
 .../rte_swx_pipeline.h                        |   0
 .../rte_swx_pipeline_spec.c                   |   0
 .../rte_table_action.c                        |   0
 .../rte_table_action.h                        |   0
 lib/{librte_pipeline => pipeline}/version.map |   0
 lib/port/meson.build                          |  46 ++
 lib/{librte_port => port}/rte_port.h          |   0
 lib/{librte_port => port}/rte_port_ethdev.c   |   0
 lib/{librte_port => port}/rte_port_ethdev.h   |   0
 lib/{librte_port => port}/rte_port_eventdev.c |   0
 lib/{librte_port => port}/rte_port_eventdev.h |   0
 lib/{librte_port => port}/rte_port_fd.c       |   0
 lib/{librte_port => port}/rte_port_fd.h       |   0
 lib/{librte_port => port}/rte_port_frag.c     |   0
 lib/{librte_port => port}/rte_port_frag.h     |   0
 lib/{librte_port => port}/rte_port_kni.c      |   0
 lib/{librte_port => port}/rte_port_kni.h      |   0
 lib/{librte_port => port}/rte_port_ras.c      |   0
 lib/{librte_port => port}/rte_port_ras.h      |   0
 lib/{librte_port => port}/rte_port_ring.c     |   0
 lib/{librte_port => port}/rte_port_ring.h     |   0
 lib/{librte_port => port}/rte_port_sched.c    |   0
 lib/{librte_port => port}/rte_port_sched.h    |   0
 .../rte_port_source_sink.c                    |   0
 .../rte_port_source_sink.h                    |   0
 .../rte_port_sym_crypto.c                     |   0
 .../rte_port_sym_crypto.h                     |   0
 lib/{librte_port => port}/rte_swx_port.h      |   0
 .../rte_swx_port_ethdev.c                     |   0
 .../rte_swx_port_ethdev.h                     |   0
 lib/{librte_port => port}/rte_swx_port_fd.c   |   0
 lib/{librte_port => port}/rte_swx_port_fd.h   |   0
 lib/{librte_port => port}/rte_swx_port_ring.c |   0
 lib/{librte_port => port}/rte_swx_port_ring.h |   0
 .../rte_swx_port_source_sink.c                |   0
 .../rte_swx_port_source_sink.h                |   0
 lib/{librte_port => port}/version.map         |   0
 lib/{librte_power => power}/guest_channel.c   |   0
 lib/{librte_power => power}/guest_channel.h   |   0
 lib/power/meson.build                         |  24 +
 .../power_acpi_cpufreq.c                      |   0
 .../power_acpi_cpufreq.h                      |   0
 lib/{librte_power => power}/power_common.c    |   0
 lib/{librte_power => power}/power_common.h    |   0
 lib/{librte_power => power}/power_kvm_vm.c    |   0
 lib/{librte_power => power}/power_kvm_vm.h    |   0
 .../power_pstate_cpufreq.c                    |   0
 .../power_pstate_cpufreq.h                    |   0
 lib/{librte_power => power}/rte_power.c       |   0
 lib/{librte_power => power}/rte_power.h       |   0
 .../rte_power_empty_poll.c                    |   0
 .../rte_power_empty_poll.h                    |   0
 .../rte_power_guest_channel.h                 |   0
 .../rte_power_pmd_mgmt.c                      |   0
 .../rte_power_pmd_mgmt.h                      |   0
 lib/{librte_power => power}/version.map       |   0
 lib/{librte_rawdev => rawdev}/meson.build     |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.c    |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.h    |   0
 .../rte_rawdev_pmd.h                          |   0
 lib/{librte_rawdev => rawdev}/version.map     |   0
 lib/{librte_rcu => rcu}/meson.build           |   0
 lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.c        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.h        |   0
 lib/{librte_rcu => rcu}/version.map           |   0
 lib/{librte_regexdev => regexdev}/meson.build |   3 +-
 .../rte_regexdev.c                            |   0
 .../rte_regexdev.h                            |   0
 .../rte_regexdev_core.h                       |   0
 .../rte_regexdev_driver.h                     |   0
 lib/{librte_regexdev => regexdev}/version.map |   0
 lib/{librte_reorder => reorder}/meson.build   |   0
 lib/{librte_reorder => reorder}/rte_reorder.c |   0
 lib/{librte_reorder => reorder}/rte_reorder.h |   0
 lib/{librte_reorder => reorder}/version.map   |   0
 lib/{librte_rib => rib}/meson.build           |   0
 lib/{librte_rib => rib}/rte_rib.c             |   0
 lib/{librte_rib => rib}/rte_rib.h             |   0
 lib/{librte_rib => rib}/rte_rib6.c            |   0
 lib/{librte_rib => rib}/rte_rib6.h            |   0
 lib/{librte_rib => rib}/version.map           |   0
 lib/ring/meson.build                          |  20 +
 lib/{librte_ring => ring}/rte_ring.c          |   0
 lib/{librte_ring => ring}/rte_ring.h          |   0
 lib/{librte_ring => ring}/rte_ring_c11_pvt.h  |   0
 lib/{librte_ring => ring}/rte_ring_core.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem_pvt.h |   0
 .../rte_ring_generic_pvt.h                    |   0
 lib/{librte_ring => ring}/rte_ring_hts.h      |   0
 .../rte_ring_hts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/rte_ring_peek.h     |   0
 .../rte_ring_peek_elem_pvt.h                  |   0
 lib/{librte_ring => ring}/rte_ring_peek_zc.h  |   0
 lib/{librte_ring => ring}/rte_ring_rts.h      |   0
 .../rte_ring_rts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/version.map         |   0
 lib/{librte_sched => sched}/meson.build       |   8 +-
 lib/{librte_sched => sched}/rte_approx.c      |   0
 lib/{librte_sched => sched}/rte_approx.h      |   0
 lib/{librte_sched => sched}/rte_red.c         |   0
 lib/{librte_sched => sched}/rte_red.h         |   0
 lib/{librte_sched => sched}/rte_sched.c       |   0
 lib/{librte_sched => sched}/rte_sched.h       |   0
 .../rte_sched_common.h                        |   0
 lib/{librte_sched => sched}/version.map       |   0
 lib/{librte_security => security}/meson.build |   0
 .../rte_security.c                            |   0
 .../rte_security.h                            |   0
 .../rte_security_driver.h                     |   0
 lib/{librte_security => security}/version.map |   0
 lib/{librte_stack => stack}/meson.build       |   9 +-
 lib/{librte_stack => stack}/rte_stack.c       |   0
 lib/{librte_stack => stack}/rte_stack.h       |   0
 lib/{librte_stack => stack}/rte_stack_lf.c    |   0
 lib/{librte_stack => stack}/rte_stack_lf.h    |   0
 .../rte_stack_lf_c11.h                        |   0
 .../rte_stack_lf_generic.h                    |   0
 .../rte_stack_lf_stubs.h                      |   0
 lib/{librte_stack => stack}/rte_stack_std.c   |   0
 lib/{librte_stack => stack}/rte_stack_std.h   |   0
 lib/{librte_stack => stack}/stack_pvt.h       |   0
 lib/{librte_stack => stack}/version.map       |   0
 lib/table/meson.build                         |  40 ++
 lib/{librte_table => table}/rte_lru.h         |   0
 lib/{librte_table => table}/rte_lru_arm64.h   |   0
 lib/{librte_table => table}/rte_lru_x86.h     |   0
 lib/{librte_table => table}/rte_swx_table.h   |   0
 .../rte_swx_table_em.c                        |   0
 .../rte_swx_table_em.h                        |   0
 .../rte_swx_table_wm.c                        |   0
 .../rte_swx_table_wm.h                        |   0
 lib/{librte_table => table}/rte_table.h       |   0
 lib/{librte_table => table}/rte_table_acl.c   |   0
 lib/{librte_table => table}/rte_table_acl.h   |   0
 lib/{librte_table => table}/rte_table_array.c |   0
 lib/{librte_table => table}/rte_table_array.h |   0
 lib/{librte_table => table}/rte_table_hash.h  |   0
 .../rte_table_hash_cuckoo.c                   |   0
 .../rte_table_hash_cuckoo.h                   |   0
 .../rte_table_hash_ext.c                      |   0
 .../rte_table_hash_func.h                     |   0
 .../rte_table_hash_func_arm64.h               |   0
 .../rte_table_hash_key16.c                    |   0
 .../rte_table_hash_key32.c                    |   0
 .../rte_table_hash_key8.c                     |   0
 .../rte_table_hash_lru.c                      |   0
 lib/{librte_table => table}/rte_table_lpm.c   |   0
 lib/{librte_table => table}/rte_table_lpm.h   |   0
 .../rte_table_lpm_ipv6.c                      |   0
 .../rte_table_lpm_ipv6.h                      |   0
 lib/{librte_table => table}/rte_table_stub.c  |   0
 lib/{librte_table => table}/rte_table_stub.h  |   0
 lib/{librte_table => table}/version.map       |   0
 .../meson.build                               |   2 +-
 .../rte_telemetry.h                           |   0
 .../telemetry.c                               |   0
 .../telemetry_data.c                          |   0
 .../telemetry_data.h                          |   0
 .../telemetry_internal.h                      |   0
 .../telemetry_json.h                          |   0
 .../telemetry_legacy.c                        |   0
 .../version.map                               |   0
 lib/{librte_timer => timer}/meson.build       |   0
 lib/{librte_timer => timer}/rte_timer.c       |   0
 lib/{librte_timer => timer}/rte_timer.h       |   0
 lib/{librte_timer => timer}/version.map       |   0
 lib/{librte_vhost => vhost}/fd_man.c          |   0
 lib/{librte_vhost => vhost}/fd_man.h          |   0
 lib/{librte_vhost => vhost}/iotlb.c           |   0
 lib/{librte_vhost => vhost}/iotlb.h           |   0
 lib/vhost/meson.build                         |  37 +
 lib/{librte_vhost => vhost}/rte_vdpa.h        |   0
 lib/{librte_vhost => vhost}/rte_vdpa_dev.h    |   0
 lib/{librte_vhost => vhost}/rte_vhost.h       |   0
 lib/{librte_vhost => vhost}/rte_vhost_async.h |   0
 .../rte_vhost_crypto.h                        |   0
 lib/{librte_vhost => vhost}/socket.c          |   0
 lib/{librte_vhost => vhost}/vdpa.c            |   0
 lib/{librte_vhost => vhost}/version.map       |   0
 lib/{librte_vhost => vhost}/vhost.c           |   0
 lib/{librte_vhost => vhost}/vhost.h           |   0
 lib/{librte_vhost => vhost}/vhost_crypto.c    |   0
 lib/{librte_vhost => vhost}/vhost_user.c      |   0
 lib/{librte_vhost => vhost}/vhost_user.h      |   0
 lib/{librte_vhost => vhost}/virtio_crypto.h   |   0
 lib/{librte_vhost => vhost}/virtio_net.c      |   0
 license/exceptions.txt                        |   6 +-
 meson.build                                   |  94 +--
 meson_options.txt                             |  86 +--
 usertools/meson.build                         |  11 +-
 1120 files changed, 5023 insertions(+), 4784 deletions(-)
 rename lib/{librte_acl => acl}/acl.h (100%)
 rename lib/{librte_acl => acl}/acl_bld.c (100%)
 rename lib/{librte_acl => acl}/acl_gen.c (100%)
 rename lib/{librte_acl => acl}/acl_run.h (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.c (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512_common.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x16.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x8.h (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.c (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.h (100%)
 rename lib/{librte_acl => acl}/acl_run_scalar.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.h (100%)
 rename lib/{librte_acl => acl}/acl_vect.h (100%)
 create mode 100644 lib/acl/meson.build
 rename lib/{librte_acl => acl}/rte_acl.c (100%)
 rename lib/{librte_acl => acl}/rte_acl.h (100%)
 rename lib/{librte_acl => acl}/rte_acl_osdep.h (100%)
 rename lib/{librte_acl => acl}/tb_mem.c (100%)
 rename lib/{librte_acl => acl}/tb_mem.h (100%)
 rename lib/{librte_acl => acl}/version.map (100%)
 rename lib/{librte_bbdev => bbdev}/meson.build (74%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.c (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_op.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h (100%)
 rename lib/{librte_bbdev => bbdev}/version.map (100%)
 rename lib/{librte_bitratestats => bitratestats}/meson.build (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.c (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.h (100%)
 rename lib/{librte_bitratestats => bitratestats}/version.map (100%)
 rename lib/{librte_bpf => bpf}/bpf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_def.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_exec.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_impl.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_arm64.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_x86.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load_elf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_pkt.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_validate.c (100%)
 rename lib/{librte_bpf => bpf}/meson.build (52%)
 rename lib/{librte_bpf => bpf}/rte_bpf.h (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf_ethdev.h (100%)
 rename lib/{librte_bpf => bpf}/version.map (100%)
 rename lib/{librte_cfgfile => cfgfile}/meson.build (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h (100%)
 rename lib/{librte_cfgfile => cfgfile}/version.map (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_unix.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_windows.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_private.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.h (100%)
 create mode 100644 lib/cmdline/meson.build
 rename lib/{librte_cmdline => cmdline}/version.map (100%)
 rename lib/{librte_compressdev => compressdev}/meson.build (58%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_internal.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.h (100%)
 rename lib/{librte_compressdev => compressdev}/version.map (100%)
 rename lib/{librte_cryptodev => cryptodev}/cryptodev_trace_points.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/meson.build (56%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_asym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_sym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace_fp.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/version.map (100%)
 rename lib/{librte_distributor => distributor}/distributor_private.h (100%)
 rename lib/{librte_distributor => distributor}/meson.build (68%)
 rename lib/{librte_distributor => distributor}/rte_distributor.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.h (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_generic.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_sse.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.h (100%)
 rename lib/{librte_distributor => distributor}/version.map (100%)
 create mode 100644 lib/eal/arm/include/meson.build
 rename lib/{librte_eal => eal}/arm/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/arm/meson.build (51%)
 rename lib/{librte_eal => eal}/arm/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_bus.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_class.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_config.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_debug.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dev.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_devargs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dynmem.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_errno.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_fbarray.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hexdump.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_launch.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_lcore.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_log.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_mcfg.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memalloc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memory.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memzone.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_options.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_proc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_string_fns.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_tailqs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_thread.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_timer.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_ctf.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_points.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_utils.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_uuid.c (100%)
 rename lib/{librte_eal => eal}/common/eal_filesystem.h (100%)
 rename lib/{librte_eal => eal}/common/eal_hugepages.h (100%)
 rename lib/{librte_eal => eal}/common/eal_internal_cfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_log.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memalloc.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memcfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_options.h (100%)
 rename lib/{librte_eal => eal}/common/eal_private.h (100%)
 rename lib/{librte_eal => eal}/common/eal_thread.h (100%)
 rename lib/{librte_eal => eal}/common/eal_trace.h (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.c (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.h (100%)
 create mode 100644 lib/eal/common/meson.build
 rename lib/{librte_eal => eal}/common/rte_keepalive.c (100%)
 rename lib/{librte_eal => eal}/common/rte_malloc.c (100%)
 rename lib/{librte_eal => eal}/common/rte_random.c (100%)
 rename lib/{librte_eal => eal}/common/rte_reciprocal.c (100%)
 rename lib/{librte_eal => eal}/common/rte_service.c (100%)
 rename lib/{librte_eal => eal}/common/rte_version.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm_private.h (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/freebsd/include/meson.build (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os_shim.h (100%)
 create mode 100644 lib/eal/freebsd/meson.build
 rename lib/{librte_eal => eal}/include/generic/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_io.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_vect.h (100%)
 create mode 100644 lib/eal/include/meson.build
 rename lib/{librte_eal => eal}/include/rte_alarm.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitmap.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitops.h (100%)
 rename lib/{librte_eal => eal}/include/rte_branch_prediction.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bus.h (100%)
 rename lib/{librte_eal => eal}/include/rte_class.h (100%)
 rename lib/{librte_eal => eal}/include/rte_common.h (100%)
 rename lib/{librte_eal => eal}/include/rte_compat.h (100%)
 rename lib/{librte_eal => eal}/include/rte_debug.h (100%)
 rename lib/{librte_eal => eal}/include/rte_dev.h (100%)
 rename lib/{librte_eal => eal}/include/rte_devargs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_memconfig.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_paging.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_errno.h (100%)
 rename lib/{librte_eal => eal}/include/rte_fbarray.h (100%)
 rename lib/{librte_eal => eal}/include/rte_function_versioning.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hexdump.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hypervisor.h (100%)
 rename lib/{librte_eal => eal}/include/rte_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_keepalive.h (100%)
 rename lib/{librte_eal => eal}/include/rte_launch.h (100%)
 rename lib/{librte_eal => eal}/include/rte_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_log.h (100%)
 rename lib/{librte_eal => eal}/include/rte_malloc.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memory.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memzone.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_feature_defs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_features.h (100%)
 rename lib/{librte_eal => eal}/include/rte_per_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_random.h (100%)
 rename lib/{librte_eal => eal}/include/rte_reciprocal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service_component.h (100%)
 rename lib/{librte_eal => eal}/include/rte_string_fns.h (100%)
 rename lib/{librte_eal => eal}/include/rte_tailq.h (100%)
 rename lib/{librte_eal => eal}/include/rte_test.h (100%)
 rename lib/{librte_eal => eal}/include/rte_thread.h (100%)
 rename lib/{librte_eal => eal}/include/rte_time.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point_register.h (100%)
 rename lib/{librte_eal => eal}/include/rte_uuid.h (100%)
 rename lib/{librte_eal => eal}/include/rte_version.h (100%)
 rename lib/{librte_eal => eal}/include/rte_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_log.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio_mp_sync.c (100%)
 rename lib/{librte_eal => eal}/linux/include/meson.build (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os_shim.h (100%)
 create mode 100644 lib/eal/linux/meson.build
 rename lib/{librte_eal => eal}/meson.build (78%)
 create mode 100644 lib/eal/ppc/include/meson.build
 rename lib/{librte_eal => eal}/ppc/include/rte_altivec.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/ppc/meson.build (54%)
 rename lib/{librte_eal => eal}/ppc/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_file.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_memory.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_timer.c (100%)
 create mode 100644 lib/eal/unix/meson.build
 rename lib/{librte_eal => eal}/unix/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/version.map (100%)
 rename lib/{librte_eal => eal}/windows/eal.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_file.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_hugepages.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_log.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_mp.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/fnmatch.c (100%)
 rename lib/{librte_eal => eal}/windows/getopt.c (100%)
 rename lib/{librte_eal => eal}/windows/include/dirent.h (100%)
 rename lib/{librte_eal => eal}/windows/include/fnmatch.h (100%)
 rename lib/{librte_eal => eal}/windows/include/getopt.h (100%)
 rename lib/{librte_eal => eal}/windows/include/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/include/pthread.h (100%)
 rename lib/{librte_eal => eal}/windows/include/regex.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_virt2phys.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sched.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/queue.h (100%)
 rename lib/{librte_eal => eal}/windows/include/unistd.h (100%)
 create mode 100644 lib/eal/windows/meson.build
 rename lib/{librte_eal => eal}/windows/rte_thread.c (100%)
 create mode 100644 lib/eal/x86/include/meson.build
 rename lib/{librte_eal => eal}/x86/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rtm.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_vect.h (100%)
 create mode 100644 lib/eal/x86/meson.build
 rename lib/{librte_eal => eal}/x86/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuid.h (100%)
 rename lib/{librte_eal => eal}/x86/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_spinlock.c (100%)
 rename lib/{librte_efd => efd}/meson.build (100%)
 rename lib/{librte_efd => efd}/rte_efd.c (100%)
 rename lib/{librte_efd => efd}/rte_efd.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_arm64.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_x86.h (100%)
 rename lib/{librte_efd => efd}/version.map (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_pci.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_trace_points.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_vdev.h (100%)
 create mode 100644 lib/ethdev/meson.build
 rename lib/{librte_ethdev => ethdev}/rte_class_eth.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_dev_info.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_core.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace_fp.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/version.map (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_pci.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_vdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_trace_points.c (100%)
 create mode 100644 lib/eventdev/meson.build
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace_fp.h (100%)
 rename lib/{librte_eventdev => eventdev}/version.map (100%)
 rename lib/{librte_fib => fib}/dir24_8.c (100%)
 rename lib/{librte_fib => fib}/dir24_8.h (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.c (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.h (100%)
 create mode 100644 lib/fib/meson.build
 rename lib/{librte_fib => fib}/rte_fib.c (100%)
 rename lib/{librte_fib => fib}/rte_fib.h (100%)
 rename lib/{librte_fib => fib}/rte_fib6.c (100%)
 rename lib/{librte_fib => fib}/rte_fib6.h (100%)
 rename lib/{librte_fib => fib}/trie.c (100%)
 rename lib/{librte_fib => fib}/trie.h (100%)
 rename lib/{librte_fib => fib}/trie_avx512.c (100%)
 rename lib/{librte_fib => fib}/trie_avx512.h (100%)
 rename lib/{librte_fib => fib}/version.map (100%)
 rename lib/{librte_flow_classify => flow_classify}/meson.build (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/version.map (100%)
 rename lib/{librte_graph => graph}/graph.c (100%)
 rename lib/{librte_graph => graph}/graph_debug.c (100%)
 rename lib/{librte_graph => graph}/graph_ops.c (100%)
 rename lib/{librte_graph => graph}/graph_populate.c (100%)
 rename lib/{librte_graph => graph}/graph_private.h (100%)
 rename lib/{librte_graph => graph}/graph_stats.c (100%)
 rename lib/{librte_graph => graph}/meson.build (50%)
 rename lib/{librte_graph => graph}/node.c (100%)
 rename lib/{librte_graph => graph}/rte_graph.h (100%)
 rename lib/{librte_graph => graph}/rte_graph_worker.h (100%)
 rename lib/{librte_graph => graph}/version.map (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_udp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.h (100%)
 create mode 100644 lib/gro/meson.build
 rename lib/{librte_gro => gro}/rte_gro.c (100%)
 rename lib/{librte_gro => gro}/rte_gro.h (100%)
 rename lib/{librte_gro => gro}/version.map (100%)
 rename lib/{librte_gso => gso}/gso_common.c (100%)
 rename lib/{librte_gso => gso}/gso_common.h (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.h (100%)
 rename lib/{librte_gso => gso}/gso_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_udp4.h (100%)
 create mode 100644 lib/gso/meson.build
 rename lib/{librte_gso => gso}/rte_gso.c (100%)
 rename lib/{librte_gso => gso}/rte_gso.h (100%)
 rename lib/{librte_gso => gso}/version.map (100%)
 rename lib/{librte_hash => hash}/meson.build (60%)
 rename lib/{librte_hash => hash}/rte_cmp_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cmp_x86.h (100%)
 rename lib/{librte_hash => hash}/rte_crc_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash_crc.h (100%)
 rename lib/{librte_hash => hash}/rte_jhash.h (100%)
 rename lib/{librte_hash => hash}/rte_thash.h (100%)
 rename lib/{librte_hash => hash}/version.map (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_common.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_internal.c (100%)
 create mode 100644 lib/ip_frag/meson.build
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag_common.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/version.map (100%)
 rename lib/{librte_ipsec => ipsec}/crypto.h (100%)
 rename lib/{librte_ipsec => ipsec}/esp_inb.c (100%)
 rename lib/{librte_ipsec => ipsec}/esp_outb.c (100%)
 rename lib/{librte_ipsec => ipsec}/iph.h (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sad.c (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sqn.h (100%)
 rename lib/{librte_ipsec => ipsec}/meson.build (100%)
 rename lib/{librte_ipsec => ipsec}/misc.h (100%)
 rename lib/{librte_ipsec => ipsec}/pad.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_group.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h (100%)
 rename lib/{librte_ipsec => ipsec}/sa.c (100%)
 rename lib/{librte_ipsec => ipsec}/sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/ses.c (100%)
 rename lib/{librte_ipsec => ipsec}/version.map (100%)
 rename lib/{librte_jobstats => jobstats}/meson.build (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.c (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.h (100%)
 rename lib/{librte_jobstats => jobstats}/version.map (100%)
 rename lib/{librte_kni => kni}/meson.build (79%)
 rename lib/{librte_kni => kni}/rte_kni.c (100%)
 rename lib/{librte_kni => kni}/rte_kni.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_common.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_fifo.h (100%)
 rename lib/{librte_kni => kni}/version.map (100%)
 rename lib/{librte_kvargs => kvargs}/meson.build (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.c (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.h (100%)
 rename lib/{librte_kvargs => kvargs}/version.map (100%)
 rename lib/{librte_latencystats => latencystats}/meson.build (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.c (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.h (100%)
 rename lib/{librte_latencystats => latencystats}/version.map (100%)
 delete mode 100644 lib/librte_acl/meson.build
 delete mode 100644 lib/librte_cmdline/meson.build
 delete mode 100644 lib/librte_eal/arm/include/meson.build
 delete mode 100644 lib/librte_eal/common/meson.build
 delete mode 100644 lib/librte_eal/freebsd/meson.build
 delete mode 100644 lib/librte_eal/include/meson.build
 delete mode 100644 lib/librte_eal/linux/meson.build
 delete mode 100644 lib/librte_eal/ppc/include/meson.build
 delete mode 100644 lib/librte_eal/unix/meson.build
 delete mode 100644 lib/librte_eal/windows/meson.build
 delete mode 100644 lib/librte_eal/x86/include/meson.build
 delete mode 100644 lib/librte_eal/x86/meson.build
 delete mode 100644 lib/librte_ethdev/meson.build
 delete mode 100644 lib/librte_eventdev/meson.build
 delete mode 100644 lib/librte_fib/meson.build
 delete mode 100644 lib/librte_gro/meson.build
 delete mode 100644 lib/librte_gso/meson.build
 delete mode 100644 lib/librte_ip_frag/meson.build
 delete mode 100644 lib/librte_mbuf/meson.build
 delete mode 100644 lib/librte_mempool/meson.build
 delete mode 100644 lib/librte_net/meson.build
 delete mode 100644 lib/librte_pipeline/meson.build
 delete mode 100644 lib/librte_port/meson.build
 delete mode 100644 lib/librte_power/meson.build
 delete mode 100644 lib/librte_ring/meson.build
 delete mode 100644 lib/librte_table/meson.build
 delete mode 100644 lib/librte_vhost/meson.build
 rename lib/{librte_lpm => lpm}/meson.build (71%)
 rename lib/{librte_lpm => lpm}/rte_lpm.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_altivec.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_neon.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sse.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sve.h (100%)
 rename lib/{librte_lpm => lpm}/version.map (100%)
 create mode 100644 lib/mbuf/meson.build
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_core.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h (100%)
 rename lib/{librte_mbuf => mbuf}/version.map (100%)
 rename lib/{librte_member => member}/meson.build (100%)
 rename lib/{librte_member => member}/rte_member.c (100%)
 rename lib/{librte_member => member}/rte_member.h (100%)
 rename lib/{librte_member => member}/rte_member_ht.c (100%)
 rename lib/{librte_member => member}/rte_member_ht.h (100%)
 rename lib/{librte_member => member}/rte_member_vbf.c (100%)
 rename lib/{librte_member => member}/rte_member_vbf.h (100%)
 rename lib/{librte_member => member}/rte_member_x86.h (100%)
 rename lib/{librte_member => member}/version.map (100%)
 rename lib/{librte_mempool => mempool}/mempool_trace_points.c (100%)
 create mode 100644 lib/mempool/meson.build
 rename lib/{librte_mempool => mempool}/rte_mempool.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops_default.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace_fp.h (100%)
 rename lib/{librte_mempool => mempool}/version.map (100%)
 rename lib/{librte_meter => meter}/meson.build (100%)
 rename lib/{librte_meter => meter}/rte_meter.c (100%)
 rename lib/{librte_meter => meter}/rte_meter.h (100%)
 rename lib/{librte_meter => meter}/version.map (100%)
 rename lib/{librte_metrics => metrics}/meson.build (83%)
 rename lib/{librte_metrics => metrics}/rte_metrics.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.h (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.h (100%)
 rename lib/{librte_metrics => metrics}/version.map (100%)
 create mode 100644 lib/net/meson.build
 rename lib/{librte_net => net}/net_crc.h (100%)
 rename lib/{librte_net => net}/net_crc_avx512.c (100%)
 rename lib/{librte_net => net}/net_crc_neon.c (100%)
 rename lib/{librte_net => net}/net_crc_sse.c (100%)
 rename lib/{librte_net => net}/rte_arp.c (100%)
 rename lib/{librte_net => net}/rte_arp.h (100%)
 rename lib/{librte_net => net}/rte_ecpri.h (100%)
 rename lib/{librte_net => net}/rte_esp.h (100%)
 rename lib/{librte_net => net}/rte_ether.c (100%)
 rename lib/{librte_net => net}/rte_ether.h (100%)
 rename lib/{librte_net => net}/rte_geneve.h (100%)
 rename lib/{librte_net => net}/rte_gre.h (100%)
 rename lib/{librte_net => net}/rte_gtp.h (100%)
 rename lib/{librte_net => net}/rte_higig.h (100%)
 rename lib/{librte_net => net}/rte_icmp.h (100%)
 rename lib/{librte_net => net}/rte_ip.h (100%)
 rename lib/{librte_net => net}/rte_mpls.h (100%)
 rename lib/{librte_net => net}/rte_net.c (100%)
 rename lib/{librte_net => net}/rte_net.h (100%)
 rename lib/{librte_net => net}/rte_net_crc.c (100%)
 rename lib/{librte_net => net}/rte_net_crc.h (100%)
 rename lib/{librte_net => net}/rte_sctp.h (100%)
 rename lib/{librte_net => net}/rte_tcp.h (100%)
 rename lib/{librte_net => net}/rte_udp.h (100%)
 rename lib/{librte_net => net}/rte_vxlan.h (100%)
 rename lib/{librte_net => net}/version.map (100%)
 rename lib/{librte_node => node}/ethdev_ctrl.c (100%)
 rename lib/{librte_node => node}/ethdev_rx.c (100%)
 rename lib/{librte_node => node}/ethdev_rx_priv.h (100%)
 rename lib/{librte_node => node}/ethdev_tx.c (100%)
 rename lib/{librte_node => node}/ethdev_tx_priv.h (100%)
 rename lib/{librte_node => node}/ip4_lookup.c (100%)
 rename lib/{librte_node => node}/ip4_lookup_neon.h (100%)
 rename lib/{librte_node => node}/ip4_lookup_sse.h (100%)
 rename lib/{librte_node => node}/ip4_rewrite.c (100%)
 rename lib/{librte_node => node}/ip4_rewrite_priv.h (100%)
 rename lib/{librte_node => node}/log.c (100%)
 rename lib/{librte_node => node}/meson.build (59%)
 rename lib/{librte_node => node}/node_private.h (100%)
 rename lib/{librte_node => node}/null.c (100%)
 rename lib/{librte_node => node}/pkt_cls.c (100%)
 rename lib/{librte_node => node}/pkt_cls_priv.h (100%)
 rename lib/{librte_node => node}/pkt_drop.c (100%)
 rename lib/{librte_node => node}/rte_node_eth_api.h (100%)
 rename lib/{librte_node => node}/rte_node_ip4_api.h (100%)
 rename lib/{librte_node => node}/version.map (100%)
 rename lib/{librte_pci => pci}/meson.build (100%)
 rename lib/{librte_pci => pci}/rte_pci.c (100%)
 rename lib/{librte_pci => pci}/rte_pci.h (100%)
 rename lib/{librte_pci => pci}/version.map (100%)
 rename lib/{librte_pdump => pdump}/meson.build (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.c (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.h (100%)
 rename lib/{librte_pdump => pdump}/version.map (100%)
 create mode 100644 lib/pipeline/meson.build
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_extern.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline_spec.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/version.map (100%)
 create mode 100644 lib/port/meson.build
 rename lib/{librte_port => port}/rte_port.h (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.c (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.h (100%)
 rename lib/{librte_port => port}/rte_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_port_frag.c (100%)
 rename lib/{librte_port => port}/rte_port_frag.h (100%)
 rename lib/{librte_port => port}/rte_port_kni.c (100%)
 rename lib/{librte_port => port}/rte_port_kni.h (100%)
 rename lib/{librte_port => port}/rte_port_ras.c (100%)
 rename lib/{librte_port => port}/rte_port_ras.h (100%)
 rename lib/{librte_port => port}/rte_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_port_sched.c (100%)
 rename lib/{librte_port => port}/rte_port_sched.h (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.h (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.c (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.h (100%)
 rename lib/{librte_port => port}/rte_swx_port.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.h (100%)
 rename lib/{librte_port => port}/version.map (100%)
 rename lib/{librte_power => power}/guest_channel.c (100%)
 rename lib/{librte_power => power}/guest_channel.h (100%)
 create mode 100644 lib/power/meson.build
 rename lib/{librte_power => power}/power_acpi_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.h (100%)
 rename lib/{librte_power => power}/power_common.c (100%)
 rename lib/{librte_power => power}/power_common.h (100%)
 rename lib/{librte_power => power}/power_kvm_vm.c (100%)
 rename lib/{librte_power => power}/power_kvm_vm.h (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.h (100%)
 rename lib/{librte_power => power}/rte_power.c (100%)
 rename lib/{librte_power => power}/rte_power.h (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.c (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.h (100%)
 rename lib/{librte_power => power}/rte_power_guest_channel.h (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.c (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.h (100%)
 rename lib/{librte_power => power}/version.map (100%)
 rename lib/{librte_rawdev => rawdev}/meson.build (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.c (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.h (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev_pmd.h (100%)
 rename lib/{librte_rawdev => rawdev}/version.map (100%)
 rename lib/{librte_rcu => rcu}/meson.build (100%)
 rename lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.c (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.h (100%)
 rename lib/{librte_rcu => rcu}/version.map (100%)
 rename lib/{librte_regexdev => regexdev}/meson.build (75%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.c (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_core.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_driver.h (100%)
 rename lib/{librte_regexdev => regexdev}/version.map (100%)
 rename lib/{librte_reorder => reorder}/meson.build (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.c (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.h (100%)
 rename lib/{librte_reorder => reorder}/version.map (100%)
 rename lib/{librte_rib => rib}/meson.build (100%)
 rename lib/{librte_rib => rib}/rte_rib.c (100%)
 rename lib/{librte_rib => rib}/rte_rib.h (100%)
 rename lib/{librte_rib => rib}/rte_rib6.c (100%)
 rename lib/{librte_rib => rib}/rte_rib6.h (100%)
 rename lib/{librte_rib => rib}/version.map (100%)
 create mode 100644 lib/ring/meson.build
 rename lib/{librte_ring => ring}/rte_ring.c (100%)
 rename lib/{librte_ring => ring}/rte_ring.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_c11_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_core.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_generic_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_zc.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/version.map (100%)
 rename lib/{librte_sched => sched}/meson.build (58%)
 rename lib/{librte_sched => sched}/rte_approx.c (100%)
 rename lib/{librte_sched => sched}/rte_approx.h (100%)
 rename lib/{librte_sched => sched}/rte_red.c (100%)
 rename lib/{librte_sched => sched}/rte_red.h (100%)
 rename lib/{librte_sched => sched}/rte_sched.c (100%)
 rename lib/{librte_sched => sched}/rte_sched.h (100%)
 rename lib/{librte_sched => sched}/rte_sched_common.h (100%)
 rename lib/{librte_sched => sched}/version.map (100%)
 rename lib/{librte_security => security}/meson.build (100%)
 rename lib/{librte_security => security}/rte_security.c (100%)
 rename lib/{librte_security => security}/rte_security.h (100%)
 rename lib/{librte_security => security}/rte_security_driver.h (100%)
 rename lib/{librte_security => security}/version.map (100%)
 rename lib/{librte_stack => stack}/meson.build (67%)
 rename lib/{librte_stack => stack}/rte_stack.c (100%)
 rename lib/{librte_stack => stack}/rte_stack.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_c11.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_generic.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_stubs.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.h (100%)
 rename lib/{librte_stack => stack}/stack_pvt.h (100%)
 rename lib/{librte_stack => stack}/version.map (100%)
 create mode 100644 lib/table/meson.build
 rename lib/{librte_table => table}/rte_lru.h (100%)
 rename lib/{librte_table => table}/rte_lru_arm64.h (100%)
 rename lib/{librte_table => table}/rte_lru_x86.h (100%)
 rename lib/{librte_table => table}/rte_swx_table.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.h (100%)
 rename lib/{librte_table => table}/rte_table.h (100%)
 rename lib/{librte_table => table}/rte_table_acl.c (100%)
 rename lib/{librte_table => table}/rte_table_acl.h (100%)
 rename lib/{librte_table => table}/rte_table_array.c (100%)
 rename lib/{librte_table => table}/rte_table_array.h (100%)
 rename lib/{librte_table => table}/rte_table_hash.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_ext.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_func.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_func_arm64.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_key16.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key32.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key8.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_lru.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.h (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.h (100%)
 rename lib/{librte_table => table}/rte_table_stub.c (100%)
 rename lib/{librte_table => table}/rte_table_stub.h (100%)
 rename lib/{librte_table => table}/version.map (100%)
 rename lib/{librte_telemetry => telemetry}/meson.build (80%)
 rename lib/{librte_telemetry => telemetry}/rte_telemetry.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_internal.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_json.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_legacy.c (100%)
 rename lib/{librte_telemetry => telemetry}/version.map (100%)
 rename lib/{librte_timer => timer}/meson.build (100%)
 rename lib/{librte_timer => timer}/rte_timer.c (100%)
 rename lib/{librte_timer => timer}/rte_timer.h (100%)
 rename lib/{librte_timer => timer}/version.map (100%)
 rename lib/{librte_vhost => vhost}/fd_man.c (100%)
 rename lib/{librte_vhost => vhost}/fd_man.h (100%)
 rename lib/{librte_vhost => vhost}/iotlb.c (100%)
 rename lib/{librte_vhost => vhost}/iotlb.h (100%)
 create mode 100644 lib/vhost/meson.build
 rename lib/{librte_vhost => vhost}/rte_vdpa.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa_dev.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_async.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/socket.c (100%)
 rename lib/{librte_vhost => vhost}/vdpa.c (100%)
 rename lib/{librte_vhost => vhost}/version.map (100%)
 rename lib/{librte_vhost => vhost}/vhost.c (100%)
 rename lib/{librte_vhost => vhost}/vhost.h (100%)
 rename lib/{librte_vhost => vhost}/vhost_crypto.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_net.c (100%)

--
2.27.0

[dpdk-dev] [PATCH 01/14] build: simplify library build file

[Bruce Richardson]

Two simplifications can be made to the build file which reduce indentation
levels and make it easier to read:

1. When meson build support was first added, the compat library existed in
DPDK as a single header file. Since that header has been merged into EAL,
we no longer need to support header-only libraries, so can shorten the
code.

2. From meson 0.49 onwards we have the "continue" keyword available to
break out of one loop iteration and begin the next. This allows us to
remove blocks in the build configuration file which were conditional on the
"build" variable being true. Instead we can use "continue" to abort
processing at the point where the "build" value becomes false.

Since this patch changes the indentation level of large parts of the
meson.build file, we use the opportunity to adjust the whitespace used to
the meson-standard 4-spec indentation level.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build | 303 +++++++++++++++++++++++-------------------------
 1 file changed, 147 insertions(+), 156 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 4eed83e57..95fcd0189 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -54,165 +54,156 @@ 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
 
 enabled_libs = [] # used to print summary at the end
 
 foreach l:libraries
-	build = true
-	reason = '<unknown reason>' # set if build == false to explain why
-	name = l
-	use_function_versioning = false
-	sources = []
-	headers = []
-	indirect_headers = [] # public headers not directly included by apps
-	driver_sdk_headers = [] # public headers included by drivers
-	includes = []
-	cflags = default_cflags
-	objs = [] # other object files to link against, used e.g. for
-	          # instruction-set optimized versions of code
-
-	# use "deps" for internal DPDK dependencies, and "ext_deps" for
-	# external package/library requirements
-	ext_deps = []
-	deps = []
-	# eal is standard dependency once built
-	if dpdk_conf.has('RTE_LIB_EAL')
-		deps += ['eal']
-	endif
-
-	dir_name = 'librte_' + l
-	subdir(dir_name)
-
-	if build
-		shared_deps = ext_deps
-		static_deps = ext_deps
-		foreach d:deps
-			if not is_variable('shared_rte_' + d)
-				error('Missing internal dependency "@0@" for @1@ [@2@]'
-						.format(d, name, 'lib/' + dir_name))
-			endif
-			shared_deps += [get_variable('shared_rte_' + d)]
-			static_deps += [get_variable('static_rte_' + d)]
-		endforeach
-	endif
-
-	if not build
-		dpdk_libs_disabled += name
-		set_variable(name.underscorify() + '_disable_reason', reason)
-	else
-		enabled_libs += name
-		dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
-		install_headers(headers)
-		install_headers(indirect_headers)
-		if get_option('enable_driver_sdk')
-			install_headers(driver_sdk_headers)
-		endif
-		dpdk_chkinc_headers += headers
-
-		libname = 'rte_' + name
-		includes += include_directories(dir_name)
-
-		if sources.length() == 0
-			# if no C files, just set a dependency on header path
-			shared_dep = declare_dependency(include_directories: includes)
-			static_dep = shared_dep
-		else
-			if is_windows and use_function_versioning and developer_mode
-				message('@0@: Function versioning is not supported by Windows.'
-						.format(name))
-			endif
-
-			if use_function_versioning
-				cflags += '-DRTE_USE_FUNCTION_VERSIONING'
-			endif
-
-			# first build static lib
-			static_lib = static_library(libname,
-					sources,
-					objects: objs,
-					c_args: cflags,
-					dependencies: static_deps,
-					include_directories: includes,
-					install: true)
-			static_dep = declare_dependency(
-					include_directories: includes,
-					dependencies: static_deps)
-
-			if not use_function_versioning or is_windows
-				# use pre-build objects to build shared lib
-				sources = []
-				objs += static_lib.extract_all_objects(recursive: false)
-			else
-				# for compat we need to rebuild with
-				# RTE_BUILD_SHARED_LIB defined
-				cflags += '-DRTE_BUILD_SHARED_LIB'
-			endif
-			version_map = '@0@/@1@/version.map'.format(
-					meson.current_source_dir(), dir_name)
-			implib = dir_name + '.dll.a'
-
-			def_file = custom_target(libname + '_def',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_exports.def'.format(libname))
-
-			mingw_map = custom_target(libname + '_mingw',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_mingw.map'.format(libname))
-
-			if is_ms_linker
-				lk_args = ['-Wl,/def:' + def_file.full_path()]
-				if meson.version().version_compare('<0.54.0')
-					lk_args += ['-Wl,/implib:lib\\' + implib]
-				endif
-			else
-				if is_windows
-					lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
-				else
-					lk_args = ['-Wl,--version-script=' + version_map]
-				endif
-			endif
-
-			lk_deps = [version_map, def_file, mingw_map]
-			if developer_mode and not is_windows
-				# on unix systems check the output of the
-				# check-symbols.sh script, using it as a
-				# dependency of the .so build
-				lk_deps += custom_target(name + '.sym_chk',
-					command: [check_symbols,
-						version_map, '@INPUT@'],
-					capture: true,
-					input: static_lib,
-					output: name + '.sym_chk')
-			endif
-
-			shared_lib = shared_library(libname,
-					sources,
-					objects: objs,
-					c_args: cflags,
-					dependencies: shared_deps,
-					include_directories: includes,
-					link_args: lk_args,
-					link_depends: lk_deps,
-					version: abi_version,
-					soversion: so_version,
-					install: true)
-			shared_dep = declare_dependency(link_with: shared_lib,
-					include_directories: includes,
-					dependencies: shared_deps)
-
-			dpdk_libraries = [shared_lib] + dpdk_libraries
-			dpdk_static_libraries = [static_lib] + dpdk_static_libraries
-		endif # sources.length() > 0
-
-		set_variable('shared_rte_' + name, shared_dep)
-		set_variable('static_rte_' + name, static_dep)
-		if developer_mode
-			message('lib/@0@: Defining dependency "@1@"'.format(
-					dir_name, name))
-		endif
-	endif # if build
+    build = true
+    reason = '<unknown reason>' # set if build == false to explain why
+    name = l
+    use_function_versioning = false
+    sources = []
+    headers = []
+    indirect_headers = [] # public headers not directly included by apps
+    driver_sdk_headers = [] # public headers included by drivers
+    includes = []
+    cflags = default_cflags
+    objs = [] # other object files to link against, used e.g. for
+              # instruction-set optimized versions of code
+
+    # use "deps" for internal DPDK dependencies, and "ext_deps" for
+    # external package/library requirements
+    ext_deps = []
+    deps = []
+    # eal is standard dependency once built
+    if dpdk_conf.has('RTE_LIB_EAL')
+        deps += ['eal']
+    endif
+
+    dir_name = 'librte_' + l
+    subdir(dir_name)
+
+    if not build
+        dpdk_libs_disabled += name
+        set_variable(name.underscorify() + '_disable_reason', reason)
+        continue
+    endif
+
+    shared_deps = ext_deps
+    static_deps = ext_deps
+    foreach d:deps
+        if not is_variable('shared_rte_' + d)
+            error('Missing internal dependency "@0@" for @1@ [@2@]'
+                    .format(d, name, 'lib/' + dir_name))
+        endif
+        shared_deps += [get_variable('shared_rte_' + d)]
+        static_deps += [get_variable('static_rte_' + d)]
+    endforeach
+
+    enabled_libs += name
+    dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
+    install_headers(headers)
+    install_headers(indirect_headers)
+    if get_option('enable_driver_sdk')
+        install_headers(driver_sdk_headers)
+    endif
+    dpdk_chkinc_headers += headers
+
+    libname = 'rte_' + name
+    includes += include_directories(dir_name)
+
+    if is_windows and use_function_versioning
+        message('@0@: Function versioning is not supported by Windows.'.format(name))
+    endif
+
+    if use_function_versioning
+        cflags += '-DRTE_USE_FUNCTION_VERSIONING'
+    endif
+
+    # first build static lib
+    static_lib = static_library(libname,
+            sources,
+            objects: objs,
+            c_args: cflags,
+            dependencies: static_deps,
+            include_directories: includes,
+            install: true)
+    static_dep = declare_dependency(
+            include_directories: includes,
+            dependencies: static_deps)
+
+    if not use_function_versioning or is_windows
+        # use pre-build objects to build shared lib
+        sources = []
+        objs += static_lib.extract_all_objects(recursive: false)
+    else
+        # for compat we need to rebuild with
+        # RTE_BUILD_SHARED_LIB defined
+        cflags += '-DRTE_BUILD_SHARED_LIB'
+    endif
+    version_map = '@0@/@1@/version.map'.format(
+            meson.current_source_dir(), dir_name)
+    implib = dir_name + '.dll.a'
+
+    def_file = custom_target(libname + '_def',
+            command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+            input: version_map,
+            output: '@0@_exports.def'.format(libname))
+
+    mingw_map = custom_target(libname + '_mingw',
+            command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+            input: version_map,
+            output: '@0@_mingw.map'.format(libname))
+
+    if is_ms_linker
+        lk_args = ['-Wl,/def:' + def_file.full_path()]
+        if meson.version().version_compare('<0.54.0')
+            lk_args += ['-Wl,/implib:lib\\' + implib]
+        endif
+    else
+        if is_windows
+            lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
+        else
+            lk_args = ['-Wl,--version-script=' + version_map]
+        endif
+    endif
+
+    lk_deps = [version_map, def_file, mingw_map]
+    if not is_windows
+        # on unix systems check the output of the
+        # check-symbols.sh script, using it as a
+        # dependency of the .so build
+        lk_deps += custom_target(name + '.sym_chk',
+                command: [check_symbols,
+                    version_map, '@INPUT@'],
+                capture: true,
+                input: static_lib,
+                output: name + '.sym_chk')
+    endif
+
+    shared_lib = shared_library(libname,
+            sources,
+            objects: objs,
+            c_args: cflags,
+            dependencies: shared_deps,
+            include_directories: includes,
+            link_args: lk_args,
+            link_depends: lk_deps,
+            version: abi_version,
+            soversion: so_version,
+            install: true)
+    shared_dep = declare_dependency(link_with: shared_lib,
+            include_directories: includes,
+            dependencies: shared_deps)
+
+    dpdk_libraries = [shared_lib] + dpdk_libraries
+    dpdk_static_libraries = [static_lib] + dpdk_static_libraries
+
+    set_variable('shared_rte_' + name, shared_dep)
+    set_variable('static_rte_' + name, static_dep)
+    if developer_mode
+        message('lib/@0@: Defining dependency "@1@"'.format(dir_name, name))
+    endif
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH 02/14] build: tidy up list of libraries to build

[Bruce Richardson]

With the lib/meson.build file changed from C-style indentation to
python-style indentation, we need to correct the indentation of the lists
of libraries, since these libs were not modified in the previous patches.
For ease of management of the list and working with patches for adding
to the list, put each library on it's own line.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build | 104 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 95fcd0189..9b99aa0be 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -9,44 +9,76 @@
 # given as a dep, no need to mention ring. This is especially true for the
 # core libs which are widely reused, so their deps are kept to a minimum.
 libraries = [
-	'kvargs', # eal depends on kvargs
-	'telemetry', # basic info querying
-	'eal', # everything depends on eal
-	'ring',
-	'rcu', # rcu depends on ring
-	'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
-	'cmdline',
-	'metrics', # bitrate/latency stats depends on this
-	'hash',    # efd depends on this
-	'timer',   # eventdev depends on this
-	'acl', 'bbdev', 'bitratestats', 'cfgfile',
-	'compressdev', 'cryptodev',
-	'distributor', 'efd', 'eventdev',
-	'gro', 'gso', 'ip_frag', 'jobstats',
-	'kni', 'latencystats', 'lpm', 'member',
-	'power', 'pdump', 'rawdev', 'regexdev',
-	'rib', 'reorder', 'sched', 'security', 'stack', 'vhost',
-	# ipsec lib depends on net, crypto and security
-	'ipsec',
-	#fib lib depends on rib
-	'fib',
-	# add pkt framework libs which use other libs from above
-	'port', 'table', 'pipeline',
-	# flow_classify lib depends on pkt framework table lib
-	'flow_classify', 'bpf', 'graph', 'node']
+        'kvargs', # eal depends on kvargs
+        'telemetry', # basic info querying
+        'eal', # everything depends on eal
+        'ring',
+        'rcu', # rcu depends on ring
+        'mempool',
+        'mbuf',
+        'net',
+        'meter',
+        'ethdev',
+        'pci', # core
+        'cmdline',
+        'metrics', # bitrate/latency stats depends on this
+        'hash',    # efd depends on this
+        'timer',   # eventdev depends on this
+        'acl',
+        'bbdev',
+        'bitratestats',
+        'cfgfile',
+        'compressdev',
+        'cryptodev',
+        'distributor',
+        'efd',
+        'eventdev',
+        'gro',
+        'gso',
+        'ip_frag',
+        'jobstats',
+        'kni',
+        'latencystats',
+        'lpm',
+        'member',
+        'power',
+        'pdump',
+        'rawdev',
+        'regexdev',
+        'rib',
+        'reorder',
+        'sched',
+        'security',
+        'stack',
+        'vhost',
+        'ipsec', # ipsec lib depends on net, crypto and security
+        'fib', #fib lib depends on rib
+        'port', # pkt framework libs which use other libs from above
+        'table',
+        'pipeline',
+        'flow_classify', # flow_classify lib depends on pkt framework table lib
+        'bpf',
+        'graph',
+        'node',
+]
 
 if is_windows
-	libraries = [
-		'kvargs',
-		'telemetry',
-		'eal',
-		'ring',
-		'rcu',
-		'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
-		'cmdline',
-		'hash',
-		'cfgfile',
-	] # only supported libraries for windows
+    libraries = [
+            'kvargs',
+            'telemetry',
+            'eal',
+            'ring',
+            'rcu',
+            'mempool',
+            'mbuf',
+            'net',
+            'meter',
+            'ethdev',
+            'pci',
+            'cmdline',
+            'hash',
+            'cfgfile',
+    ] # only supported libraries for windows
 endif
 
 default_cflags = machine_args
-- 
2.27.0

[dpdk-dev] [PATCH 03/14] build: simplify the driver build configuration file

[Bruce Richardson]

As with the library meson.build file, we can use the "continue" keyword to
reduce the level of indentation used for the majority of the build file.
Since we are changing the whitespace indentation level, we also update the
body of the foreach loop to use the meson standard, 4-space indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/meson.build | 384 ++++++++++++++++++++++----------------------
 1 file changed, 189 insertions(+), 195 deletions(-)

diff --git a/drivers/meson.build b/drivers/meson.build
index 9aa86e7ed..f90330b5a 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -49,199 +49,193 @@ if cc.has_argument('-Wno-format-truncation')
 endif
 
 foreach subpath:subdirs
-	drivers = []
-	std_deps = []
-
-	# subpath can be either "class" or "class/driver"
-	if subpath.contains('/')
-		driver_path = subpath.split('/')
-		class = driver_path[0]
-		drivers += driver_path[1]
-	else
-		class = subpath
-		subdir(class)
-	endif
-
-	# save class name on first occurrence
-	if not dpdk_driver_classes.contains(class)
-		dpdk_driver_classes += class
-	endif
-	# get already enabled drivers of the same class
-	enabled_drivers = get_variable(class + '_drivers', [])
-
-	foreach drv:drivers
-		drv_path = join_paths(class, drv)
-
-		# set up empty variables used for build
-		build = true # set to false to disable, e.g. missing deps
-		reason = '<unknown reason>' # set if build == false to explain
-		name = drv
-		sources = []
-		headers = []
-		objs = []
-		cflags = default_cflags
-		includes = [include_directories(drv_path)]
-		# set up internal deps. Drivers can append/override as necessary
-		deps = std_deps
-		# ext_deps: Stores external library dependency got
-		# using dependency() (preferred) or find_library().
-		# For the find_library() case (but not with dependency()) we also
-		# need to specify the "-l" flags in pkgconfig_extra_libs variable
-		# too, so that it can be reflected in the pkgconfig output for
-		# static builds.
-		ext_deps = []
-		pkgconfig_extra_libs = []
-
-		if not enable_drivers.contains(drv_path)
-			build = false
-			reason = 'not in enabled drivers build config'
-		elif disable_drivers.contains(drv_path)
-			if always_enable.contains(drv_path)
-				message('Driver @0@ cannot be disabled, not disabling.'.format(drv_path))
-			else
-				build = false
-				reason = 'explicitly disabled via build config'
-			endif
-		else
-			# pull in driver directory which should update all the local variables
-			subdir(drv_path)
-		endif
-
-		if build
-			# get dependency objs from strings
-			shared_deps = ext_deps
-			static_deps = ext_deps
-			foreach d:deps
-				if not is_variable('shared_rte_' + d)
-					build = false
-					reason = 'missing internal dependency, "@0@"'.format(d)
-					message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
-							.format(d, name, 'drivers/' + drv_path))
-				else
-					shared_deps += [get_variable('shared_rte_' + d)]
-					static_deps += [get_variable('static_rte_' + d)]
-				endif
-			endforeach
-		endif
-
-		if not build
-			# some driver directories are placeholders which
-			# are never built, so we allow suppression of the
-			# component disable printout in those cases
-			if reason != ''
-				dpdk_drvs_disabled += drv_path
-				set_variable(drv_path.underscorify() +
-						'_disable_reason', reason)
-			endif
-		else
-			enabled_drivers += name
-			lib_name = '_'.join(['rte', class, name])
-			dpdk_conf.set(lib_name.to_upper(), 1)
-
-			dpdk_extra_ldflags += pkgconfig_extra_libs
-
-			install_headers(headers)
-
-			# generate pmdinfo sources by building a temporary
-			# lib and then running pmdinfogen on the contents of
-			# that lib. The final lib reuses the object files and
-			# adds in the new source file.
-			out_filename = lib_name + '.pmd.c'
-			tmp_lib = static_library('tmp_' + lib_name,
-					sources,
-					include_directories: includes,
-					dependencies: static_deps,
-					c_args: cflags)
-			objs += tmp_lib.extract_all_objects()
-			sources = custom_target(out_filename,
-					command: [pmdinfo, tmp_lib.full_path(),
-						'@OUTPUT@', pmdinfogen],
-					output: out_filename,
-					depends: [tmp_lib])
-
-			# now build the static driver
-			static_lib = static_library(lib_name,
-				sources,
-				objects: objs,
-				include_directories: includes,
-				dependencies: static_deps,
-				c_args: cflags,
-				install: true)
-
-			# now build the shared driver
-			version_map = '@0@/@1@/version.map'.format(
-					meson.current_source_dir(),
-					drv_path)
-			implib = 'lib' + lib_name + '.dll.a'
-
-			def_file = custom_target(lib_name + '_def',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_exports.def'.format(lib_name))
-
-			mingw_map = custom_target(lib_name + '_mingw',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_mingw.map'.format(lib_name))
-
-			lk_deps = [version_map, def_file, mingw_map]
-			if is_windows
-				if is_ms_linker
-					lk_args = ['-Wl,/def:' + def_file.full_path()]
-					if meson.version().version_compare('<0.54.0')
-						lk_args += ['-Wl,/implib:drivers\\' + implib]
-					endif
-				else
-					lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
-				endif
-			else
-				lk_args = ['-Wl,--version-script=' + version_map]
-				if developer_mode
-					# on unix systems check the output of the
-					# check-symbols.sh script, using it as a
-					# dependency of the .so build
-					lk_deps += custom_target(lib_name + '.sym_chk',
-						command: [check_symbols,
-							version_map, '@INPUT@'],
-						capture: true,
-						input: static_lib,
-						output: lib_name + '.sym_chk')
-				endif
-			endif
-
-			shared_lib = shared_library(lib_name,
-				sources,
-				objects: objs,
-				include_directories: includes,
-				dependencies: shared_deps,
-				c_args: cflags,
-				link_args: lk_args,
-				link_depends: lk_deps,
-				version: abi_version,
-				soversion: so_version,
-				install: true,
-				install_dir: driver_install_path)
-
-			# create a dependency object and add it to the global dictionary so
-			# testpmd or other built-in apps can find it if necessary
-			shared_dep = declare_dependency(link_with: shared_lib,
-					include_directories: includes,
-					dependencies: shared_deps)
-			static_dep = declare_dependency(
-					include_directories: includes,
-					dependencies: static_deps)
-
-			dpdk_drivers += static_lib
-
-			set_variable('shared_@0@'.format(lib_name), shared_dep)
-			set_variable('static_@0@'.format(lib_name), static_dep)
-			dependency_name = ''.join(lib_name.split('rte_'))
-			if developer_mode
-				message('drivers/@0@: Defining dependency "@1@"'.format(
-						drv_path, dependency_name))
-			endif
-		endif # build
-	endforeach
-
-	set_variable(class + '_drivers', enabled_drivers)
+    drivers = []
+    std_deps = []
+
+    # subpath can be either "class" or "class/driver"
+    if subpath.contains('/')
+        driver_path = subpath.split('/')
+        class = driver_path[0]
+        drivers += driver_path[1]
+    else
+        class = subpath
+        subdir(class)
+    endif
+
+    # save class name on first occurrence
+    if not dpdk_driver_classes.contains(class)
+        dpdk_driver_classes += class
+    endif
+    # get already enabled drivers of the same class
+    enabled_drivers = get_variable(class + '_drivers', [])
+
+    foreach drv:drivers
+        drv_path = join_paths(class, drv)
+
+        # set up empty variables used for build
+        build = true # set to false to disable, e.g. missing deps
+        reason = '<unknown reason>' # set if build == false to explain
+        name = drv
+        sources = []
+        headers = []
+        objs = []
+        cflags = default_cflags
+        includes = [include_directories(drv_path)]
+        # set up internal deps. Drivers can append/override as necessary
+        deps = std_deps
+        # ext_deps: Stores external library dependency got
+        # using dependency() (preferred) or find_library().
+        # For the find_library() case (but not with dependency()) we also
+        # need to specify the "-l" flags in pkgconfig_extra_libs variable
+        # too, so that it can be reflected in the pkgconfig output for
+        # static builds.
+        ext_deps = []
+        pkgconfig_extra_libs = []
+
+        if not enable_drivers.contains(drv_path)
+            build = false
+            reason = 'not in enabled drivers build config'
+        elif disable_drivers.contains(drv_path)
+            if always_enable.contains(drv_path)
+                message('Driver @0@ cannot be disabled, not disabling.'.format(drv_path))
+            else
+                build = false
+                reason = 'explicitly disabled via build config'
+            endif
+        else
+            # pull in driver directory which should update all the local variables
+            subdir(drv_path)
+        endif
+
+        if build
+            # get dependency objs from strings
+            shared_deps = ext_deps
+            static_deps = ext_deps
+            foreach d:deps
+                if not is_variable('shared_rte_' + d)
+                    build = false
+                    reason = 'missing internal dependency, "@0@"'.format(d)
+                    message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
+                            .format(d, name, 'drivers/' + drv_path))
+                else
+                    shared_deps += [get_variable('shared_rte_' + d)]
+                    static_deps += [get_variable('static_rte_' + d)]
+                endif
+            endforeach
+        endif
+
+        if not build
+            # some driver directories are placeholders which
+            # are never built, so we allow suppression of the
+            # component disable printout in those cases
+            if reason != ''
+                dpdk_drvs_disabled += drv_path
+                set_variable(drv_path.underscorify() + '_disable_reason', reason)
+            endif
+            continue
+        endif
+
+        enabled_drivers += name
+        lib_name = '_'.join(['rte', class, name])
+        dpdk_conf.set(lib_name.to_upper(), 1)
+
+        dpdk_extra_ldflags += pkgconfig_extra_libs
+
+        install_headers(headers)
+
+        # generate pmdinfo sources by building a temporary
+        # lib and then running pmdinfogen on the contents of
+        # that lib. The final lib reuses the object files and
+        # adds in the new source file.
+        out_filename = lib_name + '.pmd.c'
+        tmp_lib = static_library('tmp_' + lib_name, sources,
+                include_directories: includes,
+                dependencies: static_deps,
+                c_args: cflags)
+        objs += tmp_lib.extract_all_objects()
+        sources = custom_target(out_filename,
+                command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
+                output: out_filename,
+                depends: [tmp_lib])
+
+        # now build the static driver
+        static_lib = static_library(lib_name,
+                sources,
+                objects: objs,
+                include_directories: includes,
+                dependencies: static_deps,
+                c_args: cflags,
+                install: true)
+
+        # now build the shared driver
+        version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path)
+        implib = 'lib' + lib_name + '.dll.a'
+
+        def_file = custom_target(lib_name + '_def',
+                command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+                input: version_map,
+                output: '@0@_exports.def'.format(lib_name))
+
+        mingw_map = custom_target(lib_name + '_mingw',
+                command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+                input: version_map,
+                output: '@0@_mingw.map'.format(lib_name))
+
+        lk_deps = [version_map, def_file, mingw_map]
+        if is_windows
+            if is_ms_linker
+                lk_args = ['-Wl,/def:' + def_file.full_path()]
+                if meson.version().version_compare('<0.54.0')
+                    lk_args += ['-Wl,/implib:drivers\\' + implib]
+                endif
+            else
+                lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
+            endif
+        else
+            lk_args = ['-Wl,--version-script=' + version_map]
+            if developer_mode
+                # on unix systems check the output of the
+                # check-symbols.sh script, using it as a
+                # dependency of the .so build
+                lk_deps += custom_target(lib_name + '.sym_chk',
+                        command: [check_symbols, version_map, '@INPUT@'],
+                        capture: true,
+                        input: static_lib,
+                        output: lib_name + '.sym_chk')
+            endif
+        endif
+
+        shared_lib = shared_library(lib_name, sources,
+                objects: objs,
+                include_directories: includes,
+                dependencies: shared_deps,
+                c_args: cflags,
+                link_args: lk_args,
+                link_depends: lk_deps,
+                version: abi_version,
+                soversion: so_version,
+                install: true,
+                install_dir: driver_install_path)
+
+        # create a dependency object and add it to the global dictionary so
+        # testpmd or other built-in apps can find it if necessary
+        shared_dep = declare_dependency(link_with: shared_lib,
+                include_directories: includes,
+                dependencies: shared_deps)
+        static_dep = declare_dependency(
+                include_directories: includes,
+                dependencies: static_deps)
+
+        dpdk_drivers += static_lib
+
+        set_variable('shared_@0@'.format(lib_name), shared_dep)
+        set_variable('static_@0@'.format(lib_name), static_dep)
+        dependency_name = ''.join(lib_name.split('rte_'))
+        if developer_mode
+            message('drivers/@0@: Defining dependency "@1@"'.format(
+                    drv_path, dependency_name))
+        endif
+    endforeach
+
+    set_variable(class + '_drivers', enabled_drivers)
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH 04/14] build: clean up driver lists

[Bruce Richardson]

Ensure all lists of drivers are standardized:
* one driver per line
* lists double-indented with spaces (as they are line continuations)
* elements in alphabetical order
* opening and closing list brackets "[" & "]" on own lines
* last element has trailing comma

Any code snippets in the list files is adjusted to single-indent using
whitespace to correspond to the new style also.

The lists of standard library dependencies per class, and other short
lists are not formatted one-per-line as these lists are not expected to
grow beyond 2 or 3 entries.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/baseband/meson.build |  10 +++-
 drivers/bus/meson.build      |   9 ++-
 drivers/common/meson.build   |   9 ++-
 drivers/compress/meson.build |   9 ++-
 drivers/crypto/meson.build   |  42 +++++++-------
 drivers/event/meson.build    |  18 ++++--
 drivers/mempool/meson.build  |  12 +++-
 drivers/meson.build          |  38 ++++++------
 drivers/net/meson.build      | 108 ++++++++++++++++++-----------------
 drivers/raw/meson.build      |  17 ++++--
 drivers/regex/meson.build    |   5 +-
 drivers/vdpa/meson.build     |   8 ++-
 12 files changed, 171 insertions(+), 114 deletions(-)

diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build
index 920e3b02e..c98ebd902 100644
--- a/drivers/baseband/meson.build
+++ b/drivers/baseband/meson.build
@@ -2,7 +2,13 @@
 # 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 = [
+        'acc100',
+        'fpga_5gnr_fec',
+        'fpga_lte_fec',
+        'null',
+        'turbo_sw',
+]
diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build
index 2e7727af0..c770c6ba1 100644
--- a/drivers/bus/meson.build
+++ b/drivers/bus/meson.build
@@ -1,5 +1,12 @@
 # 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 9fdfc2451..4acbad60b 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -2,4 +2,11 @@
 # Copyright(c) 2018 Cavium, Inc
 
 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 49fa02d4c..abe043ab9 100644
--- a/drivers/compress/meson.build
+++ b/drivers/compress/meson.build
@@ -2,9 +2,14 @@
 # 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 c927c5f8d..b9fdf9392 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,27 +2,29 @@
 # 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']
+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',
+]
 
 std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index b7f9bf7c6..539c5aeb9 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -2,13 +2,21 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	subdir_done()
+    subdir_done()
 endif
 
-drivers = ['dlb2', 'dpaa', 'dpaa2', 'octeontx2', 'opdl', 'skeleton', 'sw',
-	   'dsw']
+drivers = [
+        'dlb2',
+        'dpaa',
+        'dpaa2',
+        'dsw',
+        'octeontx2',
+        'opdl',
+        'skeleton',
+        'sw',
+]
 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 a2814c1df..caaffc380 100644
--- a/drivers/mempool/meson.build
+++ b/drivers/mempool/meson.build
@@ -1,6 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['bucket', 'cnxk', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring',
-	   'stack']
+drivers = [
+        'bucket',
+        'cnxk',
+        'dpaa',
+        'dpaa2',
+        'octeontx',
+        'octeontx2',
+        'ring',
+        'stack',
+]
 std_deps = ['mempool']
diff --git a/drivers/meson.build b/drivers/meson.build
index f90330b5a..b78cac389 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -3,26 +3,26 @@
 
 # Defines the order of dependencies evaluation
 subdirs = [
-	'common',
-	'bus',
-	'common/cnxk', # depends on 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/cnxk',    # depends on 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.
 ]
 
 if meson.is_cross_build()
-	disable_drivers += ',' + meson.get_cross_property('disable_drivers', '')
-	enable_drivers += ',' + meson.get_cross_property('enable_drivers', '')
+    disable_drivers += ',' + meson.get_cross_property('disable_drivers', '')
+    enable_drivers += ',' + meson.get_cross_property('enable_drivers', '')
 endif
 
 # add cmdline disabled drivers and meson disabled drivers together
@@ -33,7 +33,7 @@ disable_drivers = run_command(list_dir_globs, disable_drivers).stdout().split()
 enable_drivers = ',' + get_option('enable_drivers')
 enable_drivers = run_command(list_dir_globs, enable_drivers).stdout().split()
 if enable_drivers.length() == 0
-	enable_drivers = run_command(list_dir_globs, '*/*').stdout().split()
+    enable_drivers = run_command(list_dir_globs, '*/*').stdout().split()
 endif
 
 # these drivers must always be enabled, otherwise the build breaks
@@ -45,7 +45,7 @@ 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 fb9ff05a1..c8b5ce298 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -2,58 +2,62 @@
 # Copyright(c) 2017 Intel Corporation
 
 
-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',
+drivers = [
+        'af_packet',
+        'af_xdp',
+        'ark',
+        'atlantic',
+        'avp',
+        'axgbe',
+        'bnx2x',
+        'bnxt',
+        'bonding',
+        'cxgbe',
+        'dpaa',
+        'dpaa2',
+        'e1000',
+        'ena',
+        'enetc',
+        'enic',
+        'failsafe',
+        'fm10k',
+        'hinic',
+        'hns3',
+        'i40e',
+        '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 8c3a036df..c33a7c5f3 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -2,12 +2,17 @@
 # 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 2d05d5af1..94222e55f 100644
--- a/drivers/regex/meson.build
+++ b/drivers/regex/meson.build
@@ -1,5 +1,8 @@
 # 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 4929be4c0..f765fe398 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -2,10 +2,12 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if is_windows
-	subdir_done()
+    subdir_done()
 endif
 
-drivers = ['ifc',
-	   'mlx5',]
+drivers = [
+        'ifc',
+        'mlx5',
+]
 std_deps = ['bus_pci', 'kvargs']
 std_deps += ['vhost']
-- 
2.27.0

[dpdk-dev] [PATCH 05/14] build: reduce indentation in app build spec

[Bruce Richardson]

As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/meson.build | 101 ++++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/app/meson.build b/app/meson.build
index 50a53dbde..35e53861b 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -2,71 +2,72 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 if is_windows
-	subdir_done()
+    subdir_done()
 endif
 
 apps = [
-	'pdump',
-	'proc-info',
-	'test-acl',
-	'test-bbdev',
-	'test-cmdline',
-	'test-compress-perf',
-	'test-crypto-perf',
-	'test-eventdev',
-	'test-fib',
-	'test-flow-perf',
-	'test-pipeline',
-	'test-pmd',
-	'test-regex',
-	'test-sad']
+        'pdump',
+        'proc-info',
+        'test-acl',
+        'test-bbdev',
+        'test-cmdline',
+        'test-compress-perf',
+        'test-crypto-perf',
+        'test-eventdev',
+        'test-fib',
+        'test-flow-perf',
+        'test-pipeline',
+        'test-pmd',
+        'test-regex',
+        'test-sad',
+]
 
 default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
 default_ldflags = []
 if get_option('default_library') == 'static' and not is_windows
-	default_ldflags += ['-Wl,--export-dynamic']
+    default_ldflags += ['-Wl,--export-dynamic']
 endif
 
 foreach app:apps
-	build = true
-	name = app
-	sources = []
-	includes = []
-	cflags = default_cflags
-	ldflags = default_ldflags
-	objs = [] # other object files to link against, used e.g. for
-	          # instruction-set optimized versions of code
+    build = true
+    name = app
+    sources = []
+    includes = []
+    cflags = default_cflags
+    ldflags = default_ldflags
+    objs = [] # other object files to link against, used e.g. for
+              # instruction-set optimized versions of code
 
-	# use "deps" for internal DPDK dependencies, and "ext_deps" for
-	# external package/library requirements
-	ext_deps = []
-	deps = []
+    # use "deps" for internal DPDK dependencies, and "ext_deps" for
+    # external package/library requirements
+    ext_deps = []
+    deps = []
 
-	subdir(name)
+    subdir(name)
 
-	if build
-		dep_objs = []
-		foreach d:deps
-			dep_objs += get_variable(get_option('default_library')
-				 + '_rte_' + d)
-		endforeach
+    if not build
+        continue
+    endif
 
-		link_libs = []
-		if get_option('default_library') == 'static'
-			link_libs = dpdk_static_libraries + dpdk_drivers
-		endif
+    dep_objs = []
+    foreach d:deps
+        dep_objs += get_variable(get_option('default_library') + '_rte_' + d)
+    endforeach
 
-		executable('dpdk-' + name,
-				sources,
-				c_args: cflags,
-				link_args: ldflags,
-				link_whole: link_libs,
-				dependencies: dep_objs,
-				include_directories: includes,
-				install_rpath: join_paths(get_option('prefix'),
-						 driver_install_path),
-				install: true)
-	endif
+    link_libs = []
+    if get_option('default_library') == 'static'
+        link_libs = dpdk_static_libraries + dpdk_drivers
+    endif
+
+    executable('dpdk-' + name,
+            sources,
+            c_args: cflags,
+            link_args: ldflags,
+            link_whole: link_libs,
+            dependencies: dep_objs,
+            include_directories: includes,
+            install_rpath: join_paths(get_option('prefix'), driver_install_path),
+            install: true)
 endforeach
 
 # special case the autotests
-- 
2.27.0

[dpdk-dev] [PATCH 06/14] build: reduce indentation in examples build spec

[Bruce Richardson]

As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/meson.build | 177 ++++++++++++++++++++++++-------------------
 1 file changed, 99 insertions(+), 78 deletions(-)

diff --git a/examples/meson.build b/examples/meson.build
index d065a6a08..07e682401 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -3,109 +3,130 @@
 
 link_whole_libs = []
 if get_option('default_library') == 'static'
-	link_whole_libs = dpdk_static_libraries + dpdk_drivers
+    link_whole_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 # list of all example apps. Keep 1-3 per line, in alphabetical order.
 all_examples = [
-	'bbdev_app', 'bond',
-	'cmdline',
-	'distributor', 'ethtool',
-	'eventdev_pipeline',
-	'fips_validation', 'flow_classify',
-	'flow_filtering', 'helloworld',
-	'ioat',
-	'ip_fragmentation', 'ip_pipeline',
-	'ip_reassembly', 'ipsec-secgw',
-	'ipv4_multicast', 'kni',
-	'l2fwd', 'l2fwd-cat', 'l2fwd-event',
-	'l2fwd-crypto', 'l2fwd-jobstats',
-	'l2fwd-keepalive', 'l3fwd',
-	'l3fwd-acl', 'l3fwd-power', 'l3fwd-graph',
-	'link_status_interrupt',
-	'multi_process/client_server_mp/mp_client',
-	'multi_process/client_server_mp/mp_server',
-	'multi_process/hotplug_mp',
-	'multi_process/simple_mp',
-	'multi_process/symmetric_mp',
-	'ntb', 'packet_ordering',
-	'performance-thread/l3fwd-thread',
-	'performance-thread/pthread_shim',
-	'pipeline',
-	'ptpclient',
-	'qos_meter', 'qos_sched',
-	'rxtx_callbacks',
-	'server_node_efd/node',
-	'server_node_efd/server',
-	'service_cores',
-	'skeleton',
-	'timer', 'vdpa',
-	'vhost', 'vhost_crypto',
-	'vhost_blk', 'vm_power_manager',
-	'vm_power_manager/guest_cli',
-	'vmdq', 'vmdq_dcb',
+        'bbdev_app',
+        'bond',
+        'cmdline',
+        'distributor',
+        'ethtool',
+        'eventdev_pipeline',
+        'fips_validation',
+        'flow_classify',
+        'flow_filtering',
+        'helloworld',
+        'ioat',
+        'ip_fragmentation',
+        'ip_pipeline',
+        'ip_reassembly',
+        'ipsec-secgw',
+        'ipv4_multicast',
+        'kni',
+        'l2fwd',
+        'l2fwd-cat',
+        'l2fwd-crypto',
+        'l2fwd-event',
+        'l2fwd-jobstats',
+        'l2fwd-keepalive',
+        'l3fwd',
+        'l3fwd-acl',
+        'l3fwd-graph',
+        'l3fwd-power',
+        'link_status_interrupt',
+        'multi_process/client_server_mp/mp_client',
+        'multi_process/client_server_mp/mp_server',
+        'multi_process/hotplug_mp',
+        'multi_process/simple_mp',
+        'multi_process/symmetric_mp',
+        'ntb',
+        'packet_ordering',
+        'performance-thread/l3fwd-thread',
+        'performance-thread/pthread_shim',
+        'pipeline',
+        'ptpclient',
+        'qos_meter',
+        'qos_sched',
+        'rxtx_callbacks',
+        'server_node_efd/node',
+        'server_node_efd/server',
+        'service_cores',
+        'skeleton',
+        'timer',
+        'vdpa',
+        'vhost',
+        'vhost_blk',
+        'vhost_crypto',
+        'vm_power_manager',
+        'vm_power_manager/guest_cli',
+        'vmdq',
+        'vmdq_dcb',
 ]
 
 # on install, skip copying all meson.build files
 ex_file_excludes = ['meson.build']
 foreach ex:all_examples
-	ex_file_excludes += [ex + '/meson.build']
+    ex_file_excludes += [ex + '/meson.build']
 endforeach
 
 if get_option('examples') == ''
-	subdir_done()
+    subdir_done()
 endif
 
 if get_option('examples').to_lower() == 'all'
-	examples = all_examples
-	allow_skips = true # don't flag an error if we can't build an app
+    examples = all_examples
+    allow_skips = true # don't flag an error if we can't build an app
 else
-	examples = get_option('examples').split(',')
-	allow_skips = false # error out if we can't build a requested app
+    examples = get_option('examples').split(',')
+    allow_skips = false # error out if we can't build a requested app
 endif
 default_cflags = machine_args
 if cc.has_argument('-Wno-format-truncation')
-	default_cflags += '-Wno-format-truncation'
+    default_cflags += '-Wno-format-truncation'
 endif
 default_ldflags = dpdk_extra_ldflags
 if get_option('default_library') == 'static' and not is_windows
-	default_ldflags += ['-Wl,--export-dynamic']
+    default_ldflags += ['-Wl,--export-dynamic']
 endif
 
 foreach example: examples
-	name = example.split('/')[-1]
-	build = true
-	sources = []
-	allow_experimental_apis = false
-	cflags = default_cflags
-	ldflags = default_ldflags
+    name = example.split('/')[-1]
+    build = true
+    sources = []
+    allow_experimental_apis = false
+    cflags = default_cflags
+    ldflags = default_ldflags
 
-	ext_deps = []
-	includes = [include_directories(example)]
-	deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
-	subdir(example)
+    ext_deps = []
+    includes = [include_directories(example)]
+    deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
+    subdir(example)
 
-	if build
-		dep_objs = ext_deps
-		foreach d:deps
-			var_name = get_option('default_library') + '_rte_' + d
-			if not is_variable(var_name)
-				error('Missing dependency "@0@" for example "@1@"'.format(d, name))
-			endif
-			dep_objs += [get_variable(var_name)]
-		endforeach
-		if allow_experimental_apis
-			cflags += '-DALLOW_EXPERIMENTAL_API'
-		endif
-		executable('dpdk-' + name, sources,
-			include_directories: includes,
-			link_whole: link_whole_libs,
-			link_args: ldflags,
-			c_args: cflags,
-			dependencies: dep_objs)
-	elif not allow_skips
-		error('Cannot build requested example "' + name + '"')
-	else
-		message('Skipping example "' + name + '"')
-	endif
+    if not build
+        if not allow_skips
+            error('Cannot build requested example "' + name + '"')
+        endif
+        message('Skipping example "' + name + '"')
+        continue
+    endif
+
+    dep_objs = ext_deps
+    foreach d:deps
+        var_name = get_option('default_library') + '_rte_' + d
+        if not is_variable(var_name)
+            error('Missing dependency "@0@" for example "@1@"'.format(d, name))
+        endif
+        dep_objs += [get_variable(var_name)]
+    endforeach
+    if allow_experimental_apis
+        cflags += '-DALLOW_EXPERIMENTAL_API'
+    endif
+    executable('dpdk-' + name, sources,
+            include_directories: includes,
+            link_whole: link_whole_libs,
+            link_args: ldflags,
+            c_args: cflags,
+            dependencies: dep_objs)
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH 07/14] build: change infrastructure file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation, for the
basic infrastructure and tooling files, as well as doc and kernel
directories.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 buildtools/chkincs/meson.build    |  24 +-
 buildtools/meson.build            |  34 +-
 buildtools/pkg-config/meson.build |  34 +-
 config/arm/meson.build            | 630 +++++++++++++++---------------
 config/meson.build                | 286 +++++++-------
 config/ppc/meson.build            |   8 +-
 config/x86/meson.build            |  64 +--
 doc/api/meson.build               |  36 +-
 doc/guides/meson.build            |  25 +-
 doc/meson.build                   |   6 +-
 kernel/freebsd/meson.build        |  32 +-
 kernel/linux/kni/meson.build      |  41 +-
 kernel/linux/meson.build          | 111 +++---
 meson.build                       |  94 ++---
 meson_options.txt                 |  84 ++--
 usertools/meson.build             |  11 +-
 16 files changed, 759 insertions(+), 761 deletions(-)

diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index f28cfd3cd..34dcd81ce 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2021 Intel Corporation
 
 if not get_option('check_includes')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 if is_windows
-	# for windows, the shebang line in the script won't work.
-	error('option "check_includes" is not supported on windows')
+    # for windows, the shebang line in the script won't work.
+    error('option "check_includes" is not supported on windows')
 endif
 
 gen_c_file_for_header = find_program('gen_c_file_for_header.py')
 gen_c_files = generator(gen_c_file_for_header,
-	output: '@BASENAME@.c',
-	arguments: ['@INPUT@', '@OUTPUT@'])
+        output: '@BASENAME@.c',
+        arguments: ['@INPUT@', '@OUTPUT@'])
 
 cflags = machine_args
 cflags += '-DALLOW_EXPERIMENTAL_API'
@@ -24,12 +24,12 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
 
 deps = []
 foreach l:enabled_libs
-	deps += get_variable('static_rte_' + l)
+    deps += get_variable('static_rte_' + l)
 endforeach
 
 executable('chkincs', sources,
-	c_args: cflags,
-	include_directories: includes,
-	dependencies: deps,
-	link_whole: dpdk_static_libraries + dpdk_drivers,
-	install: false)
+        c_args: cflags,
+        include_directories: includes,
+        dependencies: deps,
+        link_whole: dpdk_static_libraries + dpdk_drivers,
+        install: false)
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 9c9347457..c520896b4 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -10,9 +10,9 @@ binutils_avx512_check = find_program('binutils-avx512-check.sh')
 # set up map-to-win script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
 if python3.found()
-	py3 = [python3]
+    py3 = [python3]
 else
-	py3 = ['meson', 'runpython']
+    py3 = ['meson', 'runpython']
 endif
 map_to_win_cmd = py3 + files('map_to_win.py')
 sphinx_wrapper = py3 + files('call-sphinx-build.py')
@@ -21,27 +21,27 @@ sphinx_wrapper = py3 + files('call-sphinx-build.py')
 pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
 pmdinfogen = py3 + files('pmdinfogen.py')
 if host_machine.system() == 'windows'
-	if cc.get_id() == 'gcc'
-		pmdinfo += 'ar'
-	else
-		pmdinfo += 'llvm-ar'
-	endif
-	pmdinfogen += 'coff'
+    if cc.get_id() == 'gcc'
+        pmdinfo += 'ar'
+    else
+        pmdinfo += 'llvm-ar'
+    endif
+    pmdinfogen += 'coff'
 else
-	pmdinfo += 'ar'
-	pmdinfogen += 'elf'
+    pmdinfo += 'ar'
+    pmdinfogen += 'elf'
 endif
 
 # TODO: starting from Meson 0.51.0 use
-# 	python3 = import('python').find_installation('python',
-#		modules : python3_required_modules)
+#     python3 = import('python').find_installation('python',
+#        modules : python3_required_modules)
 python3_required_modules = []
 if host_machine.system() != 'windows'
-	python3_required_modules = ['elftools']
+    python3_required_modules = ['elftools']
 endif
 foreach module : python3_required_modules
-	script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
-	if run_command(py3, '-c', script.format(module)).returncode() != 0
-		error('missing python module: @0@'.format(module))
-	endif
+    script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
+    if run_command(py3, '-c', script.format(module)).returncode() != 0
+        error('missing python module: @0@'.format(module))
+    endif
 endforeach
diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
index 39a8fd1c8..0412883c8 100644
--- a/buildtools/pkg-config/meson.build
+++ b/buildtools/pkg-config/meson.build
@@ -4,7 +4,7 @@
 pkg = import('pkgconfig')
 pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
 if is_freebsd
-	pkg_extra_cflags += ['-D__BSD_VISIBLE']
+    pkg_extra_cflags += ['-D__BSD_VISIBLE']
 endif
 
 # When calling pkg-config --static --libs, pkg-config will always output the
@@ -28,30 +28,30 @@ endif
 
 
 pkg.generate(name: 'dpdk-libs',
-	filebase: 'libdpdk-libs',
-	description: '''Internal-only DPDK pkgconfig file. Not for direct use.
+        filebase: 'libdpdk-libs',
+        description: '''Internal-only DPDK pkgconfig file. Not for direct use.
 Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
-	version: meson.project_version(),
-	subdirs: [get_option('include_subdir_arch'), '.'],
-	extra_cflags: pkg_extra_cflags,
-	libraries: ['-Wl,--as-needed'] + dpdk_libraries,
-	libraries_private: dpdk_extra_ldflags)
+        version: meson.project_version(),
+        subdirs: [get_option('include_subdir_arch'), '.'],
+        extra_cflags: pkg_extra_cflags,
+        libraries: ['-Wl,--as-needed'] + dpdk_libraries,
+        libraries_private: dpdk_extra_ldflags)
 
 platform_flags = []
 if not is_windows
-	platform_flags += ['-Wl,--export-dynamic'] # ELF only
+    platform_flags += ['-Wl,--export-dynamic'] # ELF only
 endif
 pkg.generate(name: 'DPDK', # main DPDK pkgconfig file
-	filebase: 'libdpdk',
-	version: meson.project_version(),
-	description: '''The Data Plane Development Kit (DPDK).
+        filebase: 'libdpdk',
+        version: meson.project_version(),
+        description: '''The Data Plane Development Kit (DPDK).
 Note that CFLAGS might contain an -march flag higher than typical baseline.
 This is required for a number of static inline functions in the public headers.''',
-	requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
-	                  # if libbsd is not enabled, then this is blank
-	libraries_private: ['-Wl,--whole-archive'] +
-			dpdk_drivers + dpdk_static_libraries +
-			['-Wl,--no-whole-archive'] + platform_flags
+        requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
+                      # if libbsd is not enabled, then this is blank
+        libraries_private: ['-Wl,--whole-archive'] +
+            dpdk_drivers + dpdk_static_libraries +
+            ['-Wl,--no-whole-archive'] + platform_flags
 )
 
 # For static linking with dependencies as shared libraries,
diff --git a/config/arm/meson.build b/config/arm/meson.build
index b9f70f2e7..3a1c1a598 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -5,22 +5,22 @@
 
 # common flags to all aarch64 builds, with lowest priority
 flags_common = [
-	# Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
-	# to determine the best threshold in code. Refer to notes in source file
-	# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
-	['RTE_ARCH_ARM64_MEMCPY', false],
-	#	['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
-	#	['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
-	# Leave below RTE_ARM64_MEMCPY_xxx options commented out,
-	# unless there are strong reasons.
-	#	['RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK', false],
-	#	['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
-	#	['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
-
-	['RTE_SCHED_VECTOR', false],
-	['RTE_ARM_USE_WFE', false],
-	['RTE_ARCH_ARM64', true],
-	['RTE_CACHE_LINE_SIZE', 128]
+        # Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
+        # to determine the best threshold in code. Refer to notes in source file
+        # (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
+        ['RTE_ARCH_ARM64_MEMCPY', false],
+        #    ['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
+        #    ['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
+        # Leave below RTE_ARM64_MEMCPY_xxx options commented out,
+        # unless there are strong reasons.
+        #    ['RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK', false],
+        #    ['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
+        #    ['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
+
+        ['RTE_SCHED_VECTOR', false],
+        ['RTE_ARM_USE_WFE', false],
+        ['RTE_ARCH_ARM64', true],
+        ['RTE_CACHE_LINE_SIZE', 128]
 ]
 
 ## Part numbers are specific to Arm implementers
@@ -29,381 +29,381 @@ flags_common = [
 # part number specific aarch64 flags have higher priority
 #     (will overwrite both common and implementer specific flags)
 implementer_generic = {
-	'description': 'Generic armv8',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_MAX_LCORE', 256],
-		['RTE_MAX_NUMA_NODES', 4]
-	],
-	'part_number_config': {
-		'generic': {'machine_args': ['-march=armv8-a+crc',
-					     '-moutline-atomics']}
-	}
+    'description': 'Generic armv8',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_MAX_LCORE', 256],
+        ['RTE_MAX_NUMA_NODES', 4]
+    ],
+    'part_number_config': {
+        'generic': {'machine_args': ['-march=armv8-a+crc',
+                         '-moutline-atomics']}
+    }
 }
 
 part_number_config_arm = {
-	'0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
-	'0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
-	'0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
-	'0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
-	'0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
-	'0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
-	'0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
-	'0xd0c': {
-		'machine_args':  ['-march=armv8.2-a+crypto',
-				  '-mcpu=neoverse-n1'],
-		'flags': [
-			['RTE_MACHINE', '"neoverse-n1"'],
-			['RTE_ARM_FEATURE_ATOMICS', true],
-			['RTE_MAX_MEM_MB', 1048576],
-			['RTE_MAX_LCORE', 160],
-			['RTE_MAX_NUMA_NODES', 2]
-		]
-	},
-	'0xd49': {
-		'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
-		'flags': [
-			['RTE_MACHINE', '"neoverse-n2"'],
-			['RTE_ARM_FEATURE_ATOMICS', true],
-			['RTE_MAX_LCORE', 64],
-			['RTE_MAX_NUMA_NODES', 1]
-		]
-	}
+    '0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
+    '0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
+    '0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
+    '0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
+    '0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
+    '0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
+    '0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
+    '0xd0c': {
+        'machine_args':  ['-march=armv8.2-a+crypto',
+                  '-mcpu=neoverse-n1'],
+        'flags': [
+            ['RTE_MACHINE', '"neoverse-n1"'],
+            ['RTE_ARM_FEATURE_ATOMICS', true],
+            ['RTE_MAX_MEM_MB', 1048576],
+            ['RTE_MAX_LCORE', 160],
+            ['RTE_MAX_NUMA_NODES', 2]
+        ]
+    },
+    '0xd49': {
+        'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
+        'flags': [
+            ['RTE_MACHINE', '"neoverse-n2"'],
+            ['RTE_ARM_FEATURE_ATOMICS', true],
+            ['RTE_MAX_LCORE', 64],
+            ['RTE_MAX_NUMA_NODES', 1]
+        ]
+    }
 }
 implementer_arm = {
-	'description': 'Arm',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 64],
-		['RTE_MAX_NUMA_NODES', 4]
-	],
-	'part_number_config': part_number_config_arm
+    'description': 'Arm',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 64],
+        ['RTE_MAX_NUMA_NODES', 4]
+    ],
+    'part_number_config': part_number_config_arm
 }
 
 flags_part_number_thunderx = [
-	['RTE_MACHINE', '"thunderx"'],
-	['RTE_USE_C11_MEM_MODEL', false]
+    ['RTE_MACHINE', '"thunderx"'],
+    ['RTE_USE_C11_MEM_MODEL', false]
 ]
 implementer_cavium = {
-	'description': 'Cavium',
-	'flags': [
-		['RTE_MAX_VFIO_GROUPS', 128],
-		['RTE_MAX_LCORE', 96],
-		['RTE_MAX_NUMA_NODES', 2]
-	],
-	'part_number_config': {
-		'0xa1': {
-			'machine_args': ['-mcpu=thunderxt88'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xa2': {
-			'machine_args': ['-mcpu=thunderxt81'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xa3': {
-			'machine_args': ['-mcpu=thunderxt83'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xaf': {
-			'machine_args': ['-march=armv8.1-a+crc+crypto',
-					 '-mcpu=thunderx2t99'],
-			'flags': [
-				['RTE_MACHINE', '"thunderx2"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_USE_C11_MEM_MODEL', true],
-				['RTE_CACHE_LINE_SIZE', 64],
-				['RTE_MAX_LCORE', 256]
-			]
-		},
-		'0xb2': {
-			'machine_args': ['-march=armv8.2-a+crc+crypto+lse',
-					 '-mcpu=octeontx2'],
-			'flags': [
-				['RTE_MACHINE', '"octeontx2"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_USE_C11_MEM_MODEL', true],
-				['RTE_MAX_LCORE', 36],
-				['RTE_MAX_NUMA_NODES', 1]
-			]
-		}
-	}
+    'description': 'Cavium',
+    'flags': [
+        ['RTE_MAX_VFIO_GROUPS', 128],
+        ['RTE_MAX_LCORE', 96],
+        ['RTE_MAX_NUMA_NODES', 2]
+    ],
+    'part_number_config': {
+        '0xa1': {
+            'machine_args': ['-mcpu=thunderxt88'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xa2': {
+            'machine_args': ['-mcpu=thunderxt81'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xa3': {
+            'machine_args': ['-mcpu=thunderxt83'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xaf': {
+            'machine_args': ['-march=armv8.1-a+crc+crypto',
+                     '-mcpu=thunderx2t99'],
+            'flags': [
+                ['RTE_MACHINE', '"thunderx2"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_USE_C11_MEM_MODEL', true],
+                ['RTE_CACHE_LINE_SIZE', 64],
+                ['RTE_MAX_LCORE', 256]
+            ]
+        },
+        '0xb2': {
+            'machine_args': ['-march=armv8.2-a+crc+crypto+lse',
+                     '-mcpu=octeontx2'],
+            'flags': [
+                ['RTE_MACHINE', '"octeontx2"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_USE_C11_MEM_MODEL', true],
+                ['RTE_MAX_LCORE', 36],
+                ['RTE_MAX_NUMA_NODES', 1]
+            ]
+        }
+    }
 }
 
 implementer_ampere = {
-	'description': 'Ampere Computing',
-	'flags': [
-		['RTE_MACHINE', '"emag"'],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 32],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': {
-		'0x0': {'machine_args':  ['-march=armv8-a+crc+crypto',
-					  '-mtune=emag']}
-	}
+    'description': 'Ampere Computing',
+    'flags': [
+        ['RTE_MACHINE', '"emag"'],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 32],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': {
+        '0x0': {'machine_args':  ['-march=armv8-a+crc+crypto',
+                      '-mtune=emag']}
+    }
 }
 
 implementer_qualcomm = {
-	'description': 'Qualcomm',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 64],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': {
-		'0xc00': {'machine_args':  ['-march=armv8-a+crc']}
-	}
+    'description': 'Qualcomm',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 64],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': {
+        '0xc00': {'machine_args':  ['-march=armv8-a+crc']}
+    }
 }
 
 ## Arm implementers (ID from MIDR in Arm Architecture Reference Manual)
 implementers = {
-	'generic': implementer_generic,
-	'0x41': implementer_arm,
-	'0x43': implementer_cavium,
-	'0x50': implementer_ampere,
-	'0x51': implementer_qualcomm
+    'generic': implementer_generic,
+    '0x41': implementer_arm,
+    '0x43': implementer_cavium,
+    '0x50': implementer_ampere,
+    '0x51': implementer_qualcomm
 }
 
 # SoC specific aarch64 flags have the highest priority
 #     (will overwrite all other flags)
 soc_generic = {
-	'description': 'Generic un-optimized build for all aarch64 machines',
-	'implementer': 'generic',
-	'part_number': 'generic'
+    'description': 'Generic un-optimized build for all aarch64 machines',
+    'implementer': 'generic',
+    'part_number': 'generic'
 }
 
 soc_armada = {
-	'description': 'Marvell ARMADA',
-	'implementer': '0x41',
-	'part_number': '0xd08',
-	'flags': [
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'numa': false
+    'description': 'Marvell ARMADA',
+    'implementer': '0x41',
+    'part_number': '0xd08',
+    'flags': [
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'numa': false
 }
 
 soc_bluefield = {
-	'description': 'NVIDIA BlueField',
-	'implementer': '0x41',
-	'part_number': '0xd08',
-	'flags': [
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'numa': false
+    'description': 'NVIDIA BlueField',
+    'implementer': '0x41',
+    'part_number': '0xd08',
+    'flags': [
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'numa': false
 }
 
 soc_dpaa = {
-	'description': 'NXP DPAA',
-	'implementer': '0x41',
-	'part_number': '0xd08',
-	'flags': [
-		['RTE_MACHINE', '"dpaa"'],
-		['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false],
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'numa': false
+    'description': 'NXP DPAA',
+    'implementer': '0x41',
+    'part_number': '0xd08',
+    'flags': [
+        ['RTE_MACHINE', '"dpaa"'],
+        ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false],
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'numa': false
 }
 
 soc_emag = {
-	'description': 'Ampere eMAG',
-	'implementer': '0x50',
-	'part_number': '0x0'
+    'description': 'Ampere eMAG',
+    'implementer': '0x50',
+    'part_number': '0x0'
 }
 
 soc_graviton2 = {
-	'description': 'AWS Graviton2',
-	'implementer': '0x41',
-	'part_number': '0xd0c',
-	'numa': false
+    'description': 'AWS Graviton2',
+    'implementer': '0x41',
+    'part_number': '0xd0c',
+    'numa': false
 }
 
 soc_n1sdp = {
-	'description': 'Arm Neoverse N1SDP',
-	'implementer': '0x41',
-	'part_number': '0xd0c',
-	'flags': [
-		['RTE_MAX_LCORE', 4]
-	],
-	'numa': false
+    'description': 'Arm Neoverse N1SDP',
+    'implementer': '0x41',
+    'part_number': '0xd0c',
+    'flags': [
+        ['RTE_MAX_LCORE', 4]
+    ],
+    'numa': false
 }
 
 soc_n2 = {
-	'description': 'Arm Neoverse N2',
-	'implementer': '0x41',
-	'part_number': '0xd49',
-	'numa': false
+    'description': 'Arm Neoverse N2',
+    'implementer': '0x41',
+    'part_number': '0xd49',
+    'numa': false
 }
 
 soc_octeontx2 = {
-	'description': 'Marvell OCTEON TX2',
-	'implementer': '0x43',
-	'part_number': '0xb2',
-	'numa': false
+    'description': 'Marvell OCTEON TX2',
+    'implementer': '0x43',
+    'part_number': '0xb2',
+    'numa': false
 }
 
 soc_stingray = {
-	'description': 'Broadcom Stingray',
-	'implementer': '0x41',
-	'flags': [
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number': '0xd08',
-	'numa': false
+    'description': 'Broadcom Stingray',
+    'implementer': '0x41',
+    'flags': [
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number': '0xd08',
+    'numa': false
 }
 
 soc_thunderx2 = {
-	'description': 'Marvell ThunderX2 T99',
-	'implementer': '0x43',
-	'part_number': '0xaf'
+    'description': 'Marvell ThunderX2 T99',
+    'implementer': '0x43',
+    'part_number': '0xaf'
 }
 
 soc_thunderxt88 = {
-	'description': 'Marvell ThunderX T88',
-	'implementer': '0x43',
-	'part_number': '0xa1'
+    'description': 'Marvell ThunderX T88',
+    'implementer': '0x43',
+    'part_number': '0xa1'
 }
 
 socs = {
-	'generic': soc_generic,
-	'armada': soc_armada,
-	'bluefield': soc_bluefield,
-	'dpaa': soc_dpaa,
-	'emag': soc_emag,
-	'graviton2': soc_graviton2,
-	'n1sdp': soc_n1sdp,
-	'n2': soc_n2,
-	'octeontx2': soc_octeontx2,
-	'stingray': soc_stingray,
-	'thunderx2': soc_thunderx2,
-	'thunderxt88': soc_thunderxt88
+    'generic': soc_generic,
+    'armada': soc_armada,
+    'bluefield': soc_bluefield,
+    'dpaa': soc_dpaa,
+    'emag': soc_emag,
+    'graviton2': soc_graviton2,
+    'n1sdp': soc_n1sdp,
+    'n2': soc_n2,
+    'octeontx2': soc_octeontx2,
+    'stingray': soc_stingray,
+    'thunderx2': soc_thunderx2,
+    'thunderxt88': soc_thunderxt88
 }
 
 dpdk_conf.set('RTE_ARCH_ARM', 1)
 dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
 
 if dpdk_conf.get('RTE_ARCH_32')
-	# armv7 build
-	dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
-	dpdk_conf.set('RTE_ARCH_ARMv7', 1)
-	# the minimum architecture supported, armv7-a, needs the following,
-	machine_args += '-mfpu=neon'
+    # armv7 build
+    dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
+    dpdk_conf.set('RTE_ARCH_ARMv7', 1)
+    # the minimum architecture supported, armv7-a, needs the following,
+    machine_args += '-mfpu=neon'
 else
-	# aarch64 build
-	soc = get_option('platform')
-	soc_config = {}
-	if not meson.is_cross_build()
-		if machine == 'generic'
-			# generic build
-			if soc != ''
-				error('Building for a particular platform is ' +
-				      'unsupported with generic build.')
-			endif
-			implementer_id = 'generic'
-			part_number = 'generic'
-		elif soc != ''
-			soc_config = socs.get(soc, {'not_supported': true})
-		else
-			# native build
-			# The script returns ['Implementer', 'Variant', 'Architecture',
-			# 'Primary Part number', 'Revision']
-			detect_vendor = find_program(join_paths(
-					meson.current_source_dir(), 'armv8_machine.py'))
-			cmd = run_command(detect_vendor.path())
-			if cmd.returncode() == 0
-				cmd_output = cmd.stdout().to_lower().strip().split(' ')
-				implementer_id = cmd_output[0]
-				part_number = cmd_output[3]
-			else
-				error('Error when getting Arm Implementer ID and part number.')
-			endif
-		endif
-	else
-		# cross build
-		soc = meson.get_cross_property('platform', '')
-		if soc == ''
-			error('Arm SoC must be specified in the cross file.')
-		endif
-		soc_config = socs.get(soc, {'not_supported': true})
-	endif
-
-	soc_flags = []
-	if soc_config.has_key('not_supported')
-		error('SoC @0@ not supported.'.format(soc))
-	elif soc_config != {}
-		implementer_id = soc_config['implementer']
-		implementer_config = implementers[implementer_id]
-		part_number = soc_config['part_number']
-		soc_flags = soc_config.get('flags', [])
-		if not soc_config.get('numa', true)
-			has_libnuma = 0
-		endif
-
-		disable_drivers += ',' + soc_config.get('disable_drivers', '')
-		enable_drivers += ',' + soc_config.get('enable_drivers', '')
-	endif
-
-	if implementers.has_key(implementer_id)
-		implementer_config = implementers[implementer_id]
-	else
-		error('Unsupported Arm implementer: @0@. '.format(implementer_id) +
-		      'Please add support for it or use the generic ' +
-		      '(-Dmachine=generic) build.')
-	endif
-
-	message('Arm implementer: ' + implementer_config['description'])
-	message('Arm part number: ' + part_number)
-
-	part_number_config = implementer_config['part_number_config']
-	if part_number_config.has_key(part_number)
-		# use the specified part_number machine args if found
-		part_number_config = part_number_config[part_number]
-	else
-		# unknown part number
-		error('Unsupported part number @0@ of implementer @1@. '
-		      .format(part_number, implementer_id) +
-		      'Please add support for it or use the generic ' +
-		      '(-Dmachine=generic) build.')
-	endif
-
-	# add/overwrite flags in the proper order
-	dpdk_flags = flags_common + implementer_config['flags'] + part_number_config.get('flags', []) + soc_flags
-
-	# apply supported machine args
-	machine_args = [] # Clear previous machine args
-	foreach flag: part_number_config['machine_args']
-		if cc.has_argument(flag)
-			machine_args += flag
-		endif
-	endforeach
-
-	# apply flags
-	foreach flag: dpdk_flags
-		if flag.length() > 0
-			dpdk_conf.set(flag[0], flag[1])
-		endif
-	endforeach
+    # aarch64 build
+    soc = get_option('platform')
+    soc_config = {}
+    if not meson.is_cross_build()
+        if machine == 'generic'
+            # generic build
+            if soc != ''
+                error('Building for a particular platform is unsupported with generic build.')
+            endif
+            implementer_id = 'generic'
+            part_number = 'generic'
+        elif soc != ''
+            soc_config = socs.get(soc, {'not_supported': true})
+        else
+            # native build
+            # The script returns ['Implementer', 'Variant', 'Architecture',
+            # 'Primary Part number', 'Revision']
+            detect_vendor = find_program(join_paths(meson.current_source_dir(), 'armv8_machine.py'))
+            cmd = run_command(detect_vendor.path())
+            if cmd.returncode() == 0
+                cmd_output = cmd.stdout().to_lower().strip().split(' ')
+                implementer_id = cmd_output[0]
+                part_number = cmd_output[3]
+            else
+                error('Error when getting Arm Implementer ID and part number.')
+            endif
+        endif
+    else
+        # cross build
+        soc = meson.get_cross_property('platform', '')
+        if soc == ''
+            error('Arm SoC must be specified in the cross file.')
+        endif
+        soc_config = socs.get(soc, {'not_supported': true})
+    endif
+
+    soc_flags = []
+    if soc_config.has_key('not_supported')
+        error('SoC @0@ not supported.'.format(soc))
+    elif soc_config != {}
+        implementer_id = soc_config['implementer']
+        implementer_config = implementers[implementer_id]
+        part_number = soc_config['part_number']
+        soc_flags = soc_config.get('flags', [])
+        if not soc_config.get('numa', true)
+            has_libnuma = 0
+        endif
+
+        disable_drivers += ',' + soc_config.get('disable_drivers', '')
+        enable_drivers += ',' + soc_config.get('enable_drivers', '')
+    endif
+
+    if implementers.has_key(implementer_id)
+        implementer_config = implementers[implementer_id]
+    else
+        error('Unsupported Arm implementer: @0@. '.format(implementer_id) +
+              'Please add support for it or use the generic ' +
+              '(-Dmachine=generic) build.')
+    endif
+
+    message('Arm implementer: ' + implementer_config['description'])
+    message('Arm part number: ' + part_number)
+
+    part_number_config = implementer_config['part_number_config']
+    if part_number_config.has_key(part_number)
+        # use the specified part_number machine args if found
+        part_number_config = part_number_config[part_number]
+    else
+        # unknown part number
+        error('Unsupported part number @0@ of implementer @1@. '
+              .format(part_number, implementer_id) +
+              'Please add support for it or use the generic ' +
+              '(-Dmachine=generic) build.')
+    endif
+
+    # add/overwrite flags in the proper order
+    dpdk_flags = flags_common + implementer_config['flags'] + part_number_config.get('flags', []) + soc_flags
+
+    # apply supported machine args
+    machine_args = [] # Clear previous machine args
+    foreach flag: part_number_config['machine_args']
+        if cc.has_argument(flag)
+            machine_args += flag
+        endif
+    endforeach
+
+    # apply flags
+    foreach flag: dpdk_flags
+        if flag.length() > 0
+            dpdk_conf.set(flag[0], flag[1])
+        endif
+    endforeach
 endif
 message('Using machine args: @0@'.format(machine_args))
 
 if (cc.get_define('__ARM_NEON', args: machine_args) != '' or
-    cc.get_define('__aarch64__', args: machine_args) != '')
-	compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
+        cc.get_define('__aarch64__', args: machine_args) != '')
+    compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
 endif
 
 if cc.get_define('__ARM_FEATURE_CRC32', args: machine_args) != ''
-	compile_time_cpuflags += ['RTE_CPUFLAG_CRC32']
+    compile_time_cpuflags += ['RTE_CPUFLAG_CRC32']
 endif
 
 if cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != ''
-	compile_time_cpuflags += ['RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',
-	'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2']
+    compile_time_cpuflags += [
+           'RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',
+           'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2',
+    ]
 endif
diff --git a/config/meson.build b/config/meson.build
index 6e6ef8c0e..9e49abc0f 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -5,13 +5,13 @@
 supported_exec_envs = ['freebsd', 'linux', 'windows']
 exec_env = host_machine.system()
 if not supported_exec_envs.contains(exec_env)
-	error('unsupported system type "@0@"'.format(exec_env))
+    error('unsupported system type "@0@"'.format(exec_env))
 endif
 
 # define a handy variable for checking which OS we have.
 # gives us "is_windows", "is_freebsd" and "is_linux"
 foreach env:supported_exec_envs
-	set_variable('is_' + env, exec_env == env)
+    set_variable('is_' + env, exec_env == env)
 endforeach
 
 # MS linker requires special treatment.
@@ -22,8 +22,7 @@ is_ms_linker = is_windows and (cc.get_id() == 'clang')
 # depending on the configuration options
 pver = meson.project_version().split('.')
 major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
-abi_version = run_command(find_program('cat', 'more'),
-	abi_version_file).stdout().strip()
+abi_version = run_command(find_program('cat', 'more'), abi_version_file).stdout().strip()
 
 # Libraries have the abi_version as the filename extension
 # and have the soname be all but the final part of the abi_version.
@@ -35,21 +34,21 @@ so_version = abi_version.split('.')[0]
 dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
 dpdk_conf.set('RTE_VER_MONTH', pver.get(1).to_int())
 if pver.get(2).contains('-rc')
-	rc_ver = pver.get(2).split('-rc')
-	dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0).to_int())
-	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
-	dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1).to_int())
+    rc_ver = pver.get(2).split('-rc')
+    dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0).to_int())
+    dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
+    dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1).to_int())
 else
-	dpdk_conf.set('RTE_VER_MINOR', pver.get(2).to_int())
-	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
+    dpdk_conf.set('RTE_VER_MINOR', pver.get(2).to_int())
+    dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
 # for actual, non-rc releases, set the release value to 99 to ensure releases
 # have higher version numbers than their respective release candidates
-	dpdk_conf.set('RTE_VER_RELEASE', 99)
+    dpdk_conf.set('RTE_VER_RELEASE', 99)
 endif
 
 pmd_subdir_opt = get_option('drivers_install_subdir')
 if pmd_subdir_opt.contains('<VERSION>')
-	pmd_subdir_opt = abi_version.join(pmd_subdir_opt.split('<VERSION>'))
+    pmd_subdir_opt = abi_version.join(pmd_subdir_opt.split('<VERSION>'))
 endif
 driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
 eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
@@ -58,9 +57,8 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
 # to be in the library path, so symlink the drivers from the main lib directory.
 if not is_windows
-	meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
-			get_option('libdir'),
-			pmd_subdir_opt)
+    meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
+            get_option('libdir'), pmd_subdir_opt)
 endif
 
 # init disable/enable driver lists that will be populated in different places
@@ -69,9 +67,9 @@ enable_drivers = ''
 
 # set the machine type and cflags for it
 if meson.is_cross_build()
-	machine = host_machine.cpu()
+    machine = host_machine.cpu()
 else
-	machine = get_option('machine')
+    machine = get_option('machine')
 endif
 
 # machine type 'generic' is special, it selects the per arch agreed common
@@ -82,17 +80,17 @@ endif
 # This can be bumped up by the DPDK project, but it can never be an
 # invariant like 'native'
 if machine == 'default' or machine == 'generic'
-	if host_machine.cpu_family().startswith('x86')
-		# matches the old pre-meson build systems generic machine
-		machine = 'corei7'
-	elif host_machine.cpu_family().startswith('arm')
-		machine = 'armv7-a'
-	elif host_machine.cpu_family().startswith('aarch')
-		# arm64 manages generic config in config/arm/meson.build
-		machine = 'generic'
-	elif host_machine.cpu_family().startswith('ppc')
-		machine = 'power8'
-	endif
+    if host_machine.cpu_family().startswith('x86')
+        # matches the old pre-meson build systems generic machine
+        machine = 'corei7'
+    elif host_machine.cpu_family().startswith('arm')
+        machine = 'armv7-a'
+    elif host_machine.cpu_family().startswith('aarch')
+        # arm64 manages generic config in config/arm/meson.build
+        machine = 'generic'
+    elif host_machine.cpu_family().startswith('ppc')
+        machine = 'power8'
+    endif
 endif
 
 dpdk_conf.set('RTE_MACHINE', machine)
@@ -100,10 +98,10 @@ machine_args = []
 
 # ppc64 does not support -march= at all, use -mcpu and -mtune for that
 if host_machine.cpu_family().startswith('ppc')
-	machine_args += '-mcpu=' + machine
-	machine_args += '-mtune=' + machine
+    machine_args += '-mcpu=' + machine
+    machine_args += '-mtune=' + machine
 else
-	machine_args += '-march=' + machine
+    machine_args += '-march=' + machine
 endif
 
 toolchain = cc.get_id()
@@ -114,88 +112,88 @@ dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8)
 dpdk_conf.set('RTE_ARCH_32', cc.sizeof('void *') == 4)
 
 if not is_windows
-	add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
+    add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
 endif
 
 # use pthreads if available for the platform
 if not is_windows
-	add_project_link_arguments('-pthread', language: 'c')
-	dpdk_extra_ldflags += '-pthread'
+    add_project_link_arguments('-pthread', language: 'c')
+    dpdk_extra_ldflags += '-pthread'
 endif
 
 # on some OS, maths functions are in a separate library
 if cc.find_library('m', required : false).found()
-	# some libs depend on maths lib
-	add_project_link_arguments('-lm', language: 'c')
-	dpdk_extra_ldflags += '-lm'
+    # some libs depend on maths lib
+    add_project_link_arguments('-lm', language: 'c')
+    dpdk_extra_ldflags += '-lm'
 endif
 
 if is_linux
-	link_lib = 'dl'
+    link_lib = 'dl'
 else
-	link_lib = ''
+    link_lib = ''
 endif
 
 # if link_lib is empty, do not add it to project properties
 if link_lib != ''
-	add_project_link_arguments('-l' + link_lib, language: 'c')
-	dpdk_extra_ldflags += '-l' + link_lib
+    add_project_link_arguments('-l' + link_lib, language: 'c')
+    dpdk_extra_ldflags += '-l' + link_lib
 endif
 
 # check for libraries used in multiple places in DPDK
 has_libnuma = 0
 find_libnuma = true
 if meson.is_cross_build() and not meson.get_cross_property('numa', true)
-	# don't look for libnuma if explicitly disabled in cross build
-	find_libnuma = false
+    # don't look for libnuma if explicitly disabled in cross build
+    find_libnuma = false
 endif
 if find_libnuma
-	numa_dep = cc.find_library('numa', required: false)
-	if numa_dep.found() and cc.has_header('numaif.h')
-		dpdk_conf.set10('RTE_HAS_LIBNUMA', true)
-		has_libnuma = 1
-		add_project_link_arguments('-lnuma', language: 'c')
-		dpdk_extra_ldflags += '-lnuma'
-	endif
+    numa_dep = cc.find_library('numa', required: false)
+    if numa_dep.found() and cc.has_header('numaif.h')
+        dpdk_conf.set10('RTE_HAS_LIBNUMA', true)
+        has_libnuma = 1
+        add_project_link_arguments('-lnuma', language: 'c')
+        dpdk_extra_ldflags += '-lnuma'
+    endif
 endif
 
 has_libfdt = 0
 fdt_dep = cc.find_library('libfdt', required: false)
 if fdt_dep.found() and cc.has_header('fdt.h')
-	dpdk_conf.set10('RTE_HAS_LIBFDT', true)
-	has_libfdt = 1
-	add_project_link_arguments('-lfdt', language: 'c')
-	dpdk_extra_ldflags += '-lfdt'
+    dpdk_conf.set10('RTE_HAS_LIBFDT', true)
+    has_libfdt = 1
+    add_project_link_arguments('-lfdt', language: 'c')
+    dpdk_extra_ldflags += '-lfdt'
 endif
 
 libexecinfo = cc.find_library('libexecinfo', required: false)
 if libexecinfo.found() and cc.has_header('execinfo.h')
-	add_project_link_arguments('-lexecinfo', language: 'c')
-	dpdk_extra_ldflags += '-lexecinfo'
+    add_project_link_arguments('-lexecinfo', language: 'c')
+    dpdk_extra_ldflags += '-lexecinfo'
 endif
 
 # check for libbsd
 libbsd = dependency('libbsd', required: false, method: 'pkg-config')
 if libbsd.found()
-	dpdk_conf.set('RTE_USE_LIBBSD', 1)
+    dpdk_conf.set('RTE_USE_LIBBSD', 1)
 endif
 
 # check for pcap
 pcap_dep = dependency('libpcap', required: false, method: 'pkg-config')
 if not pcap_dep.found()
-	# pcap got a pkg-config file only in 1.9.0
-	pcap_dep = cc.find_library('pcap', required: false)
+    # pcap got a pkg-config file only in 1.9.0
+    pcap_dep = cc.find_library('pcap', required: false)
 endif
 if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)
-	dpdk_conf.set('RTE_PORT_PCAP', 1)
-	dpdk_extra_ldflags += '-lpcap'
+    dpdk_conf.set('RTE_PORT_PCAP', 1)
+    dpdk_extra_ldflags += '-lpcap'
 endif
 
 # for clang 32-bit compiles we need libatomic for 64-bit atomic ops
 if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false
-	atomic_dep = cc.find_library('atomic', required: true)
-	add_project_link_arguments('-latomic', language: 'c')
-	dpdk_extra_ldflags += '-latomic'
+    atomic_dep = cc.find_library('atomic', required: true)
+    add_project_link_arguments('-latomic', language: 'c')
+    dpdk_extra_ldflags += '-latomic'
 endif
 
 # add -include rte_config to cflags
@@ -203,48 +201,48 @@ add_project_arguments('-include', 'rte_config.h', language: 'c')
 
 # enable extra warnings and disable any unwanted warnings
 warning_flags = [
-	# -Wall is added by meson by default, so add -Wextra only
-	'-Wextra',
-
-	# additional warnings in alphabetical order
-	'-Wcast-qual',
-	'-Wdeprecated',
-	'-Wformat',
-	'-Wformat-nonliteral',
-	'-Wformat-security',
-	'-Wmissing-declarations',
-	'-Wmissing-prototypes',
-	'-Wnested-externs',
-	'-Wold-style-definition',
-	'-Wpointer-arith',
-	'-Wsign-compare',
-	'-Wstrict-prototypes',
-	'-Wundef',
-	'-Wwrite-strings',
-
-	# globally disabled warnings
-	'-Wno-address-of-packed-member',
-	'-Wno-packed-not-aligned',
-	'-Wno-missing-field-initializers'
+        # -Wall is added by meson by default, so add -Wextra only
+        '-Wextra',
+
+        # additional warnings in alphabetical order
+        '-Wcast-qual',
+        '-Wdeprecated',
+        '-Wformat',
+        '-Wformat-nonliteral',
+        '-Wformat-security',
+        '-Wmissing-declarations',
+        '-Wmissing-prototypes',
+        '-Wnested-externs',
+        '-Wold-style-definition',
+        '-Wpointer-arith',
+        '-Wsign-compare',
+        '-Wstrict-prototypes',
+        '-Wundef',
+        '-Wwrite-strings',
+
+        # globally disabled warnings
+        '-Wno-address-of-packed-member',
+        '-Wno-packed-not-aligned',
+        '-Wno-missing-field-initializers',
 ]
 if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0')
 # FIXME: Bugzilla 396
-	warning_flags += '-Wno-zero-length-bounds'
+    warning_flags += '-Wno-zero-length-bounds'
 endif
 if not dpdk_conf.get('RTE_ARCH_64')
 # for 32-bit, don't warn about casting a 32-bit pointer to 64-bit int - it's fine!!
-	warning_flags += '-Wno-pointer-to-int-cast'
+    warning_flags += '-Wno-pointer-to-int-cast'
 endif
 if cc.get_id() == 'intel'
-	warning_ids = [181, 188, 2203, 2279, 2557, 3179, 3656]
-	foreach i:warning_ids
-		warning_flags += '-diag-disable=@0@'.format(i)
-	endforeach
+    warning_ids = [181, 188, 2203, 2279, 2557, 3179, 3656]
+    foreach i:warning_ids
+        warning_flags += '-diag-disable=@0@'.format(i)
+    endforeach
 endif
 foreach arg: warning_flags
-	if cc.has_argument(arg)
-		add_project_arguments(arg, language: 'c')
-	endif
+    if cc.has_argument(arg)
+        add_project_arguments(arg, language: 'c')
+    endif
 endforeach
 
 # set other values pulled from the build options
@@ -258,9 +256,9 @@ dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
 dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
 dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
 if dpdk_conf.get('RTE_ARCH_64')
-	dpdk_conf.set('RTE_MAX_MEM_MB', 524288)
+    dpdk_conf.set('RTE_MAX_MEM_MB', 524288)
 else # for 32-bit we need smaller reserved memory areas
-	dpdk_conf.set('RTE_MAX_MEM_MB', 2048)
+    dpdk_conf.set('RTE_MAX_MEM_MB', 2048)
 endif
 
 
@@ -270,24 +268,24 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 
 # apply cross-specific options
 if meson.is_cross_build()
-	# configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
-	cross_max_lcores = meson.get_cross_property('max_lcores', 0)
-	if cross_max_lcores != 0
-		message('Setting RTE_MAX_LCORE from cross file')
-		dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
-	endif
-	cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
-	if cross_max_numa_nodes != 0
-		message('Setting RTE_MAX_NUMA_NODES from cross file')
-		dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
-	endif
+    # configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
+    cross_max_lcores = meson.get_cross_property('max_lcores', 0)
+    if cross_max_lcores != 0
+        message('Setting RTE_MAX_LCORE from cross file')
+        dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
+    endif
+    cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
+    if cross_max_numa_nodes != 0
+        message('Setting RTE_MAX_NUMA_NODES from cross file')
+        dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
+    endif
 endif
 
 # set the install path for the drivers
 dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
 
 install_headers(['rte_config.h'],
-		subdir: get_option('include_subdir_arch'))
+        subdir: get_option('include_subdir_arch'))
 
 # enable VFIO only if it is linux OS
 dpdk_conf.set('RTE_EAL_VFIO', is_linux)
@@ -297,53 +295,53 @@ add_project_arguments('-D_GNU_SOURCE', language: 'c')
 
 # specify -D__BSD_VISIBLE for FreeBSD
 if is_freebsd
-	add_project_arguments('-D__BSD_VISIBLE', language: 'c')
+    add_project_arguments('-D__BSD_VISIBLE', language: 'c')
 endif
 
 if is_windows
-	# VirtualAlloc2() is available since Windows 10 / Server 2016.
-	add_project_arguments('-D_WIN32_WINNT=0x0A00', language: 'c')
+    # VirtualAlloc2() is available since Windows 10 / Server 2016.
+    add_project_arguments('-D_WIN32_WINNT=0x0A00', language: 'c')
 
-	# Use MinGW-w64 stdio, because DPDK assumes ANSI-compliant formatting.
-	if cc.get_id() == 'gcc'
-		add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
-	endif
+    # Use MinGW-w64 stdio, because DPDK assumes ANSI-compliant formatting.
+    if cc.get_id() == 'gcc'
+        add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
+    endif
 
-	# Disable secure CRT deprecated warnings for clang
-	if cc.get_id() == 'clang'
-		add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
-	endif
+    # Disable secure CRT deprecated warnings for clang
+    if cc.get_id() == 'clang'
+        add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
+    endif
 
-	add_project_link_arguments('-lws2_32', language: 'c')
+    add_project_link_arguments('-lws2_32', language: 'c')
 
-	# Contrary to docs, VirtualAlloc2() is exported by mincore.lib
-	# in Windows SDK, while MinGW exports it by advapi32.a.
-	if is_ms_linker
-		add_project_link_arguments('-lmincore', language: 'c')
-	endif
+    # Contrary to docs, VirtualAlloc2() is exported by mincore.lib
+    # in Windows SDK, while MinGW exports it by advapi32.a.
+    if is_ms_linker
+        add_project_link_arguments('-lmincore', language: 'c')
+    endif
 
-	add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
-	add_project_link_arguments('-ldbghelp', language: 'c')
+    add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
+    add_project_link_arguments('-ldbghelp', language: 'c')
 endif
 
 if get_option('b_lto')
-	if cc.has_argument('-ffat-lto-objects')
-		add_project_arguments('-ffat-lto-objects', language: 'c')
-	else
-		error('compiler does not support fat LTO objects - please turn LTO off')
-	endif
-	# workaround for gcc bug 81440
-	if cc.get_id() == 'gcc' and cc.version().version_compare('<8.0')
-		add_project_arguments('-Wno-lto-type-mismatch', language: 'c')
-		add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c')
-	endif
+    if cc.has_argument('-ffat-lto-objects')
+        add_project_arguments('-ffat-lto-objects', language: 'c')
+    else
+        error('compiler does not support fat LTO objects - please turn LTO off')
+    endif
+    # workaround for gcc bug 81440
+    if cc.get_id() == 'gcc' and cc.version().version_compare('<8.0')
+        add_project_arguments('-Wno-lto-type-mismatch', language: 'c')
+        add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c')
+    endif
 endif
 
 if get_option('default_library') == 'both'
-	error( '''
-    Unsupported value "both" for "default_library" option.
+    error( '''
+ Unsupported value "both" for "default_library" option.
 
-    NOTE: DPDK always builds both shared and static libraries.  Please set
-    "default_library" to either "static" or "shared" to select default linkage
-    for apps and any examples.''')
+ NOTE: DPDK always builds both shared and static libraries.  Please set
+ "default_library" to either "static" or "shared" to select default linkage
+ for apps and any examples.''')
 endif
diff --git a/config/ppc/meson.build b/config/ppc/meson.build
index 0d8da87e6..1c196b8db 100644
--- a/config/ppc/meson.build
+++ b/config/ppc/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	error('Only 64-bit compiles are supported for this platform type')
+    error('Only 64-bit compiles are supported for this platform type')
 endif
 dpdk_conf.set('RTE_ARCH', 'ppc_64')
 dpdk_conf.set('RTE_ARCH_PPC_64', 1)
@@ -12,9 +12,9 @@ dpdk_conf.set('RTE_ARCH_PPC_64', 1)
 # is used, resulting in a build failure.
 power9_supported = cc.has_argument('-mcpu=power9')
 if not power9_supported
-	machine = 'power8'
-	machine_args = ['-mcpu=power8', '-mtune=power8']
-	dpdk_conf.set('RTE_MACHINE','power8')
+    machine = 'power8'
+    machine_args = ['-mcpu=power8', '-mtune=power8']
+    dpdk_conf.set('RTE_MACHINE','power8')
 endif
 
 # overrides specific to ppc64
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 31bfa63b1..34b116481 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -3,57 +3,57 @@
 
 # get binutils version for the workaround of Bug 97
 if not is_windows
-	binutils_ok = run_command(binutils_avx512_check)
-	if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
-		machine_args += '-mno-avx512f'
-		warning('Binutils error with AVX512 assembly, disabling AVX512 support')
-	endif
+    binutils_ok = run_command(binutils_avx512_check)
+    if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
+        machine_args += '-mno-avx512f'
+        warning('Binutils error with AVX512 assembly, disabling AVX512 support')
+    endif
 endif
 
 # we require SSE4.2 for DPDK
 if cc.get_define('__SSE4_2__', args: machine_args) == ''
-	message('SSE 4.2 not enabled by default, explicitly enabling')
-	machine_args += '-msse4'
+    message('SSE 4.2 not enabled by default, explicitly enabling')
+    machine_args += '-msse4'
 endif
 
 base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2']
 foreach f:base_flags
-	compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
 endforeach
 
 optional_flags = [
-	'AES',
-	'AVX',
-	'AVX2',
-	'AVX512BW',
-	'AVX512CD',
-	'AVX512DQ',
-	'AVX512F',
-	'AVX512VL',
-	'PCLMUL',
-	'RDRND',
-	'RDSEED',
-	'VPCLMULQDQ',
+    'AES',
+    'AVX',
+    'AVX2',
+    'AVX512BW',
+    'AVX512CD',
+    'AVX512DQ',
+    'AVX512F',
+    'AVX512VL',
+    'PCLMUL',
+    'RDRND',
+    'RDSEED',
+    'VPCLMULQDQ',
 ]
 foreach f:optional_flags
-	if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
-		if f == 'PCLMUL' # special case flags with different defines
-			f = 'PCLMULQDQ'
-		elif f == 'RDRND'
-			f = 'RDRAND'
-		endif
-		compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
-	endif
+    if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
+        if f == 'PCLMUL' # special case flags with different defines
+            f = 'PCLMULQDQ'
+        elif f == 'RDRND'
+            f = 'RDRAND'
+        endif
+        compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    endif
 endforeach
 
 
 dpdk_conf.set('RTE_ARCH_X86', 1)
 if dpdk_conf.get('RTE_ARCH_64')
-	dpdk_conf.set('RTE_ARCH_X86_64', 1)
-	dpdk_conf.set('RTE_ARCH', 'x86_64')
+    dpdk_conf.set('RTE_ARCH_X86_64', 1)
+    dpdk_conf.set('RTE_ARCH', 'x86_64')
 else
-	dpdk_conf.set('RTE_ARCH_I686', 1)
-	dpdk_conf.set('RTE_ARCH', 'i686')
+    dpdk_conf.set('RTE_ARCH_I686', 1)
+    dpdk_conf.set('RTE_ARCH', 'i686')
 endif
 
 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index dfdefdc92..d34c38369 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -23,12 +23,12 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 # false it would be impossible to install the docs.
 # So use a configure option for now.
 example = custom_target('examples.dox',
-	output: 'examples.dox',
-	command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
-	depfile: 'examples.dox.d',
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+        output: 'examples.dox',
+        command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
+        depfile: 'examples.dox.d',
+        install: get_option('enable_docs'),
+        install_dir: htmldir,
+        build_by_default: get_option('enable_docs'))
 
 cdata = configuration_data()
 cdata.set('VERSION', meson.project_version())
@@ -39,23 +39,23 @@ cdata.set('TOPDIR', meson.source_root())
 cdata.set('STRIP_FROM_PATH', meson.source_root())
 cdata.set('WARN_AS_ERROR', 'NO')
 if get_option('werror')
-	cdata.set('WARN_AS_ERROR', 'YES')
+    cdata.set('WARN_AS_ERROR', 'YES')
 endif
 
 doxy_conf = configure_file(input: 'doxy-api.conf.in',
-	output: 'doxy-api.conf',
-	configuration: cdata)
+        output: 'doxy-api.conf',
+        configuration: cdata)
 
 doxy_build = custom_target('doxygen',
-	depends: example,
-	depend_files: 'doxy-api-index.md',
-	input: doxy_conf,
-	output: 'html',
-	depfile: 'html.d',
-	command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+        depends: example,
+        depend_files: 'doxy-api-index.md',
+        input: doxy_conf,
+        output: 'html',
+        depfile: 'html.d',
+        command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
+        install: get_option('enable_docs'),
+        install_dir: htmldir,
+        build_by_default: get_option('enable_docs'))
 
 doc_targets += doxy_build
 doc_target_names += 'Doxygen_API'
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
index 9c35efb5b..03b8bee56 100644
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -4,28 +4,27 @@
 sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
 
 if not sphinx.found()
-	subdir_done()
+    subdir_done()
 endif
 
 extra_sphinx_args = []
 if get_option('werror')
-	extra_sphinx_args += '-W'
+    extra_sphinx_args += '-W'
 endif
 
 htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 html_guides = custom_target('html_guides',
-	input: files('index.rst'),
-	output: 'html',
-	command: [sphinx_wrapper, sphinx, meson.project_version(),
-		meson.current_source_dir(), meson.current_build_dir(),
-		extra_sphinx_args],
-	depfile: '.html.d',
-	build_by_default: get_option('enable_docs'),
-	install: get_option('enable_docs'),
-	install_dir: htmldir)
+        input: files('index.rst'),
+        output: 'html',
+        command: [sphinx_wrapper, sphinx, meson.project_version(),
+            meson.current_source_dir(), meson.current_build_dir(),
+            extra_sphinx_args],
+        depfile: '.html.d',
+        build_by_default: get_option('enable_docs'),
+        install: get_option('enable_docs'),
+        install_dir: htmldir)
 
-install_data(files('custom.css'),
-			install_dir: join_paths(htmldir,'_static', 'css'))
+install_data(files('custom.css'), install_dir: join_paths(htmldir,'_static', 'css'))
 
 doc_targets += html_guides
 doc_target_names += 'HTML_Guides'
diff --git a/doc/meson.build b/doc/meson.build
index c5410d85d..959606b96 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -7,9 +7,9 @@ subdir('api')
 subdir('guides')
 
 if doc_targets.length() == 0
-	message = 'No docs targets found'
+    message = 'No docs targets found'
 else
-	message = 'Building docs:'
+    message = 'Building docs:'
 endif
 run_target('doc', command: ['echo', message, doc_target_names],
-	depends: doc_targets)
+    depends: doc_targets)
diff --git a/kernel/freebsd/meson.build b/kernel/freebsd/meson.build
index dc156a43f..bf5aa20a5 100644
--- a/kernel/freebsd/meson.build
+++ b/kernel/freebsd/meson.build
@@ -10,26 +10,26 @@ kmods = ['contigmem', 'nic_uio']
 # files from the individual meson.build files, and then use a custom
 # target to call make, passing in the values as env parameters.
 kmod_cflags = ['-I' + meson.build_root(),
-		'-I' + join_paths(meson.source_root(), 'config'),
-		'-include rte_config.h']
+        '-I' + join_paths(meson.source_root(), 'config'),
+        '-include rte_config.h']
 
 # to avoid warnings due to race conditions with creating the dev_if.h, etc.
 # files, serialize the kernel module builds. Each module will depend on
 # previous ones
 built_kmods = []
 foreach k:kmods
-	subdir(k)
-	built_kmods += custom_target(k,
-		input: [files('BSDmakefile.meson'), sources],
-		output: k + '.ko',
-		command: ['make', '-f', '@INPUT0@',
-			'KMOD_OBJDIR=@OUTDIR@',
-			'KMOD_SRC=@INPUT1@',
-			'KMOD=' + k,
-			'KMOD_CFLAGS=' + ' '.join(kmod_cflags),
-			'CC=clang'],
-		depends: built_kmods, # make each module depend on prev
-		build_by_default: get_option('enable_kmods'),
-		install: get_option('enable_kmods'),
-		install_dir: '/boot/modules/')
+    subdir(k)
+    built_kmods += custom_target(k,
+            input: [files('BSDmakefile.meson'), sources],
+            output: k + '.ko',
+            command: ['make', '-f', '@INPUT0@',
+                'KMOD_OBJDIR=@OUTDIR@',
+                'KMOD_SRC=@INPUT1@',
+                'KMOD=' + k,
+                'KMOD_CFLAGS=' + ' '.join(kmod_cflags),
+                'CC=clang'],
+            depends: built_kmods, # make each module depend on prev
+            build_by_default: get_option('enable_kmods'),
+            install: get_option('enable_kmods'),
+            install_dir: '/boot/modules/')
 endforeach
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index 46b71c741..f43860bcb 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -2,27 +2,28 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 kni_mkfile = custom_target('rte_kni_makefile',
-	output: 'Makefile',
-	command: ['touch', '@OUTPUT@'])
+        output: 'Makefile',
+        command: ['touch', '@OUTPUT@'])
 
 kni_sources = files(
-	'kni_misc.c',
-	'kni_net.c',
-	'Kbuild')
+        'kni_misc.c',
+        'kni_net.c',
+        'Kbuild',
+)
 
 custom_target('rte_kni',
-	input: kni_sources,
-	output: 'rte_kni.ko',
-	command: ['make', '-j4', '-C', kernel_build_dir,
-		'M=' + meson.current_build_dir(),
-		'src=' + meson.current_source_dir(),
-		'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
-		' -I' + meson.source_root() + '/lib/librte_eal/include' +
-		' -I' + meson.source_root() + '/lib/librte_kni' +
-		' -I' + meson.build_root() +
-		' -I' + meson.current_source_dir(),
-		'modules'] + cross_args,
-	depends: kni_mkfile,
-	install: install,
-	install_dir: kernel_install_dir,
-	build_by_default: get_option('enable_kmods'))
+        input: kni_sources,
+        output: 'rte_kni.ko',
+        command: ['make', '-j4', '-C', kernel_build_dir,
+            'M=' + meson.current_build_dir(),
+            'src=' + meson.current_source_dir(),
+            'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
+            ' -I' + meson.source_root() + '/lib/librte_eal/include' +
+            ' -I' + meson.source_root() + '/lib/librte_kni' +
+            ' -I' + meson.build_root() +
+            ' -I' + meson.current_source_dir(),
+            'modules'] + cross_args,
+        depends: kni_mkfile,
+        install: install,
+        install_dir: kernel_install_dir,
+        build_by_default: get_option('enable_kmods'))
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index b43470679..3a00ea954 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -9,84 +9,83 @@ install = not meson.is_cross_build()
 cross_args = []
 
 if not meson.is_cross_build()
-	# native build
-	kernel_version = run_command('uname', '-r').stdout().strip()
-	kernel_install_dir = '/lib/modules/' + kernel_version + '/extra/dpdk'
-	if kernel_build_dir == ''
-		# use default path for native builds
-		kernel_build_dir = '/lib/modules/' + kernel_version + '/build'
-	endif
+    # native build
+    kernel_version = run_command('uname', '-r').stdout().strip()
+    kernel_install_dir = '/lib/modules/' + kernel_version + '/extra/dpdk'
+    if kernel_build_dir == ''
+        # use default path for native builds
+        kernel_build_dir = '/lib/modules/' + kernel_version + '/build'
+    endif
 
-	# test running make in kernel directory, using "make kernelversion"
-	make_returncode = run_command('make', '-sC', kernel_build_dir,
-			'kernelversion').returncode()
-	if make_returncode != 0
-		# backward compatibility:
-		# the headers could still be in the 'build' subdir
-		if not kernel_build_dir.endswith('build') and not kernel_build_dir.endswith('build/')
-			kernel_build_dir = join_paths(kernel_build_dir, 'build')
-			make_returncode = run_command('make', '-sC', kernel_build_dir,
-					'kernelversion').returncode()
-		endif
-	endif
+    # test running make in kernel directory, using "make kernelversion"
+    make_returncode = run_command('make', '-sC', kernel_build_dir,
+            'kernelversion').returncode()
+    if make_returncode != 0
+        # backward compatibility:
+        # the headers could still be in the 'build' subdir
+        if not kernel_build_dir.endswith('build') and not kernel_build_dir.endswith('build/')
+            kernel_build_dir = join_paths(kernel_build_dir, 'build')
+            make_returncode = run_command('make', '-sC', kernel_build_dir,
+                    'kernelversion').returncode()
+        endif
+    endif
 
-	if make_returncode != 0
-		error('Cannot compile kernel modules as requested - are kernel headers installed?')
-	endif
+    if make_returncode != 0
+        error('Cannot compile kernel modules as requested - are kernel headers installed?')
+    endif
 
-	# DO ACTUAL MODULE BUILDING
-	foreach d:subdirs
-		subdir(d)
-	endforeach
+    # DO ACTUAL MODULE BUILDING
+    foreach d:subdirs
+        subdir(d)
+    endforeach
 
-	subdir_done()
+    subdir_done()
 endif
 
 # cross build
 # if we are cross-compiling we need kernel_build_dir specified
 if kernel_build_dir == ''
-	error('Need "kernel_dir" option for kmod compilation when cross-compiling')
+    error('Need "kernel_dir" option for kmod compilation when cross-compiling')
 endif
 cross_compiler = find_program('c').path()
 if cross_compiler.endswith('gcc')
-	cross_prefix = run_command([py3, '-c', 'print("' + cross_compiler + '"[:-3])']).stdout().strip()
+    cross_prefix = run_command([py3, '-c', 'print("' + cross_compiler + '"[:-3])']).stdout().strip()
 elif cross_compiler.endswith('clang')
-	cross_prefix = ''
-	found_target = false
-	# search for '-target' and use the arg that follows
-	# (i.e. the value of '-target') as cross_prefix
-	foreach cross_c_arg : meson.get_cross_property('c_args')
-		if found_target and cross_prefix == ''
-			cross_prefix = cross_c_arg
-		endif
-		if cross_c_arg == '-target'
-			found_target = true
-		endif
-	endforeach
-	if cross_prefix == ''
-		error('Didn\'t find -target and its value in' +
-		      ' c_args in input cross-file.')
-	endif
-	linker = 'lld'
-	foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
-		if cross_c_link_arg.startswith('-fuse-ld')
-			linker = cross_c_link_arg.split('=')[1]
-		endif
-	endforeach
-	cross_args += ['CC=@0@'.format(cross_compiler), 'LD=ld.@0@'.format(linker)]
+    cross_prefix = ''
+    found_target = false
+    # search for '-target' and use the arg that follows
+    # (i.e. the value of '-target') as cross_prefix
+    foreach cross_c_arg : meson.get_cross_property('c_args')
+        if found_target and cross_prefix == ''
+            cross_prefix = cross_c_arg
+        endif
+        if cross_c_arg == '-target'
+            found_target = true
+        endif
+    endforeach
+    if cross_prefix == ''
+        error('Did not find -target and its value in c_args in input cross-file.')
+    endif
+    linker = 'lld'
+    foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
+        if cross_c_link_arg.startswith('-fuse-ld')
+            linker = cross_c_link_arg.split('=')[1]
+        endif
+    endforeach
+    cross_args += ['CC=@0@'.format(cross_compiler), 'LD=ld.@0@'.format(linker)]
 else
-	error('Unsupported cross compiler: @0@'.format(cross_compiler))
+    error('Unsupported cross compiler: @0@'.format(cross_compiler))
 endif
 
 cross_arch = host_machine.cpu_family()
 if host_machine.cpu_family() == 'aarch64'
-	cross_arch = 'arm64'
+    cross_arch = 'arm64'
 endif
 
 cross_args += ['ARCH=@0@'.format(cross_arch),
-	'CROSS_COMPILE=@0@'.format(cross_prefix)]
+        'CROSS_COMPILE=@0@'.format(cross_prefix)]
 
 # DO ACTUAL MODULE BUILDING
 foreach d:subdirs
-	subdir(d)
+    subdir(d)
 endforeach
diff --git a/meson.build b/meson.build
index f4a2759bf..6d7f8c501 100644
--- a/meson.build
+++ b/meson.build
@@ -2,27 +2,27 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 project('DPDK', 'C',
-	# Get version number from file.
-	# Fallback to "more" for Windows compatibility.
-	version: run_command(find_program('cat', 'more'),
-		files('VERSION')).stdout().strip(),
-	license: 'BSD',
-	default_options: ['buildtype=release', 'default_library=static'],
-	meson_version: '>= 0.49'
+        # Get version number from file.
+        # Fallback to "more" for Windows compatibility.
+        version: run_command(find_program('cat', 'more'),
+            files('VERSION')).stdout().strip(),
+        license: 'BSD',
+        default_options: ['buildtype=release', 'default_library=static'],
+        meson_version: '>= 0.49'
 )
 
 # check for developer mode
 developer_mode = false
 if get_option('developer_mode').auto()
-	if meson.version().version_compare('>=0.53') # fs module available
-		fs = import('fs')
-		developer_mode = fs.is_dir('.git')
-	endif
+    if meson.version().version_compare('>=0.53') # fs module available
+        fs = import('fs')
+        developer_mode = fs.is_dir('.git')
+    endif
 else
-	developer_mode = get_option('developer_mode').enabled()
+    developer_mode = get_option('developer_mode').enabled()
 endif
 if developer_mode
-	message('## Building in Developer Mode ##')
+    message('## Building in Developer Mode ##')
 endif
 
 # set up some global vars for compiler, platform, configuration, etc.
@@ -39,20 +39,20 @@ dpdk_drvs_disabled = []
 abi_version_file = files('ABI_VERSION')
 
 if host_machine.cpu_family().startswith('x86')
-	arch_subdir = 'x86'
+    arch_subdir = 'x86'
 elif host_machine.cpu_family().startswith('arm') or host_machine.cpu_family().startswith('aarch')
-	arch_subdir = 'arm'
+    arch_subdir = 'arm'
 elif host_machine.cpu_family().startswith('ppc')
-	arch_subdir = 'ppc'
+    arch_subdir = 'ppc'
 endif
 
 # configure the build, and make sure configs here and in config folder are
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
 global_inc = include_directories('.', 'config',
-	'lib/librte_eal/include',
-	'lib/librte_eal/@0@/include'.format(host_machine.system()),
-	'lib/librte_eal/@0@/include'.format(arch_subdir),
+    'lib/librte_eal/include',
+    'lib/librte_eal/@0@/include'.format(host_machine.system()),
+    'lib/librte_eal/@0@/include'.format(arch_subdir),
 )
 
 # do configuration and get tool paths
@@ -74,25 +74,25 @@ subdir('doc')
 # install any example code into the appropriate install path
 subdir('examples')
 install_subdir('examples',
-	install_dir: get_option('datadir') + '/dpdk',
-	exclude_files: ex_file_excludes)
+        install_dir: get_option('datadir') + '/dpdk',
+        exclude_files: ex_file_excludes)
 
 # build kernel modules if enabled
 if get_option('enable_kmods')
-	subdir('kernel')
+    subdir('kernel')
 endif
 
 # check header includes if requested
 if get_option('check_includes')
-	subdir('buildtools/chkincs')
+    subdir('buildtools/chkincs')
 endif
 
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
-		configuration: dpdk_conf,
-		install_dir: join_paths(get_option('includedir'),
-				get_option('include_subdir_arch')))
+        configuration: dpdk_conf,
+        install_dir: join_paths(get_option('includedir'),
+            get_option('include_subdir_arch')))
 
 # build pkg-config files for dpdk
 subdir('buildtools/pkg-config')
@@ -103,40 +103,40 @@ output_message = '\n=================\nLibraries Enabled\n=================\n'
 output_message += '\nlibs:\n\t'
 output_count = 0
 foreach lib:enabled_libs
-	output_message += lib + ', '
-	output_count += 1
-	if output_count == 8
-		output_message += '\n\t'
-		output_count = 0
-	endif
+    output_message += lib + ', '
+    output_count += 1
+    if output_count == 8
+        output_message += '\n\t'
+        output_count = 0
+    endif
 endforeach
 message(output_message + '\n')
 
 output_message = '\n===============\nDrivers Enabled\n===============\n'
 foreach class:dpdk_driver_classes
-	class_drivers = get_variable(class + '_drivers')
-	output_message += '\n' + class + ':\n\t'
-	output_count = 0
-	foreach drv:class_drivers
-		output_message += drv + ', '
-		output_count += 1
-		if output_count == 8
-			output_message += '\n\t'
-			output_count = 0
-		endif
-	endforeach
+    class_drivers = get_variable(class + '_drivers')
+    output_message += '\n' + class + ':\n\t'
+    output_count = 0
+    foreach drv:class_drivers
+        output_message += drv + ', '
+        output_count += 1
+        if output_count == 8
+            output_message += '\n\t'
+            output_count = 0
+        endif
+    endforeach
 endforeach
 message(output_message + '\n')
 
 output_message = '\n=================\nContent Skipped\n=================\n'
 output_message += '\nlibs:\n\t'
 foreach lib:dpdk_libs_disabled
-	reason = get_variable(lib.underscorify() + '_disable_reason')
-	output_message += lib + ':\t' + reason + '\n\t'
+    reason = get_variable(lib.underscorify() + '_disable_reason')
+    output_message += lib + ':\t' + reason + '\n\t'
 endforeach
 output_message += '\ndrivers:\n\t'
 foreach drv:dpdk_drvs_disabled
-	reason = get_variable(drv.underscorify() + '_disable_reason')
-	output_message += drv + ':\t' + reason + '\n\t'
+    reason = get_variable(drv.underscorify() + '_disable_reason')
+    output_message += drv + ':\t' + reason + '\n\t'
 endforeach
 message(output_message + '\n')
diff --git a/meson_options.txt b/meson_options.txt
index b78f3bd9d..530fcddfa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,44 +1,44 @@
 # Please keep these options sorted alphabetically.
 
-option('check_includes', type: 'boolean', value: false,
-	description: 'build "chkincs" to verify each header file can compile alone')
-option('developer_mode', type: 'feature',
-	description: 'turn on additional build checks relevant for DPDK developers')
-option('disable_drivers', type: 'string', value: '',
-	description: 'Comma-separated list of drivers to explicitly disable.')
-option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
-	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
-option('enable_docs', type: 'boolean', value: false,
-	description: 'build documentation')
-option('enable_drivers', type: 'string', value: '',
-	description: 'Comma-separated list of drivers to build. If unspecified, build all drivers.')
-option('enable_driver_sdk', type: 'boolean', value: false,
-	description: 'Install headers to build drivers.')
-option('enable_kmods', type: 'boolean', value: false,
-	description: 'build kernel modules')
-option('examples', type: 'string', value: '',
-	description: 'Comma-separated list of examples to build by default')
-option('flexran_sdk', type: 'string', value: '',
-	description: 'Path to FlexRAN SDK optional Libraries for BBDEV device')
-option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared',
-	description: 'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
-option('include_subdir_arch', type: 'string', value: '',
-	description: 'subdirectory where to install arch-dependent headers')
-option('kernel_dir', type: 'string', value: '',
-	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
-option('machine', type: 'string', value: 'native',
-	description: 'set the target machine type or "generic", a build usable on all machines of the build machine architecture or "native", which lets the compiler pick the architecture of the build machine.')
-option('max_ethports', type: 'integer', value: 32,
-	description: 'maximum number of Ethernet devices')
-option('max_lcores', type: 'integer', value: 128,
-	description: 'maximum number of cores/threads supported by EAL')
-option('max_numa_nodes', type: 'integer', value: 32,
-	description: 'maximum number of NUMA nodes supported by EAL')
-option('platform', type: 'string', value: '',
-	description: 'use configuration for a particular platform (such as a SoC).')
-option('enable_trace_fp', type: 'boolean', value: false,
-	description: 'enable fast path trace points.')
-option('tests', type: 'boolean', value: true,
-	description: 'build unit tests')
-option('use_hpet', type: 'boolean', value: false,
-	description: 'use HPET timer in EAL')
+option('check_includes', type: 'boolean', value: false, description:
+        'build "chkincs" to verify each header file can compile alone')
+option('developer_mode', type: 'feature', description:
+        'turn on additional build checks relevant for DPDK developers')
+option('disable_drivers', type: 'string', value: '', description:
+        'Comma-separated list of drivers to explicitly disable.')
+option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', description:
+        'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
+option('enable_docs', type: 'boolean', value: false, description:
+        'build documentation')
+option('enable_drivers', type: 'string', value: '', description:
+        'Comma-separated list of drivers to build. If unspecified, build all drivers.')
+option('enable_driver_sdk', type: 'boolean', value: false, description:
+        'Install headers to build drivers.')
+option('enable_kmods', type: 'boolean', value: false, description:
+        'build kernel modules')
+option('examples', type: 'string', value: '', description:
+        'Comma-separated list of examples to build by default')
+option('flexran_sdk', type: 'string', value: '', description:
+        'Path to FlexRAN SDK optional Libraries for BBDEV device')
+option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared', description:
+        'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
+option('include_subdir_arch', type: 'string', value: '', description:
+        'subdirectory where to install arch-dependent headers')
+option('kernel_dir', type: 'string', value: '', description:
+        'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
+option('machine', type: 'string', value: 'native', description:
+        'set the target machine type or "generic", a build usable on all machines of the build machine architecture or "native", which lets the compiler pick the architecture of the build machine.')
+option('max_ethports', type: 'integer', value: 32, description:
+        'maximum number of Ethernet devices')
+option('max_lcores', type: 'integer', value: 128, description:
+        'maximum number of cores/threads supported by EAL')
+option('max_numa_nodes', type: 'integer', value: 32, description:
+        'maximum number of NUMA nodes supported by EAL')
+option('platform', type: 'string', value: '', description:
+        'use configuration for a particular platform (such as a SoC).')
+option('enable_trace_fp', type: 'boolean', value: false, description:
+        'enable fast path trace points.')
+option('tests', type: 'boolean', value: true, description:
+        'build unit tests')
+option('use_hpet', type: 'boolean', value: false, description:
+        'use HPET timer in EAL')
diff --git a/usertools/meson.build b/usertools/meson.build
index 596eaefb0..b6271a207 100644
--- a/usertools/meson.build
+++ b/usertools/meson.build
@@ -2,8 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 install_data([
-	'dpdk-devbind.py',
-	'dpdk-pmdinfo.py',
-	'dpdk-telemetry.py',
-	'dpdk-hugepages.py'
-],install_dir: 'bin')
+            'dpdk-devbind.py',
+            'dpdk-pmdinfo.py',
+            'dpdk-telemetry.py',
+            'dpdk-hugepages.py',
+        ],
+        install_dir: 'bin')
-- 
2.27.0

[dpdk-dev] [PATCH 08/14] lib: cleanup whitespace in meson build files

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation. Perform
other formating cleanups such as ensure that long lists of files are one
per line, and terminating with a final comma before the closing brace to
make addition/removals easier. In some cases, reorder lists of items
where they were not in alphabetical order.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_acl/meson.build             | 122 +++++++--------
 lib/librte_bbdev/meson.build           |   4 +-
 lib/librte_bpf/meson.build             |  22 +--
 lib/librte_cmdline/meson.build         |  44 +++---
 lib/librte_compressdev/meson.build     |  10 +-
 lib/librte_cryptodev/meson.build       |  12 +-
 lib/librte_distributor/meson.build     |   4 +-
 lib/librte_eal/arm/include/meson.build |  56 +++----
 lib/librte_eal/arm/meson.build         |   8 +-
 lib/librte_eal/common/meson.build      | 146 +++++++++---------
 lib/librte_eal/freebsd/meson.build     |  24 +--
 lib/librte_eal/include/meson.build     | 114 +++++++-------
 lib/librte_eal/linux/meson.build       |  32 ++--
 lib/librte_eal/meson.build             |   8 +-
 lib/librte_eal/ppc/include/meson.build |  32 ++--
 lib/librte_eal/ppc/meson.build         |   8 +-
 lib/librte_eal/unix/meson.build        |   8 +-
 lib/librte_eal/windows/meson.build     |  32 ++--
 lib/librte_eal/x86/include/meson.build |  43 +++---
 lib/librte_eal/x86/meson.build         |  10 +-
 lib/librte_ethdev/meson.build          |  52 ++++---
 lib/librte_eventdev/meson.build        |  40 ++---
 lib/librte_fib/meson.build             |  88 +++++------
 lib/librte_graph/meson.build           |   9 +-
 lib/librte_gro/meson.build             |   8 +-
 lib/librte_gso/meson.build             |  10 +-
 lib/librte_hash/meson.build            |  12 +-
 lib/librte_ip_frag/meson.build         |  14 +-
 lib/librte_kni/meson.build             |   4 +-
 lib/librte_lpm/meson.build             |   7 +-
 lib/librte_mbuf/meson.build            |  18 ++-
 lib/librte_mempool/meson.build         |  21 ++-
 lib/librte_metrics/meson.build         |   4 +-
 lib/librte_net/meson.build             | 201 +++++++++++++------------
 lib/librte_node/meson.build            |  13 +-
 lib/librte_pipeline/meson.build        |  28 ++--
 lib/librte_port/meson.build            |  68 ++++-----
 lib/librte_power/meson.build           |  29 ++--
 lib/librte_regexdev/meson.build        |   3 +-
 lib/librte_ring/meson.build            |  25 +--
 lib/librte_sched/meson.build           |   8 +-
 lib/librte_stack/meson.build           |   9 +-
 lib/librte_table/meson.build           |  66 ++++----
 lib/librte_vhost/meson.build           |  37 +++--
 44 files changed, 808 insertions(+), 705 deletions(-)

diff --git a/lib/librte_acl/meson.build b/lib/librte_acl/meson.build
index ee4e229e5..fbb131823 100644
--- a/lib/librte_acl/meson.build
+++ b/lib/librte_acl/meson.build
@@ -2,82 +2,82 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
-		'rte_acl.c', 'tb_mem.c')
+        'rte_acl.c', 'tb_mem.c')
 headers = files('rte_acl.h', 'rte_acl_osdep.h')
 
 if dpdk_conf.has('RTE_ARCH_X86')
-	sources += files('acl_run_sse.c')
+    sources += files('acl_run_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	#
-	# in former case, just add avx2 C file to files list
-	# in latter case, compile c file to static lib, using correct compiler
-	# flags, and then have the .o file from static lib linked into main lib.
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		sources += files('acl_run_avx2.c')
-		cflags += '-DCC_AVX2_SUPPORT'
-	elif cc.has_argument('-mavx2')
-		avx2_tmplib = static_library('avx2_tmp',
-				'acl_run_avx2.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx2'])
-		objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
-		cflags += '-DCC_AVX2_SUPPORT'
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    #
+    # in former case, just add avx2 C file to files list
+    # in latter case, compile c file to static lib, using correct compiler
+    # flags, and then have the .o file from static lib linked into main lib.
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        sources += files('acl_run_avx2.c')
+        cflags += '-DCC_AVX2_SUPPORT'
+    elif cc.has_argument('-mavx2')
+        avx2_tmplib = static_library('avx2_tmp',
+                'acl_run_avx2.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx2'])
+        objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
+        cflags += '-DCC_AVX2_SUPPORT'
+    endif
 
-	# compile AVX512 version if:
-	# we are building 64-bit binary AND binutils can generate proper code
+    # compile AVX512 version if:
+    # we are building 64-bit binary AND binutils can generate proper code
 
-	if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
+    if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
 
-		# compile AVX512 version if either:
-		# a. we have AVX512 supported in minimum instruction set
-		#    baseline
-		# b. it's not minimum instruction set, but supported by
-		#    compiler
-		#
-		# in former case, just add avx512 C file to files list
-		# in latter case, compile c file to static lib, using correct
-		# compiler flags, and then have the .o file from static lib
-		# linked into main lib.
+        # compile AVX512 version if either:
+        # a. we have AVX512 supported in minimum instruction set
+        #    baseline
+        # b. it's not minimum instruction set, but supported by
+        #    compiler
+        #
+        # in former case, just add avx512 C file to files list
+        # in latter case, compile c file to static lib, using correct
+        # compiler flags, and then have the .o file from static lib
+        # linked into main lib.
 
-		# check if all required flags already enabled (variant a).
-		acl_avx512_flags = ['__AVX512F__', '__AVX512VL__',
-			'__AVX512CD__', '__AVX512BW__']
+        # check if all required flags already enabled (variant a).
+        acl_avx512_flags = ['__AVX512F__', '__AVX512VL__',
+            '__AVX512CD__', '__AVX512BW__']
 
-		acl_avx512_on = true
-		foreach f:acl_avx512_flags
+        acl_avx512_on = true
+        foreach f:acl_avx512_flags
 
-			if cc.get_define(f, args: machine_args) == ''
-				acl_avx512_on = false
-			endif
-		endforeach
+            if cc.get_define(f, args: machine_args) == ''
+                acl_avx512_on = false
+            endif
+        endforeach
 
-		if acl_avx512_on == true
+        if acl_avx512_on == true
 
-			sources += files('acl_run_avx512.c')
-			cflags += '-DCC_AVX512_SUPPORT'
+            sources += files('acl_run_avx512.c')
+            cflags += '-DCC_AVX512_SUPPORT'
 
-		elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
-					'-mavx512cd', '-mavx512bw')
+        elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
+                    '-mavx512cd', '-mavx512bw')
 
-			avx512_tmplib = static_library('avx512_tmp',
-				'acl_run_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags +
-					['-mavx512f', '-mavx512vl',
-					 '-mavx512cd', '-mavx512bw'])
-			objs += avx512_tmplib.extract_objects(
-					'acl_run_avx512.c')
-			cflags += '-DCC_AVX512_SUPPORT'
-		endif
-	endif
+            avx512_tmplib = static_library('avx512_tmp',
+                'acl_run_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags +
+                    ['-mavx512f', '-mavx512vl',
+                     '-mavx512cd', '-mavx512bw'])
+            objs += avx512_tmplib.extract_objects(
+                    'acl_run_avx512.c')
+            cflags += '-DCC_AVX512_SUPPORT'
+        endif
+    endif
 
 elif dpdk_conf.has('RTE_ARCH_ARM')
-	cflags += '-flax-vector-conversions'
-	sources += files('acl_run_neon.c')
+    cflags += '-flax-vector-conversions'
+    sources += files('acl_run_neon.c')
 elif dpdk_conf.has('RTE_ARCH_PPC_64')
-	sources += files('acl_run_altivec.c')
+    sources += files('acl_run_altivec.c')
 endif
diff --git a/lib/librte_bbdev/meson.build b/lib/librte_bbdev/meson.build
index 126778220..2969cab26 100644
--- a/lib/librte_bbdev/meson.build
+++ b/lib/librte_bbdev/meson.build
@@ -3,6 +3,6 @@
 
 sources = files('rte_bbdev.c')
 headers = files('rte_bbdev.h',
-		'rte_bbdev_pmd.h',
-		'rte_bbdev_op.h')
+        'rte_bbdev_pmd.h',
+        'rte_bbdev_op.h')
 deps += ['mbuf']
diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build
index 614277eff..63cbd6018 100644
--- a/lib/librte_bpf/meson.build
+++ b/lib/librte_bpf/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('bpf.c',
-		'bpf_exec.c',
-		'bpf_load.c',
-		'bpf_pkt.c',
-		'bpf_validate.c')
+        'bpf_exec.c',
+        'bpf_load.c',
+        'bpf_pkt.c',
+        'bpf_validate.c')
 
 if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('bpf_jit_x86.c')
+    sources += files('bpf_jit_x86.c')
 elif dpdk_conf.has('RTE_ARCH_ARM64')
-	sources += files('bpf_jit_arm64.c')
+    sources += files('bpf_jit_arm64.c')
 endif
 
 headers = files('bpf_def.h',
-		'rte_bpf.h',
-		'rte_bpf_ethdev.h')
+        'rte_bpf.h',
+        'rte_bpf_ethdev.h')
 
 deps += ['mbuf', 'net', 'ethdev']
 
 dep = dependency('libelf', required: false, method: 'pkg-config')
 if dep.found()
-	dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1)
-	sources += files('bpf_load_elf.c')
-	ext_deps += dep
+    dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1)
+    sources += files('bpf_load_elf.c')
+    ext_deps += dep
 endif
diff --git a/lib/librte_cmdline/meson.build b/lib/librte_cmdline/meson.build
index 5009b3354..63fb69100 100644
--- a/lib/librte_cmdline/meson.build
+++ b/lib/librte_cmdline/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('cmdline.c',
-	'cmdline_cirbuf.c',
-	'cmdline_parse.c',
-	'cmdline_parse_etheraddr.c',
-	'cmdline_parse_ipaddr.c',
-	'cmdline_parse_num.c',
-	'cmdline_parse_portlist.c',
-	'cmdline_parse_string.c',
-	'cmdline_rdline.c',
-	'cmdline_socket.c',
-	'cmdline_vt100.c')
+    'cmdline_cirbuf.c',
+    'cmdline_parse.c',
+    'cmdline_parse_etheraddr.c',
+    'cmdline_parse_ipaddr.c',
+    'cmdline_parse_num.c',
+    'cmdline_parse_portlist.c',
+    'cmdline_parse_string.c',
+    'cmdline_rdline.c',
+    'cmdline_socket.c',
+    'cmdline_vt100.c')
 
 headers = files('cmdline.h',
-	'cmdline_parse.h',
-	'cmdline_parse_num.h',
-	'cmdline_parse_ipaddr.h',
-	'cmdline_parse_etheraddr.h',
-	'cmdline_parse_string.h',
-	'cmdline_rdline.h',
-	'cmdline_vt100.h',
-	'cmdline_socket.h',
-	'cmdline_cirbuf.h',
-	'cmdline_parse_portlist.h')
+    'cmdline_parse.h',
+    'cmdline_parse_num.h',
+    'cmdline_parse_ipaddr.h',
+    'cmdline_parse_etheraddr.h',
+    'cmdline_parse_string.h',
+    'cmdline_rdline.h',
+    'cmdline_vt100.h',
+    'cmdline_socket.h',
+    'cmdline_cirbuf.h',
+    'cmdline_parse_portlist.h')
 
 if is_windows
-	sources += files('cmdline_os_windows.c')
+    sources += files('cmdline_os_windows.c')
 else
-	sources += files('cmdline_os_unix.c')
+    sources += files('cmdline_os_unix.c')
 endif
 
 deps += ['net']
diff --git a/lib/librte_compressdev/meson.build b/lib/librte_compressdev/meson.build
index 7d95cd4f3..663ceec0b 100644
--- a/lib/librte_compressdev/meson.build
+++ b/lib/librte_compressdev/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('rte_compressdev.c',
-	'rte_compressdev_pmd.c',
-	'rte_comp.c')
+    'rte_compressdev_pmd.c',
+    'rte_comp.c')
 headers = files('rte_compressdev.h',
-	'rte_compressdev_pmd.h',
-	'rte_compressdev_internal.h',
-	'rte_comp.h')
+    'rte_compressdev_pmd.h',
+    'rte_compressdev_internal.h',
+    'rte_comp.h')
 deps += ['kvargs', 'mbuf']
diff --git a/lib/librte_cryptodev/meson.build b/lib/librte_cryptodev/meson.build
index 8c5493f4c..bec80beab 100644
--- a/lib/librte_cryptodev/meson.build
+++ b/lib/librte_cryptodev/meson.build
@@ -3,10 +3,10 @@
 
 sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c', 'cryptodev_trace_points.c')
 headers = files('rte_cryptodev.h',
-	'rte_cryptodev_pmd.h',
-	'rte_cryptodev_trace.h',
-	'rte_cryptodev_trace_fp.h',
-	'rte_crypto.h',
-	'rte_crypto_sym.h',
-	'rte_crypto_asym.h')
+        'rte_cryptodev_pmd.h',
+        'rte_cryptodev_trace.h',
+        'rte_cryptodev_trace_fp.h',
+        'rte_crypto.h',
+        'rte_crypto_sym.h',
+        'rte_crypto_asym.h')
 deps += ['kvargs', 'mbuf', 'rcu']
diff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build
index bd12ddb2f..cefe1b9f1 100644
--- a/lib/librte_distributor/meson.build
+++ b/lib/librte_distributor/meson.build
@@ -3,9 +3,9 @@
 
 sources = files('rte_distributor.c', 'rte_distributor_single.c')
 if arch_subdir == 'x86'
-	sources += files('rte_distributor_match_sse.c')
+    sources += files('rte_distributor_match_sse.c')
 else
-	sources += files('rte_distributor_match_generic.c')
+    sources += files('rte_distributor_match_generic.c')
 endif
 headers = files('rte_distributor.h')
 deps += ['mbuf']
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 2c3cff61b..65c3aec35 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017 Intel Corporation.
 
 arch_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags_32.h',
-	'rte_cpuflags_64.h',
-	'rte_cpuflags.h',
-	'rte_cycles_32.h',
-	'rte_cycles_64.h',
-	'rte_cycles.h',
-	'rte_io_64.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy_32.h',
-	'rte_memcpy_64.h',
-	'rte_memcpy.h',
-	'rte_pause_32.h',
-	'rte_pause_64.h',
-	'rte_pause.h',
-	'rte_pflock.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch_32.h',
-	'rte_prefetch_64.h',
-	'rte_prefetch.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+        'rte_atomic_32.h',
+        'rte_atomic_64.h',
+        'rte_atomic.h',
+        'rte_byteorder.h',
+        'rte_cpuflags_32.h',
+        'rte_cpuflags_64.h',
+        'rte_cpuflags.h',
+        'rte_cycles_32.h',
+        'rte_cycles_64.h',
+        'rte_cycles.h',
+        'rte_io_64.h',
+        'rte_io.h',
+        'rte_mcslock.h',
+        'rte_memcpy_32.h',
+        'rte_memcpy_64.h',
+        'rte_memcpy.h',
+        'rte_pause_32.h',
+        'rte_pause_64.h',
+        'rte_pause.h',
+        'rte_pflock.h',
+        'rte_power_intrinsics.h',
+        'rte_prefetch_32.h',
+        'rte_prefetch_64.h',
+        'rte_prefetch.h',
+        'rte_rwlock.h',
+        'rte_spinlock.h',
+        'rte_ticketlock.h',
+        'rte_vect.h',
 )
 install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/arm/meson.build b/lib/librte_eal/arm/meson.build
index 6ec53ea03..dca1106aa 100644
--- a/lib/librte_eal/arm/meson.build
+++ b/lib/librte_eal/arm/meson.build
@@ -4,8 +4,8 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_power_intrinsics.c',
+        'rte_cpuflags.c',
+        'rte_cycles.c',
+        'rte_hypervisor.c',
+        'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 70bd854fe..edfca7777 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -6,83 +6,83 @@ includes += include_directories('.')
 cflags += [ '-DABI_VERSION="@0@"'.format(abi_version) ]
 
 if is_windows
-	sources += files(
-		'eal_common_bus.c',
-		'eal_common_class.c',
-		'eal_common_config.c',
-		'eal_common_debug.c',
-		'eal_common_dev.c',
-		'eal_common_devargs.c',
-		'eal_common_dynmem.c',
-		'eal_common_errno.c',
-		'eal_common_fbarray.c',
-		'eal_common_hexdump.c',
-		'eal_common_launch.c',
-		'eal_common_lcore.c',
-		'eal_common_log.c',
-		'eal_common_mcfg.c',
-		'eal_common_memalloc.c',
-		'eal_common_memory.c',
-		'eal_common_memzone.c',
-		'eal_common_options.c',
-		'eal_common_string_fns.c',
-		'eal_common_tailqs.c',
-		'eal_common_thread.c',
-		'eal_common_trace_points.c',
-		'malloc_elem.c',
-		'malloc_heap.c',
-		'rte_malloc.c',
-		'eal_common_timer.c',
-		'rte_random.c',
-		'rte_reciprocal.c',
-		'rte_service.c',
-		'rte_version.c',
-	)
-	subdir_done()
+    sources += files(
+            'eal_common_bus.c',
+            'eal_common_class.c',
+            'eal_common_config.c',
+            'eal_common_debug.c',
+            'eal_common_dev.c',
+            'eal_common_devargs.c',
+            'eal_common_dynmem.c',
+            'eal_common_errno.c',
+            'eal_common_fbarray.c',
+            'eal_common_hexdump.c',
+            'eal_common_launch.c',
+            'eal_common_lcore.c',
+            'eal_common_log.c',
+            'eal_common_mcfg.c',
+            'eal_common_memalloc.c',
+            'eal_common_memory.c',
+            'eal_common_memzone.c',
+            'eal_common_options.c',
+            'eal_common_string_fns.c',
+            'eal_common_tailqs.c',
+            'eal_common_thread.c',
+            'eal_common_trace_points.c',
+            'malloc_elem.c',
+            'malloc_heap.c',
+            'rte_malloc.c',
+            'eal_common_timer.c',
+            'rte_random.c',
+            'rte_reciprocal.c',
+            'rte_service.c',
+            'rte_version.c',
+    )
+    subdir_done()
 endif
 
 sources += files(
-	'eal_common_bus.c',
-	'eal_common_cpuflags.c',
-	'eal_common_class.c',
-	'eal_common_config.c',
-	'eal_common_debug.c',
-	'eal_common_devargs.c',
-	'eal_common_dev.c',
-	'eal_common_errno.c',
-	'eal_common_fbarray.c',
-	'eal_common_hexdump.c',
-	'eal_common_hypervisor.c',
-	'eal_common_launch.c',
-	'eal_common_lcore.c',
-	'eal_common_log.c',
-	'eal_common_mcfg.c',
-	'eal_common_memalloc.c',
-	'eal_common_memory.c',
-	'eal_common_memzone.c',
-	'eal_common_options.c',
-	'eal_common_proc.c',
-	'eal_common_string_fns.c',
-	'eal_common_tailqs.c',
-	'eal_common_thread.c',
-	'eal_common_timer.c',
-	'eal_common_trace.c',
-	'eal_common_trace_ctf.c',
-	'eal_common_trace_points.c',
-	'eal_common_trace_utils.c',
-	'eal_common_uuid.c',
-	'hotplug_mp.c',
-	'malloc_elem.c',
-	'malloc_heap.c',
-	'malloc_mp.c',
-	'rte_keepalive.c',
-	'rte_malloc.c',
-	'rte_random.c',
-	'rte_reciprocal.c',
-	'rte_service.c',
-	'rte_version.c',
+        'eal_common_bus.c',
+        'eal_common_cpuflags.c',
+        'eal_common_class.c',
+        'eal_common_config.c',
+        'eal_common_debug.c',
+        'eal_common_devargs.c',
+        'eal_common_dev.c',
+        'eal_common_errno.c',
+        'eal_common_fbarray.c',
+        'eal_common_hexdump.c',
+        'eal_common_hypervisor.c',
+        'eal_common_launch.c',
+        'eal_common_lcore.c',
+        'eal_common_log.c',
+        'eal_common_mcfg.c',
+        'eal_common_memalloc.c',
+        'eal_common_memory.c',
+        'eal_common_memzone.c',
+        'eal_common_options.c',
+        'eal_common_proc.c',
+        'eal_common_string_fns.c',
+        'eal_common_tailqs.c',
+        'eal_common_thread.c',
+        'eal_common_timer.c',
+        'eal_common_trace.c',
+        'eal_common_trace_ctf.c',
+        'eal_common_trace_points.c',
+        'eal_common_trace_utils.c',
+        'eal_common_uuid.c',
+        'hotplug_mp.c',
+        'malloc_elem.c',
+        'malloc_heap.c',
+        'malloc_mp.c',
+        'rte_keepalive.c',
+        'rte_malloc.c',
+        'rte_random.c',
+        'rte_reciprocal.c',
+        'rte_service.c',
+        'rte_version.c',
 )
 
 if is_linux
-	sources += files('eal_common_dynmem.c')
+    sources += files('eal_common_dynmem.c')
 endif
diff --git a/lib/librte_eal/freebsd/meson.build b/lib/librte_eal/freebsd/meson.build
index e10fd8a16..398ceab71 100644
--- a/lib/librte_eal/freebsd/meson.build
+++ b/lib/librte_eal/freebsd/meson.build
@@ -4,18 +4,18 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_cpuflags.c',
-	'eal_debug.c',
-	'eal_dev.c',
-	'eal_hugepage_info.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_thread.c',
-	'eal_timer.c',
+        'eal.c',
+        'eal_alarm.c',
+        'eal_cpuflags.c',
+        'eal_debug.c',
+        'eal_dev.c',
+        'eal_hugepage_info.c',
+        'eal_interrupts.c',
+        'eal_lcore.c',
+        'eal_memalloc.c',
+        'eal_memory.c',
+        'eal_thread.c',
+        'eal_timer.c',
 )
 
 deps += ['kvargs', 'telemetry']
diff --git a/lib/librte_eal/include/meson.build b/lib/librte_eal/include/meson.build
index 3969cf4ac..88a9eba12 100644
--- a/lib/librte_eal/include/meson.build
+++ b/lib/librte_eal/include/meson.build
@@ -4,67 +4,67 @@
 includes += include_directories('.')
 
 headers += files(
-	'rte_alarm.h',
-	'rte_bitmap.h',
-	'rte_bitops.h',
-	'rte_branch_prediction.h',
-	'rte_bus.h',
-	'rte_class.h',
-	'rte_common.h',
-	'rte_compat.h',
-	'rte_debug.h',
-	'rte_dev.h',
-	'rte_devargs.h',
-	'rte_eal.h',
-	'rte_eal_memconfig.h',
-	'rte_eal_trace.h',
-	'rte_errno.h',
-	'rte_fbarray.h',
-	'rte_hexdump.h',
-	'rte_hypervisor.h',
-	'rte_interrupts.h',
-	'rte_keepalive.h',
-	'rte_launch.h',
-	'rte_lcore.h',
-	'rte_log.h',
-	'rte_malloc.h',
-	'rte_memory.h',
-	'rte_memzone.h',
-	'rte_pci_dev_feature_defs.h',
-	'rte_pci_dev_features.h',
-	'rte_per_lcore.h',
-	'rte_random.h',
-	'rte_reciprocal.h',
-	'rte_service.h',
-	'rte_service_component.h',
-	'rte_string_fns.h',
-	'rte_tailq.h',
-	'rte_thread.h',
-	'rte_time.h',
-	'rte_trace.h',
-	'rte_trace_point.h',
-	'rte_trace_point_register.h',
-	'rte_uuid.h',
-	'rte_version.h',
-	'rte_vfio.h',
+        'rte_alarm.h',
+        'rte_bitmap.h',
+        'rte_bitops.h',
+        'rte_branch_prediction.h',
+        'rte_bus.h',
+        'rte_class.h',
+        'rte_common.h',
+        'rte_compat.h',
+        'rte_debug.h',
+        'rte_dev.h',
+        'rte_devargs.h',
+        'rte_eal.h',
+        'rte_eal_memconfig.h',
+        'rte_eal_trace.h',
+        'rte_errno.h',
+        'rte_fbarray.h',
+        'rte_hexdump.h',
+        'rte_hypervisor.h',
+        'rte_interrupts.h',
+        'rte_keepalive.h',
+        'rte_launch.h',
+        'rte_lcore.h',
+        'rte_log.h',
+        'rte_malloc.h',
+        'rte_memory.h',
+        'rte_memzone.h',
+        'rte_pci_dev_feature_defs.h',
+        'rte_pci_dev_features.h',
+        'rte_per_lcore.h',
+        'rte_random.h',
+        'rte_reciprocal.h',
+        'rte_service.h',
+        'rte_service_component.h',
+        'rte_string_fns.h',
+        'rte_tailq.h',
+        'rte_thread.h',
+        'rte_time.h',
+        'rte_trace.h',
+        'rte_trace_point.h',
+        'rte_trace_point_register.h',
+        'rte_uuid.h',
+        'rte_version.h',
+        'rte_vfio.h',
 )
 indirect_headers += files('rte_eal_interrupts.h')
 
 # special case install the generic headers, since they go in a subdir
 generic_headers = files(
-	'generic/rte_atomic.h',
-	'generic/rte_byteorder.h',
-	'generic/rte_cpuflags.h',
-	'generic/rte_cycles.h',
-	'generic/rte_io.h',
-	'generic/rte_mcslock.h',
-	'generic/rte_memcpy.h',
-	'generic/rte_pause.h',
-	'generic/rte_power_intrinsics.h',
-	'generic/rte_prefetch.h',
-	'generic/rte_rwlock.h',
-	'generic/rte_spinlock.h',
-	'generic/rte_ticketlock.h',
-	'generic/rte_vect.h',
+        'generic/rte_atomic.h',
+        'generic/rte_byteorder.h',
+        'generic/rte_cpuflags.h',
+        'generic/rte_cycles.h',
+        'generic/rte_io.h',
+        'generic/rte_mcslock.h',
+        'generic/rte_memcpy.h',
+        'generic/rte_pause.h',
+        'generic/rte_power_intrinsics.h',
+        'generic/rte_prefetch.h',
+        'generic/rte_rwlock.h',
+        'generic/rte_spinlock.h',
+        'generic/rte_ticketlock.h',
+        'generic/rte_vect.h',
 )
 install_headers(generic_headers, subdir: 'generic')
diff --git a/lib/librte_eal/linux/meson.build b/lib/librte_eal/linux/meson.build
index 7742aa475..65f2ac6b4 100644
--- a/lib/librte_eal/linux/meson.build
+++ b/lib/librte_eal/linux/meson.build
@@ -4,24 +4,24 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_cpuflags.c',
-	'eal_debug.c',
-	'eal_dev.c',
-	'eal_hugepage_info.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_log.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_thread.c',
-	'eal_timer.c',
-	'eal_vfio.c',
-	'eal_vfio_mp_sync.c',
+        'eal.c',
+        'eal_alarm.c',
+        'eal_cpuflags.c',
+        'eal_debug.c',
+        'eal_dev.c',
+        'eal_hugepage_info.c',
+        'eal_interrupts.c',
+        'eal_lcore.c',
+        'eal_log.c',
+        'eal_memalloc.c',
+        'eal_memory.c',
+        'eal_thread.c',
+        'eal_timer.c',
+        'eal_vfio.c',
+        'eal_vfio_mp_sync.c',
 )
 
 deps += ['kvargs', 'telemetry']
 if has_libnuma == 1
-	dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
+    dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
 endif
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 7d6222e78..1722924f6 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -7,7 +7,7 @@ subdir('include')
 subdir('common')
 
 if not is_windows
-	subdir('unix')
+    subdir('unix')
 endif
 
 dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
@@ -17,11 +17,11 @@ subdir(arch_subdir)
 
 deps += ['kvargs']
 if not is_windows
-	deps += ['telemetry']
+    deps += ['telemetry']
 endif
 if dpdk_conf.has('RTE_USE_LIBBSD')
-	ext_deps += libbsd
+    ext_deps += libbsd
 endif
 if cc.has_function('getentropy', prefix : '#include <unistd.h>')
-	cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
+    cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
 endif
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index 7692a531c..1e1f39c05 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -2,21 +2,21 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 arch_headers = files(
-	'rte_altivec.h',
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags.h',
-	'rte_cycles.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy.h',
-	'rte_pause.h',
-	'rte_pflock.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+        'rte_altivec.h',
+        'rte_atomic.h',
+        'rte_byteorder.h',
+        'rte_cpuflags.h',
+        'rte_cycles.h',
+        'rte_io.h',
+        'rte_mcslock.h',
+        'rte_memcpy.h',
+        'rte_pause.h',
+        'rte_pflock.h',
+        'rte_power_intrinsics.h',
+        'rte_prefetch.h',
+        'rte_rwlock.h',
+        'rte_spinlock.h',
+        'rte_ticketlock.h',
+        'rte_vect.h',
 )
 install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/ppc/meson.build b/lib/librte_eal/ppc/meson.build
index 43c46542f..71c7ac870 100644
--- a/lib/librte_eal/ppc/meson.build
+++ b/lib/librte_eal/ppc/meson.build
@@ -4,8 +4,8 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_power_intrinsics.c',
+        'rte_cpuflags.c',
+        'rte_cycles.c',
+        'rte_hypervisor.c',
+        'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_eal/unix/meson.build b/lib/librte_eal/unix/meson.build
index 71221b84a..dc711b424 100644
--- a/lib/librte_eal/unix/meson.build
+++ b/lib/librte_eal/unix/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2020 Dmitry Kozlyuk
 
 sources += files(
-	'eal_file.c',
-	'eal_unix_memory.c',
-	'eal_unix_timer.c',
-	'rte_thread.c',
+        'eal_file.c',
+        'eal_unix_memory.c',
+        'eal_unix_timer.c',
+        'rte_thread.c',
 )
diff --git a/lib/librte_eal/windows/meson.build b/lib/librte_eal/windows/meson.build
index 42ff5c2d5..ff9cbec41 100644
--- a/lib/librte_eal/windows/meson.build
+++ b/lib/librte_eal/windows/meson.build
@@ -4,22 +4,22 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_debug.c',
-	'eal_file.c',
-	'eal_hugepages.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_log.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_mp.c',
-	'eal_thread.c',
-	'eal_timer.c',
-	'fnmatch.c',
-	'getopt.c',
-	'rte_thread.c',
+        'eal.c',
+        'eal_alarm.c',
+        'eal_debug.c',
+        'eal_file.c',
+        'eal_hugepages.c',
+        'eal_interrupts.c',
+        'eal_lcore.c',
+        'eal_log.c',
+        'eal_memalloc.c',
+        'eal_memory.c',
+        'eal_mp.c',
+        'eal_thread.c',
+        'eal_timer.c',
+        'fnmatch.c',
+        'getopt.c',
+        'rte_thread.c',
 )
 
 dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index f43645c20..12c2e0003 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -2,29 +2,28 @@
 # Copyright(c) 2017 Intel Corporation
 
 arch_headers = files(
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags.h',
-	'rte_cycles.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy.h',
-	'rte_pause.h',
-	'rte_pflock.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch.h',
-	'rte_rtm.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+        'rte_atomic.h',
+        'rte_byteorder.h',
+        'rte_cpuflags.h',
+        'rte_cycles.h',
+        'rte_io.h',
+        'rte_mcslock.h',
+        'rte_memcpy.h',
+        'rte_pause.h',
+        'rte_pflock.h',
+        'rte_power_intrinsics.h',
+        'rte_prefetch.h',
+        'rte_rtm.h',
+        'rte_rwlock.h',
+        'rte_spinlock.h',
+        'rte_ticketlock.h',
+        'rte_vect.h',
 )
 arch_indirect_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
-	'rte_byteorder_32.h',
-	'rte_byteorder_64.h',
+        'rte_atomic_32.h',
+        'rte_atomic_64.h',
+        'rte_byteorder_32.h',
+        'rte_byteorder_64.h',
 )
-install_headers(arch_headers + arch_indirect_headers,
-		subdir: get_option('include_subdir_arch'))
+install_headers(arch_headers + arch_indirect_headers, subdir: get_option('include_subdir_arch'))
 dpdk_chkinc_headers += arch_headers
diff --git a/lib/librte_eal/x86/meson.build b/lib/librte_eal/x86/meson.build
index dfd42dee0..d33a240e1 100644
--- a/lib/librte_eal/x86/meson.build
+++ b/lib/librte_eal/x86/meson.build
@@ -4,9 +4,9 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_spinlock.c',
-	'rte_power_intrinsics.c',
+        'rte_cpuflags.c',
+        'rte_cycles.c',
+        'rte_hypervisor.c',
+        'rte_spinlock.c',
+        'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build
index 4353fa6b7..0205c853d 100644
--- a/lib/librte_ethdev/meson.build
+++ b/lib/librte_ethdev/meson.build
@@ -1,33 +1,39 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('ethdev_private.c',
-	'ethdev_profile.c',
-	'ethdev_trace_points.c',
-	'rte_class_eth.c',
-	'rte_ethdev.c',
-	'rte_flow.c',
-	'rte_mtr.c',
-	'rte_tm.c')
+sources = files(
+        'ethdev_private.c',
+        'ethdev_profile.c',
+        'ethdev_trace_points.c',
+        'rte_class_eth.c',
+        'rte_ethdev.c',
+        'rte_flow.c',
+        'rte_mtr.c',
+        'rte_tm.c',
+)
 
-headers = files('rte_ethdev.h',
-	'rte_ethdev_trace.h',
-	'rte_ethdev_trace_fp.h',
-	'rte_dev_info.h',
-	'rte_flow.h',
-	'rte_flow_driver.h',
-	'rte_mtr.h',
-	'rte_mtr_driver.h',
-	'rte_tm.h',
-	'rte_tm_driver.h')
+headers = files(
+        'rte_ethdev.h',
+        'rte_ethdev_trace.h',
+        'rte_ethdev_trace_fp.h',
+        'rte_dev_info.h',
+        'rte_flow.h',
+        'rte_flow_driver.h',
+        'rte_mtr.h',
+        'rte_mtr_driver.h',
+        'rte_tm.h',
+        'rte_tm_driver.h',
+)
 
 indirect_headers += files(
-	'rte_ethdev_core.h',
-	'rte_eth_ctrl.h')
+        'rte_ethdev_core.h',
+        'rte_eth_ctrl.h',
+)
 
 driver_sdk_headers += files(
-	'ethdev_driver.h',
-	'ethdev_pci.h',
-	'ethdev_vdev.h')
+        'ethdev_driver.h',
+        'ethdev_pci.h',
+        'ethdev_vdev.h',
+)
 
 deps += ['net', 'kvargs', 'meter', 'telemetry']
diff --git a/lib/librte_eventdev/meson.build b/lib/librte_eventdev/meson.build
index 79d36d37b..32abeba79 100644
--- a/lib/librte_eventdev/meson.build
+++ b/lib/librte_eventdev/meson.build
@@ -2,26 +2,30 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_linux
-	cflags += '-DLINUX'
+    cflags += '-DLINUX'
 else
-	cflags += '-DBSD'
+    cflags += '-DBSD'
 endif
 
-sources = files('rte_eventdev.c',
-		'rte_event_ring.c',
-		'eventdev_trace_points.c',
-		'rte_event_eth_rx_adapter.c',
-		'rte_event_timer_adapter.c',
-		'rte_event_crypto_adapter.c',
-		'rte_event_eth_tx_adapter.c')
-headers = files('rte_eventdev.h',
-		'rte_eventdev_trace.h',
-		'rte_eventdev_trace_fp.h',
-		'rte_event_ring.h',
-		'rte_event_eth_rx_adapter.h',
-		'rte_event_timer_adapter.h',
-		'rte_event_timer_adapter_pmd.h',
-		'rte_event_crypto_adapter.h',
-		'rte_event_eth_tx_adapter.h')
+sources = files(
+        'rte_eventdev.c',
+        'rte_event_ring.c',
+        'eventdev_trace_points.c',
+        'rte_event_eth_rx_adapter.c',
+        'rte_event_timer_adapter.c',
+        'rte_event_crypto_adapter.c',
+        'rte_event_eth_tx_adapter.c',
+)
+headers = files(
+        'rte_eventdev.h',
+        'rte_eventdev_trace.h',
+        'rte_eventdev_trace_fp.h',
+        'rte_event_ring.h',
+        'rte_event_eth_rx_adapter.h',
+        'rte_event_timer_adapter.h',
+        'rte_event_timer_adapter_pmd.h',
+        'rte_event_crypto_adapter.h',
+        'rte_event_eth_tx_adapter.h',
+)
 deps += ['ring', 'ethdev', 'hash', 'mempool', 'mbuf', 'timer', 'cryptodev']
 deps += ['telemetry']
diff --git a/lib/librte_fib/meson.build b/lib/librte_fib/meson.build
index 18eadcc56..5618c215a 100644
--- a/lib/librte_fib/meson.build
+++ b/lib/librte_fib/meson.build
@@ -9,50 +9,50 @@ deps += ['rib']
 # compile AVX512 version if:
 # we are building 64-bit binary AND binutils can generate proper code
 if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
-	# compile AVX512 version if either:
-	# a. we have AVX512F supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	#
-	# in former case, just add avx512 C file to files list
-	# in latter case, compile c file to static lib, using correct
-	# compiler flags, and then have the .o file from static lib
-	# linked into main lib.
+    # compile AVX512 version if either:
+    # a. we have AVX512F supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    #
+    # in former case, just add avx512 C file to files list
+    # in latter case, compile c file to static lib, using correct
+    # compiler flags, and then have the .o file from static lib
+    # linked into main lib.
 
-	# check if all required flags already enabled (variant a).
-	acl_avx512_flags = ['__AVX512F__','__AVX512DQ__']
-	acl_avx512_on = true
-	foreach f:acl_avx512_flags
-		if cc.get_define(f, args: machine_args) == ''
-			acl_avx512_on = false
-		endif
-	endforeach
+    # check if all required flags already enabled (variant a).
+    acl_avx512_flags = ['__AVX512F__','__AVX512DQ__']
+    acl_avx512_on = true
+    foreach f:acl_avx512_flags
+        if cc.get_define(f, args: machine_args) == ''
+            acl_avx512_on = false
+        endif
+    endforeach
 
-	if acl_avx512_on == true
-		cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
-		sources += files('dir24_8_avx512.c')
-		# TRIE AVX512 implementation uses avx512bw intrinsics along with
-		# avx512f and avx512dq
-		if cc.get_define('__AVX512BW__', args: machine_args) != ''
-			cflags += ['-DCC_TRIE_AVX512_SUPPORT']
-			sources += files('trie_avx512.c')
-		endif
-	elif cc.has_multi_arguments('-mavx512f', '-mavx512dq')
-		dir24_8_avx512_tmp = static_library('dir24_8_avx512_tmp',
-				'dir24_8_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx512f', '-mavx512dq'])
-		objs += dir24_8_avx512_tmp.extract_objects('dir24_8_avx512.c')
-		cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
-		# TRIE AVX512 implementation uses avx512bw intrinsics along with
-		# avx512f and avx512dq
-		if cc.has_argument('-mavx512bw')
-			trie_avx512_tmp = static_library('trie_avx512_tmp',
-				'trie_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx512f', \
-					'-mavx512dq', '-mavx512bw'])
-			objs += trie_avx512_tmp.extract_objects('trie_avx512.c')
-			cflags += ['-DCC_TRIE_AVX512_SUPPORT']
-		endif
-	endif
+    if acl_avx512_on == true
+        cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
+        sources += files('dir24_8_avx512.c')
+        # TRIE AVX512 implementation uses avx512bw intrinsics along with
+        # avx512f and avx512dq
+        if cc.get_define('__AVX512BW__', args: machine_args) != ''
+            cflags += ['-DCC_TRIE_AVX512_SUPPORT']
+            sources += files('trie_avx512.c')
+        endif
+    elif cc.has_multi_arguments('-mavx512f', '-mavx512dq')
+        dir24_8_avx512_tmp = static_library('dir24_8_avx512_tmp',
+                'dir24_8_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx512f', '-mavx512dq'])
+        objs += dir24_8_avx512_tmp.extract_objects('dir24_8_avx512.c')
+        cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
+        # TRIE AVX512 implementation uses avx512bw intrinsics along with
+        # avx512f and avx512dq
+        if cc.has_argument('-mavx512bw')
+            trie_avx512_tmp = static_library('trie_avx512_tmp',
+                'trie_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx512f', \
+                    '-mavx512dq', '-mavx512bw'])
+            objs += trie_avx512_tmp.extract_objects('trie_avx512.c')
+            cflags += ['-DCC_TRIE_AVX512_SUPPORT']
+        endif
+    endif
 endif
diff --git a/lib/librte_graph/meson.build b/lib/librte_graph/meson.build
index d3ec78ca6..6befb094d 100644
--- a/lib/librte_graph/meson.build
+++ b/lib/librte_graph/meson.build
@@ -1,7 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2020 Marvell International Ltd.
 
-sources = files('node.c', 'graph.c', 'graph_ops.c', 'graph_debug.c', 'graph_stats.c', 'graph_populate.c')
+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')
 
 deps += ['eal']
diff --git a/lib/librte_gro/meson.build b/lib/librte_gro/meson.build
index ea8b45cc2..86fe59ecd 100644
--- a/lib/librte_gro/meson.build
+++ b/lib/librte_gro/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_gro.c', 'gro_tcp4.c', 'gro_udp4.c', 'gro_vxlan_tcp4.c', 'gro_vxlan_udp4.c')
+sources = files(
+        'rte_gro.c',
+         'gro_tcp4.c',
+         'gro_udp4.c',
+         'gro_vxlan_tcp4.c',
+         'gro_vxlan_udp4.c',
+)
 headers = files('rte_gro.h')
 deps += ['ethdev']
diff --git a/lib/librte_gso/meson.build b/lib/librte_gso/meson.build
index 05904f2fe..622411df8 100644
--- a/lib/librte_gso/meson.build
+++ b/lib/librte_gso/meson.build
@@ -1,7 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('gso_common.c', 'gso_tcp4.c', 'gso_udp4.c',
-		'gso_tunnel_tcp4.c', 'gso_tunnel_udp4.c', 'rte_gso.c')
+sources = files(
+        'gso_common.c',
+        'gso_tcp4.c',
+        'gso_udp4.c',
+        'gso_tunnel_tcp4.c',
+        'gso_tunnel_udp4.c',
+        'rte_gso.c',
+)
 headers = files('rte_gso.h')
 deps += ['ethdev']
diff --git a/lib/librte_hash/meson.build b/lib/librte_hash/meson.build
index 242859f5a..c3c251e2b 100644
--- a/lib/librte_hash/meson.build
+++ b/lib/librte_hash/meson.build
@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-headers = files('rte_fbk_hash.h',
-	'rte_hash_crc.h',
-	'rte_hash.h',
-	'rte_jhash.h',
-	'rte_thash.h')
+headers = files(
+        'rte_fbk_hash.h',
+        'rte_hash_crc.h',
+        'rte_hash.h',
+        'rte_jhash.h',
+        'rte_thash.h',
+)
 indirect_headers += files('rte_crc_arm64.h')
 
 sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c')
diff --git a/lib/librte_ip_frag/meson.build b/lib/librte_ip_frag/meson.build
index c5b9a4596..ea2de09f7 100644
--- a/lib/librte_ip_frag/meson.build
+++ b/lib/librte_ip_frag/meson.build
@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_ipv4_fragmentation.c',
-		'rte_ipv6_fragmentation.c',
-		'rte_ipv4_reassembly.c',
-		'rte_ipv6_reassembly.c',
-		'rte_ip_frag_common.c',
-		'ip_frag_internal.c')
+sources = files(
+        'rte_ipv4_fragmentation.c',
+        'rte_ipv6_fragmentation.c',
+        'rte_ipv4_reassembly.c',
+        'rte_ipv6_reassembly.c',
+        'rte_ip_frag_common.c',
+        'ip_frag_internal.c',
+)
 headers = files('rte_ip_frag.h')
 deps += ['ethdev', 'hash']
diff --git a/lib/librte_kni/meson.build b/lib/librte_kni/meson.build
index 55e47df41..e2e4e44fc 100644
--- a/lib/librte_kni/meson.build
+++ b/lib/librte_kni/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
+    build = false
+    reason = 'only supported on 64-bit Linux'
 endif
 sources = files('rte_kni.c')
 headers = files('rte_kni.h', 'rte_kni_common.h')
diff --git a/lib/librte_lpm/meson.build b/lib/librte_lpm/meson.build
index 90cbf8646..5ca54815e 100644
--- a/lib/librte_lpm/meson.build
+++ b/lib/librte_lpm/meson.build
@@ -5,6 +5,11 @@ sources = files('rte_lpm.c', 'rte_lpm6.c')
 headers = files('rte_lpm.h', 'rte_lpm6.h')
 # since header files have different names, we can install all vector headers
 # without worrying about which architecture we actually need
-indirect_headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h')
+indirect_headers += files(
+        'rte_lpm_altivec.h',
+        'rte_lpm_neon.h',
+        'rte_lpm_sse.h',
+        'rte_lpm_sve.h',
+)
 deps += ['hash']
 deps += ['rcu']
diff --git a/lib/librte_mbuf/meson.build b/lib/librte_mbuf/meson.build
index e95c770e5..c8c08220a 100644
--- a/lib/librte_mbuf/meson.build
+++ b/lib/librte_mbuf/meson.build
@@ -1,9 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_mbuf.c', 'rte_mbuf_ptype.c', 'rte_mbuf_pool_ops.c',
-	'rte_mbuf_dyn.c')
-headers = files('rte_mbuf.h', 'rte_mbuf_core.h',
-		'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h',
-		'rte_mbuf_dyn.h')
+sources = files(
+        'rte_mbuf.c',
+        'rte_mbuf_ptype.c',
+        'rte_mbuf_pool_ops.c',
+        'rte_mbuf_dyn.c',
+)
+headers = files(
+        'rte_mbuf.h',
+        'rte_mbuf_core.h',
+        'rte_mbuf_ptype.h',
+        'rte_mbuf_pool_ops.h',
+        'rte_mbuf_dyn.h'
+)
 deps += ['mempool']
diff --git a/lib/librte_mempool/meson.build b/lib/librte_mempool/meson.build
index a6e861cbf..670c59502 100644
--- a/lib/librte_mempool/meson.build
+++ b/lib/librte_mempool/meson.build
@@ -4,13 +4,20 @@
 extra_flags = []
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
-sources = files('rte_mempool.c', 'rte_mempool_ops.c',
-		'rte_mempool_ops_default.c', 'mempool_trace_points.c')
-headers = files('rte_mempool.h', 'rte_mempool_trace.h',
-		'rte_mempool_trace_fp.h')
+sources = files(
+        'rte_mempool.c',
+        'rte_mempool_ops.c',
+        'rte_mempool_ops_default.c',
+        'mempool_trace_points.c',
+)
+ headers = files(
+        'rte_mempool.h',
+        'rte_mempool_trace.h',
+        'rte_mempool_trace_fp.h',
+)
 deps += ['ring']
diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build
index d5be6a214..3cb43d9ee 100644
--- a/lib/librte_metrics/meson.build
+++ b/lib/librte_metrics/meson.build
@@ -6,8 +6,8 @@ headers = files('rte_metrics.h', 'rte_metrics_telemetry.h')
 
 jansson = dependency('jansson', required: false, method: 'pkg-config')
 if jansson.found()
-	dpdk_conf.set('RTE_HAS_JANSSON', 1)
-	ext_deps += jansson
+    dpdk_conf.set('RTE_HAS_JANSSON', 1)
+    ext_deps += jansson
 endif
 
 deps += ['ethdev', 'telemetry']
diff --git a/lib/librte_net/meson.build b/lib/librte_net/meson.build
index 94d816e79..a4e395e9c 100644
--- a/lib/librte_net/meson.build
+++ b/lib/librte_net/meson.build
@@ -1,110 +1,121 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2020 Intel Corporation
 
-headers = files('rte_ip.h',
-	'rte_tcp.h',
-	'rte_udp.h',
-	'rte_esp.h',
-	'rte_sctp.h',
-	'rte_icmp.h',
-	'rte_arp.h',
-	'rte_ether.h',
-	'rte_vxlan.h',
-	'rte_gre.h',
-	'rte_gtp.h',
-	'rte_net.h',
-	'rte_net_crc.h',
-	'rte_mpls.h',
-	'rte_higig.h',
-	'rte_ecpri.h',
-	'rte_geneve.h')
+headers = files(
+        'rte_ip.h',
+        'rte_tcp.h',
+        'rte_udp.h',
+        'rte_esp.h',
+        'rte_sctp.h',
+        'rte_icmp.h',
+        'rte_arp.h',
+        'rte_ether.h',
+        'rte_vxlan.h',
+        'rte_gre.h',
+        'rte_gtp.h',
+        'rte_net.h',
+        'rte_net_crc.h',
+        'rte_mpls.h',
+        'rte_higig.h',
+        'rte_ecpri.h',
+        'rte_geneve.h',
+)
 
-sources = files('rte_arp.c', 'rte_ether.c', 'rte_net.c', 'rte_net_crc.c')
+sources = files(
+        'rte_arp.c',
+        'rte_ether.c',
+        'rte_net.c',
+        'rte_net_crc.c',
+)
 deps += ['mbuf']
 
 if dpdk_conf.has('RTE_ARCH_X86_64')
-	net_crc_sse42_cpu_support = (
-		cc.get_define('__PCLMUL__', args: machine_args) != '')
-	net_crc_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '' and
-		cc.get_define('__AVX512DQ__', args: machine_args) != '' and
-		cc.get_define('__AVX512VL__', args: machine_args) != '' and
-		cc.get_define('__VPCLMULQDQ__', args: machine_args) != '')
+    net_crc_sse42_cpu_support = (cc.get_define('__PCLMUL__', args: machine_args) != '')
+    net_crc_avx512_cpu_support = (
+            cc.get_define('__AVX512F__', args: machine_args) != '' and
+            cc.get_define('__AVX512BW__', args: machine_args) != '' and
+            cc.get_define('__AVX512DQ__', args: machine_args) != '' and
+            cc.get_define('__AVX512VL__', args: machine_args) != '' and
+            cc.get_define('__VPCLMULQDQ__', args: machine_args) != ''
+    )
 
-	net_crc_sse42_cc_support = (
-		cc.has_argument('-mpclmul') and cc.has_argument('-maes'))
-	net_crc_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw') and
-		cc.has_argument('-mavx512dq') and
-		cc.has_argument('-mavx512vl') and
-		cc.has_argument('-mvpclmulqdq') and
-		cc.has_argument('-mavx2') and
-		cc.has_argument('-mavx'))
+    net_crc_sse42_cc_support = (cc.has_argument('-mpclmul') and cc.has_argument('-maes'))
+    net_crc_avx512_cc_support = (
+            not machine_args.contains('-mno-avx512f') and
+            cc.has_argument('-mavx512f') and
+            cc.has_argument('-mavx512bw') and
+            cc.has_argument('-mavx512dq') and
+            cc.has_argument('-mavx512vl') and
+            cc.has_argument('-mvpclmulqdq') and
+            cc.has_argument('-mavx2') and
+            cc.has_argument('-mavx')
+    )
 
-	build_static_net_crc_sse42_lib = 0
-	build_static_net_crc_avx512_lib = 0
+    build_static_net_crc_sse42_lib = 0
+    build_static_net_crc_avx512_lib = 0
 
-	if net_crc_sse42_cpu_support == true
-		sources += files('net_crc_sse.c')
-		cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
-		if net_crc_avx512_cpu_support == true
-			sources += files('net_crc_avx512.c')
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		elif net_crc_avx512_cc_support == true
-			build_static_net_crc_avx512_lib = 1
-			net_crc_avx512_lib_cflags = ['-mavx512f',
-							'-mavx512bw',
-							'-mavx512dq',
-							'-mavx512vl',
-							'-mvpclmulqdq',
-							'-mavx2',
-							'-mavx']
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		endif
-	elif net_crc_sse42_cc_support == true
-		build_static_net_crc_sse42_lib = 1
-		net_crc_sse42_lib_cflags = ['-mpclmul', '-maes']
-		cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
-		if net_crc_avx512_cc_support == true
-			build_static_net_crc_avx512_lib = 1
-			net_crc_avx512_lib_cflags = ['-mpclmul',
-							'-maes',
-							'-mavx512f',
-							'-mavx512bw',
-							'-mavx512dq',
-							'-mavx512vl',
-							'-mvpclmulqdq',
-							'-mavx2',
-							'-mavx']
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		endif
-	endif
+    if net_crc_sse42_cpu_support == true
+        sources += files('net_crc_sse.c')
+        cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
+        if net_crc_avx512_cpu_support == true
+            sources += files('net_crc_avx512.c')
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        elif net_crc_avx512_cc_support == true
+            build_static_net_crc_avx512_lib = 1
+            net_crc_avx512_lib_cflags = [
+                    '-mavx512f',
+                    '-mavx512bw',
+                    '-mavx512dq',
+                    '-mavx512vl',
+                    '-mvpclmulqdq',
+                    '-mavx2',
+                    '-mavx',
+            ]
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        endif
+    elif net_crc_sse42_cc_support == true
+        build_static_net_crc_sse42_lib = 1
+        net_crc_sse42_lib_cflags = ['-mpclmul', '-maes']
+        cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
+        if net_crc_avx512_cc_support == true
+            build_static_net_crc_avx512_lib = 1
+            net_crc_avx512_lib_cflags = [
+                    '-mpclmul',
+                    '-maes',
+                    '-mavx512f',
+                    '-mavx512bw',
+                    '-mavx512dq',
+                    '-mavx512vl',
+                    '-mvpclmulqdq',
+                    '-mavx2',
+                    '-mavx',
+            ]
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        endif
+    endif
 
-	if build_static_net_crc_sse42_lib == 1
-		net_crc_sse42_lib = static_library(
-					'net_crc_sse42_lib',
-					'net_crc_sse.c',
-					dependencies: static_rte_eal,
-					c_args: [cflags,
-						net_crc_sse42_lib_cflags])
-		objs += net_crc_sse42_lib.extract_objects('net_crc_sse.c')
-	endif
+    if build_static_net_crc_sse42_lib == 1
+        net_crc_sse42_lib = static_library(
+                'net_crc_sse42_lib',
+                'net_crc_sse.c',
+                dependencies: static_rte_eal,
+                c_args: [cflags,
+                    net_crc_sse42_lib_cflags])
+        objs += net_crc_sse42_lib.extract_objects('net_crc_sse.c')
+    endif
 
-	if build_static_net_crc_avx512_lib == 1
-		net_crc_avx512_lib = static_library(
-					'net_crc_avx512_lib',
-					'net_crc_avx512.c',
-					dependencies: static_rte_eal,
-					c_args: [cflags,
-						net_crc_avx512_lib_cflags])
-		objs += net_crc_avx512_lib.extract_objects('net_crc_avx512.c')
-	endif
+    if build_static_net_crc_avx512_lib == 1
+        net_crc_avx512_lib = static_library(
+                'net_crc_avx512_lib',
+                'net_crc_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: [cflags,
+                    net_crc_avx512_lib_cflags])
+        objs += net_crc_avx512_lib.extract_objects('net_crc_avx512.c')
+    endif
 
 elif (dpdk_conf.has('RTE_ARCH_ARM64') and
-		cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '')
-	sources += files('net_crc_neon.c')
-	cflags += ['-DCC_ARM64_NEON_PMULL_SUPPORT']
+        cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '')
+    sources += files('net_crc_neon.c')
+    cflags += ['-DCC_ARM64_NEON_PMULL_SUPPORT']
 endif
diff --git a/lib/librte_node/meson.build b/lib/librte_node/meson.build
index 3d582f616..230aa6fa0 100644
--- a/lib/librte_node/meson.build
+++ b/lib/librte_node/meson.build
@@ -1,8 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2020 Marvell International Ltd.
 
-sources = files('null.c', 'log.c', 'ethdev_rx.c', 'ethdev_tx.c', 'ip4_lookup.c',
-		'ip4_rewrite.c', 'pkt_drop.c', 'ethdev_ctrl.c', 'pkt_cls.c')
+sources = files(
+        'ethdev_ctrl.c',
+        'ethdev_rx.c',
+        'ethdev_tx.c',
+        'ip4_lookup.c',
+        'ip4_rewrite.c',
+        'log.c',
+        'null.c',
+        'pkt_cls.c',
+        'pkt_drop.c',
+)
 headers = files('rte_node_ip4_api.h', 'rte_node_eth_api.h')
 # Strict-aliasing rules are violated by uint8_t[] to context size casts.
 cflags += '-fno-strict-aliasing'
diff --git a/lib/librte_pipeline/meson.build b/lib/librte_pipeline/meson.build
index 65c1a8d6a..9132bb517 100644
--- a/lib/librte_pipeline/meson.build
+++ b/lib/librte_pipeline/meson.build
@@ -1,16 +1,20 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_pipeline.c',
-	'rte_port_in_action.c',
-	'rte_table_action.c',
-	'rte_swx_pipeline.c',
-	'rte_swx_pipeline_spec.c',
-	'rte_swx_ctl.c',)
-headers = files('rte_pipeline.h',
-	'rte_port_in_action.h',
-	'rte_table_action.h',
-	'rte_swx_pipeline.h',
-	'rte_swx_extern.h',
-	'rte_swx_ctl.h',)
+sources = files(
+        'rte_pipeline.c',
+        'rte_port_in_action.c',
+        'rte_table_action.c',
+        'rte_swx_pipeline.c',
+        'rte_swx_pipeline_spec.c',
+        'rte_swx_ctl.c',
+)
+headers = files(
+        'rte_pipeline.h',
+        'rte_port_in_action.h',
+        'rte_table_action.h',
+        'rte_swx_pipeline.h',
+        'rte_swx_extern.h',
+        'rte_swx_ctl.h',
+)
 deps += ['port', 'table', 'meter', 'sched', 'cryptodev']
diff --git a/lib/librte_port/meson.build b/lib/librte_port/meson.build
index 435b64a13..289bc47f6 100644
--- a/lib/librte_port/meson.build
+++ b/lib/librte_port/meson.build
@@ -2,45 +2,45 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files(
-	'rte_port_ethdev.c',
-	'rte_port_fd.c',
-	'rte_port_frag.c',
-	'rte_port_ras.c',
-	'rte_port_ring.c',
-	'rte_port_sched.c',
-	'rte_port_source_sink.c',
-	'rte_port_sym_crypto.c',
-	'rte_port_eventdev.c',
-	'rte_swx_port_ethdev.c',
-	'rte_swx_port_fd.c',
-	'rte_swx_port_ring.c',
-	'rte_swx_port_source_sink.c',
-	)
+        'rte_port_ethdev.c',
+        'rte_port_fd.c',
+        'rte_port_frag.c',
+        'rte_port_ras.c',
+        'rte_port_ring.c',
+        'rte_port_sched.c',
+        'rte_port_source_sink.c',
+        'rte_port_sym_crypto.c',
+        'rte_port_eventdev.c',
+        'rte_swx_port_ethdev.c',
+        'rte_swx_port_fd.c',
+        'rte_swx_port_ring.c',
+        'rte_swx_port_source_sink.c',
+)
 headers = files(
-	'rte_port_ethdev.h',
-	'rte_port_fd.h',
-	'rte_port_frag.h',
-	'rte_port_ras.h',
-	'rte_port.h',
-	'rte_port_ring.h',
-	'rte_port_sched.h',
-	'rte_port_source_sink.h',
-	'rte_port_sym_crypto.h',
-	'rte_port_eventdev.h',
-	'rte_swx_port.h',
-	'rte_swx_port_ethdev.h',
-	'rte_swx_port_fd.h',
-	'rte_swx_port_ring.h',
-	'rte_swx_port_source_sink.h',
-	)
+        'rte_port_ethdev.h',
+        'rte_port_fd.h',
+        'rte_port_frag.h',
+        'rte_port_ras.h',
+        'rte_port.h',
+        'rte_port_ring.h',
+        'rte_port_sched.h',
+        'rte_port_source_sink.h',
+        'rte_port_sym_crypto.h',
+        'rte_port_eventdev.h',
+        'rte_swx_port.h',
+        'rte_swx_port_ethdev.h',
+        'rte_swx_port_fd.h',
+        'rte_swx_port_ring.h',
+        'rte_swx_port_source_sink.h',
+)
 deps += ['ethdev', 'sched', 'ip_frag', 'cryptodev', 'eventdev']
 
 if dpdk_conf.has('RTE_PORT_PCAP')
-	ext_deps += pcap_dep # dependency provided in config/meson.build
+    ext_deps += pcap_dep # dependency provided in config/meson.build
 endif
 
 if dpdk_conf.has('RTE_LIB_KNI')
-	sources += files('rte_port_kni.c')
-	headers += files('rte_port_kni.h')
-	deps += 'kni'
+    sources += files('rte_port_kni.c')
+    headers += files('rte_port_kni.h')
+    deps += 'kni'
 endif
diff --git a/lib/librte_power/meson.build b/lib/librte_power/meson.build
index 9a2dcbfc7..a2cc9fe2e 100644
--- a/lib/librte_power/meson.build
+++ b/lib/librte_power/meson.build
@@ -2,16 +2,23 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
-sources = files('rte_power.c', 'power_acpi_cpufreq.c',
-		'power_kvm_vm.c', 'guest_channel.c',
-		'rte_power_empty_poll.c',
-		'power_pstate_cpufreq.c',
-		'rte_power_pmd_mgmt.c',
-		'power_common.c')
-headers = files('rte_power.h','rte_power_empty_poll.h',
-	'rte_power_pmd_mgmt.h',
-	'rte_power_guest_channel.h')
+sources = files(
+        'guest_channel.c',
+        'power_acpi_cpufreq.c',
+        'power_common.c',
+        'power_kvm_vm.c',
+        'power_pstate_cpufreq.c',
+        'rte_power.c',
+        'rte_power_empty_poll.c',
+        'rte_power_pmd_mgmt.c',
+)
+headers = files(
+        'rte_power.h',
+        'rte_power_empty_poll.h',
+        'rte_power_pmd_mgmt.h',
+        'rte_power_guest_channel.h'
+)
 deps += ['timer', 'ethdev']
diff --git a/lib/librte_regexdev/meson.build b/lib/librte_regexdev/meson.build
index 1b3b6db22..7e12d8cd6 100644
--- a/lib/librte_regexdev/meson.build
+++ b/lib/librte_regexdev/meson.build
@@ -2,7 +2,6 @@
 # Copyright 2020 Mellanox Technologies, Ltd
 
 sources = files('rte_regexdev.c')
-headers = files('rte_regexdev.h',
-	'rte_regexdev_driver.h')
+headers = files('rte_regexdev.h', 'rte_regexdev_driver.h')
 indirect_headers += files('rte_regexdev_core.h')
 deps += ['mbuf']
diff --git a/lib/librte_ring/meson.build b/lib/librte_ring/meson.build
index ea050d564..c20685c68 100644
--- a/lib/librte_ring/meson.build
+++ b/lib/librte_ring/meson.build
@@ -5,15 +5,16 @@ sources = files('rte_ring.c')
 headers = files('rte_ring.h')
 # most sub-headers are not for direct inclusion
 indirect_headers += files (
-		'rte_ring_core.h',
-		'rte_ring_elem.h',
-		'rte_ring_elem_pvt.h',
-		'rte_ring_c11_pvt.h',
-		'rte_ring_generic_pvt.h',
-		'rte_ring_hts.h',
-		'rte_ring_hts_elem_pvt.h',
-		'rte_ring_peek.h',
-		'rte_ring_peek_elem_pvt.h',
-		'rte_ring_peek_zc.h',
-		'rte_ring_rts.h',
-		'rte_ring_rts_elem_pvt.h')
+        'rte_ring_core.h',
+        'rte_ring_elem.h',
+        'rte_ring_elem_pvt.h',
+        'rte_ring_c11_pvt.h',
+        'rte_ring_generic_pvt.h',
+        'rte_ring_hts.h',
+        'rte_ring_hts_elem_pvt.h',
+        'rte_ring_peek.h',
+        'rte_ring_peek_elem_pvt.h',
+        'rte_ring_peek_zc.h',
+        'rte_ring_rts.h',
+        'rte_ring_rts_elem_pvt.h',
+)
diff --git a/lib/librte_sched/meson.build b/lib/librte_sched/meson.build
index f85d64df8..b24f7b877 100644
--- a/lib/librte_sched/meson.build
+++ b/lib/librte_sched/meson.build
@@ -2,6 +2,10 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_sched.c', 'rte_red.c', 'rte_approx.c')
-headers = files('rte_sched.h', 'rte_sched_common.h',
-		'rte_red.h', 'rte_approx.h')
+headers = files(
+        'rte_approx.h',
+        'rte_red.h',
+        'rte_sched.h',
+        'rte_sched_common.h',
+)
 deps += ['mbuf', 'meter']
diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build
index 9ff33722b..2f53f4967 100644
--- a/lib/librte_stack/meson.build
+++ b/lib/librte_stack/meson.build
@@ -5,7 +5,8 @@ sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c')
 headers = files('rte_stack.h')
 # subheaders, not for direct inclusion by apps
 indirect_headers += files(
-		'rte_stack_std.h',
-		'rte_stack_lf.h',
-		'rte_stack_lf_generic.h',
-		'rte_stack_lf_c11.h')
+        'rte_stack_std.h',
+        'rte_stack_lf.h',
+        'rte_stack_lf_generic.h',
+        'rte_stack_lf_c11.h',
+)
diff --git a/lib/librte_table/meson.build b/lib/librte_table/meson.build
index 007ffe013..230f21ea8 100644
--- a/lib/librte_table/meson.build
+++ b/lib/librte_table/meson.build
@@ -1,36 +1,40 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_table_acl.c',
-		'rte_table_lpm.c',
-		'rte_table_lpm_ipv6.c',
-		'rte_table_hash_cuckoo.c',
-		'rte_table_hash_key8.c',
-		'rte_table_hash_key16.c',
-		'rte_table_hash_key32.c',
-		'rte_table_hash_ext.c',
-		'rte_table_hash_lru.c',
-		'rte_table_array.c',
-		'rte_table_stub.c',
-		'rte_swx_table_em.c',
-		'rte_swx_table_wm.c',
-		)
-headers = files('rte_table.h',
-		'rte_table_acl.h',
-		'rte_table_lpm.h',
-		'rte_table_lpm_ipv6.h',
-		'rte_table_hash.h',
-		'rte_table_hash_cuckoo.h',
-		'rte_table_hash_func.h',
-		'rte_lru.h',
-		'rte_table_array.h',
-		'rte_table_stub.h',
-		'rte_swx_table.h',
-		'rte_swx_table_em.h',
-		'rte_swx_table_wm.h',
-		)
+sources = files(
+        'rte_swx_table_em.c',
+        'rte_swx_table_wm.c',
+        'rte_table_acl.c',
+        'rte_table_array.c',
+        'rte_table_hash_cuckoo.c',
+        'rte_table_hash_ext.c',
+        'rte_table_hash_key8.c',
+        'rte_table_hash_key16.c',
+        'rte_table_hash_key32.c',
+        'rte_table_hash_lru.c',
+        'rte_table_lpm.c',
+        'rte_table_lpm_ipv6.c',
+        'rte_table_stub.c',
+)
+headers = files(
+        'rte_lru.h',
+        'rte_swx_table.h',
+        'rte_swx_table_em.h',
+        'rte_swx_table_wm.h',
+        'rte_table.h',
+        'rte_table_acl.h',
+        'rte_table_array.h',
+        'rte_table_hash.h',
+        'rte_table_hash_cuckoo.h',
+        'rte_table_hash_func.h',
+        'rte_table_lpm.h',
+        'rte_table_lpm_ipv6.h',
+        'rte_table_stub.h',
+)
 deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 
-indirect_headers += files('rte_lru_x86.h',
-		'rte_lru_arm64.h',
-		'rte_table_hash_func_arm64.h')
+indirect_headers += files(
+        'rte_lru_arm64.h',
+        'rte_lru_x86.h',
+        'rte_table_hash_func_arm64.h'
+)
diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
index 6185deab3..2d8fe0239 100644
--- a/lib/librte_vhost/meson.build
+++ b/lib/librte_vhost/meson.build
@@ -2,25 +2,36 @@
 # Copyright(c) 2017-2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 if has_libnuma == 1
-	dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
+    dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
 endif
 if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-	cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
+    cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
 elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-	cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
+    cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
 elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-	cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
+    cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
 endif
-dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY',
-	      cc.has_header('linux/userfaultfd.h'))
+dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY', cc.has_header('linux/userfaultfd.h'))
 cflags += '-fno-strict-aliasing'
-sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vdpa.c',
-		'vhost.c', 'vhost_user.c',
-		'virtio_net.c', 'vhost_crypto.c')
-headers = files('rte_vhost.h', 'rte_vdpa.h', 'rte_vdpa_dev.h',
-		'rte_vhost_crypto.h', 'rte_vhost_async.h')
+sources = files(
+        'fd_man.c',
+        'iotlb.c',
+        'socket.c',
+        'vdpa.c',
+        'vhost.c',
+        'vhost_crypto.c',
+        'vhost_user.c',
+        'virtio_net.c',
+)
+headers = files(
+        'rte_vdpa.h',
+        'rte_vdpa_dev.h',
+        'rte_vhost.h',
+        'rte_vhost_async.h',
+        'rte_vhost_crypto.h',
+)
 deps += ['ethdev', 'cryptodev', 'hash', 'pci']
-- 
2.27.0

[dpdk-dev] [PATCH 09/14] drivers: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/baseband/turbo_sw/meson.build   |  46 ++--
 drivers/bus/dpaa/meson.build            |  28 +-
 drivers/bus/fslmc/meson.build           |  30 +-
 drivers/bus/ifpga/meson.build           |   6 +-
 drivers/bus/pci/meson.build             |  24 +-
 drivers/bus/vdev/meson.build            |   2 +-
 drivers/bus/vmbus/meson.build           |  22 +-
 drivers/common/cpt/meson.build          |   9 +-
 drivers/common/dpaax/meson.build        |   8 +-
 drivers/common/mlx5/linux/meson.build   | 349 ++++++++++++------------
 drivers/common/mlx5/meson.build         |  40 +--
 drivers/common/mlx5/windows/meson.build |  30 +-
 drivers/common/mvep/meson.build         |   6 +-
 drivers/common/octeontx2/meson.build    |  29 +-
 drivers/common/qat/meson.build          |  71 ++---
 drivers/common/sfc_efx/base/meson.build | 142 +++++-----
 drivers/common/sfc_efx/meson.build      |  24 +-
 drivers/compress/isal/meson.build       |   4 +-
 drivers/compress/mlx5/meson.build       |  24 +-
 drivers/compress/zlib/meson.build       |   4 +-
 drivers/crypto/aesni_gcm/meson.build    |  22 +-
 drivers/crypto/aesni_mb/meson.build     |  22 +-
 drivers/crypto/armv8/meson.build        |   6 +-
 drivers/crypto/bcmfs/meson.build        |  26 +-
 drivers/crypto/caam_jr/meson.build      |  10 +-
 drivers/crypto/ccp/meson.build          |  16 +-
 drivers/crypto/dpaa2_sec/meson.build    |   6 +-
 drivers/crypto/dpaa_sec/meson.build     |   4 +-
 drivers/crypto/kasumi/meson.build       |  20 +-
 drivers/crypto/mvsam/meson.build        |   6 +-
 drivers/crypto/nitrox/meson.build       |  20 +-
 drivers/crypto/octeontx/meson.build     |  12 +-
 drivers/crypto/octeontx2/meson.build    |  16 +-
 drivers/crypto/openssl/meson.build      |   4 +-
 drivers/crypto/qat/meson.build          |  20 +-
 drivers/crypto/scheduler/meson.build    |  18 +-
 drivers/crypto/snow3g/meson.build       |  18 +-
 drivers/crypto/virtio/meson.build       |   2 +-
 drivers/crypto/zuc/meson.build          |  20 +-
 drivers/event/dlb2/meson.build          |  14 +-
 drivers/event/dpaa/meson.build          |   4 +-
 drivers/event/dpaa2/meson.build         |   8 +-
 drivers/event/dsw/meson.build           |   2 +-
 drivers/event/octeontx/meson.build      |  12 +-
 drivers/event/octeontx2/meson.build     |  24 +-
 drivers/event/opdl/meson.build          |  10 +-
 drivers/event/sw/meson.build            |   8 +-
 drivers/mempool/bucket/meson.build      |   4 +-
 drivers/mempool/dpaa/meson.build        |   4 +-
 drivers/mempool/dpaa2/meson.build       |   4 +-
 drivers/mempool/octeontx/meson.build    |   6 +-
 drivers/mempool/octeontx2/meson.build   |  20 +-
 drivers/mempool/stack/meson.build       |   4 +-
 drivers/net/af_packet/meson.build       |   4 +-
 drivers/net/af_xdp/meson.build          |  24 +-
 drivers/net/ark/meson.build             |  28 +-
 drivers/net/atlantic/meson.build        |  22 +-
 drivers/net/avp/meson.build             |   4 +-
 drivers/net/axgbe/meson.build           |  16 +-
 drivers/net/bnx2x/meson.build           |  18 +-
 drivers/net/bnxt/meson.build            | 124 ++++-----
 drivers/net/bonding/meson.build         |   8 +-
 drivers/net/cxgbe/meson.build           |  30 +-
 drivers/net/dpaa/meson.build            |  16 +-
 drivers/net/dpaa2/meson.build           |  26 +-
 drivers/net/e1000/base/meson.build      |  50 ++--
 drivers/net/e1000/meson.build           |  20 +-
 drivers/net/ena/meson.build             |  10 +-
 drivers/net/enetc/meson.build           |   6 +-
 drivers/net/enic/meson.build            |  46 ++--
 drivers/net/failsafe/meson.build        |  24 +-
 drivers/net/fm10k/base/meson.build      |  28 +-
 drivers/net/fm10k/meson.build           |  12 +-
 drivers/net/hinic/base/meson.build      |  26 +-
 drivers/net/hinic/meson.build           |  16 +-
 drivers/net/hns3/meson.build            |  52 ++--
 drivers/net/i40e/base/meson.build       |  32 +--
 drivers/net/i40e/meson.build            | 110 ++++----
 drivers/net/iavf/meson.build            |  94 +++----
 drivers/net/ice/base/meson.build        |  45 +--
 drivers/net/ice/meson.build             | 102 +++----
 drivers/net/igc/base/meson.build        |  20 +-
 drivers/net/igc/meson.build             |  16 +-
 drivers/net/ionic/meson.build           |  20 +-
 drivers/net/ipn3ke/meson.build          |  18 +-
 drivers/net/ixgbe/base/meson.build      |  42 +--
 drivers/net/ixgbe/meson.build           |  32 +--
 drivers/net/kni/meson.build             |   6 +-
 drivers/net/liquidio/meson.build        |  12 +-
 drivers/net/memif/meson.build           |   6 +-
 drivers/net/mlx4/meson.build            | 160 +++++------
 drivers/net/mlx5/linux/meson.build      |  14 +-
 drivers/net/mlx5/meson.build            |  78 +++---
 drivers/net/mlx5/windows/meson.build    |  10 +-
 drivers/net/mvneta/meson.build          |  16 +-
 drivers/net/mvpp2/meson.build           |  22 +-
 drivers/net/netvsc/meson.build          |   6 +-
 drivers/net/nfb/meson.build             |   6 +-
 drivers/net/nfp/meson.build             |  28 +-
 drivers/net/null/meson.build            |   6 +-
 drivers/net/octeontx/base/meson.build   |  18 +-
 drivers/net/octeontx/meson.build        |  12 +-
 drivers/net/octeontx2/meson.build       |  62 ++---
 drivers/net/pcap/meson.build            |  10 +-
 drivers/net/pfe/meson.build             |  12 +-
 drivers/net/qede/base/meson.build       |  78 +++---
 drivers/net/qede/meson.build            |  22 +-
 drivers/net/ring/meson.build            |   6 +-
 drivers/net/sfc/meson.build             |  64 ++---
 drivers/net/softnic/meson.build         |  32 +--
 drivers/net/szedata2/meson.build        |   6 +-
 drivers/net/tap/meson.build             |  42 +--
 drivers/net/thunderx/base/meson.build   |  10 +-
 drivers/net/thunderx/meson.build        |  14 +-
 drivers/net/txgbe/base/meson.build      |  26 +-
 drivers/net/txgbe/meson.build           |  24 +-
 drivers/net/vdev_netvsc/meson.build     |   4 +-
 drivers/net/vhost/meson.build           |   6 +-
 drivers/net/virtio/meson.build          |  78 +++---
 drivers/net/vmxnet3/meson.build         |  10 +-
 drivers/raw/ifpga/base/meson.build      |  54 ++--
 drivers/raw/ifpga/meson.build           |   8 +-
 drivers/raw/ioat/meson.build            |  18 +-
 drivers/raw/ntb/meson.build             |   2 +-
 drivers/raw/octeontx2_dma/meson.build   |   8 +-
 drivers/raw/octeontx2_ep/meson.build    |   6 +-
 drivers/regex/mlx5/meson.build          |  32 +--
 drivers/regex/octeontx2/meson.build     |  22 +-
 drivers/vdpa/mlx5/meson.build           |  38 +--
 129 files changed, 1767 insertions(+), 1758 deletions(-)

diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build
index 55ef4e4ec..477b8b371 100644
--- a/drivers/baseband/turbo_sw/meson.build
+++ b/drivers/baseband/turbo_sw/meson.build
@@ -6,34 +6,34 @@ path = get_option('flexran_sdk')
 # check for FlexRAN SDK libraries for AVX2
 lib4g = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false)
 if lib4g.found()
-	ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
-	ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
-	ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
-	ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
-	ext_deps += cc.find_library('libstdc++', required: true)
-	ext_deps += cc.find_library('libirc', required: true)
-	ext_deps += cc.find_library('libimf', required: true)
-	ext_deps += cc.find_library('libipps', required: true)
-	ext_deps += cc.find_library('libsvml', required: true)
-	includes += include_directories(path + '/lib_turbo')
-	includes += include_directories(path + '/lib_crc')
-	includes += include_directories(path + '/lib_rate_matching')
-	includes += include_directories(path + '/lib_common')
-	cflags += ['-DRTE_BBDEV_SDK_AVX2']
+    ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
+    ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
+    ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
+    ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
+    ext_deps += cc.find_library('libstdc++', required: true)
+    ext_deps += cc.find_library('libirc', required: true)
+    ext_deps += cc.find_library('libimf', required: true)
+    ext_deps += cc.find_library('libipps', required: true)
+    ext_deps += cc.find_library('libsvml', required: true)
+    includes += include_directories(path + '/lib_turbo')
+    includes += include_directories(path + '/lib_crc')
+    includes += include_directories(path + '/lib_rate_matching')
+    includes += include_directories(path + '/lib_common')
+    cflags += ['-DRTE_BBDEV_SDK_AVX2']
 endif
 
 # check for FlexRAN SDK libraries for AVX512
 lib5g = cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: false)
 if lib5g.found()
-	ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
-	ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
-	includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
-	includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
-	includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
-	includes += include_directories(path + '/lib_rate_dematching_5gnr')
-	cflags += ['-DRTE_BBDEV_SDK_AVX512']
+    ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
+    ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
+    includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
+    includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
+    includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
+    includes += include_directories(path + '/lib_rate_dematching_5gnr')
+    cflags += ['-DRTE_BBDEV_SDK_AVX512']
 endif
 
 deps += ['bbdev', 'bus_vdev', 'ring']
diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build
index a3471403e..9ff7bf21d 100644
--- a/drivers/bus/dpaa/meson.build
+++ b/drivers/bus/dpaa/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev']
 sources = files('base/fman/fman.c',
-		'base/fman/fman_hw.c',
-		'base/fman/netcfg_layer.c',
-		'base/qbman/bman.c',
-		'base/qbman/bman_driver.c',
-		'base/qbman/dpaa_alloc.c',
-		'base/qbman/dpaa_sys.c',
-		'base/qbman/process.c',
-		'base/qbman/qman.c',
-		'base/qbman/qman_driver.c',
-		'dpaa_bus.c')
+        'base/fman/fman_hw.c',
+        'base/fman/netcfg_layer.c',
+        'base/qbman/bman.c',
+        'base/qbman/bman_driver.c',
+        'base/qbman/dpaa_alloc.c',
+        'base/qbman/dpaa_sys.c',
+        'base/qbman/process.c',
+        'base/qbman/qman.c',
+        'base/qbman/qman_driver.c',
+        'dpaa_bus.c')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('include', 'base/qbman')
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index 260e7ef71..90f3e5674 100644
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -2,24 +2,24 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev', 'kvargs']
 sources = files('fslmc_bus.c',
-		'fslmc_vfio.c',
-		'mc/dpbp.c',
-		'mc/dpci.c',
-		'mc/dpcon.c',
-		'mc/dpdmai.c',
-		'mc/dpio.c',
-		'mc/dpmng.c',
-		'mc/mc_sys.c',
-		'portal/dpaa2_hw_dpbp.c',
-		'portal/dpaa2_hw_dpci.c',
-		'portal/dpaa2_hw_dpio.c',
-		'qbman/qbman_portal.c',
-		'qbman/qbman_debug.c')
+        'fslmc_vfio.c',
+        'mc/dpbp.c',
+        'mc/dpci.c',
+        'mc/dpcon.c',
+        'mc/dpdmai.c',
+        'mc/dpio.c',
+        'mc/dpmng.c',
+        'mc/mc_sys.c',
+        'portal/dpaa2_hw_dpbp.c',
+        'portal/dpaa2_hw_dpci.c',
+        'portal/dpaa2_hw_dpio.c',
+        'qbman/qbman_portal.c',
+        'qbman/qbman_debug.c')
 
 includes += include_directories('mc', 'qbman/include', 'portal')
diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build
index 4d0507f55..cc5047e3c 100644
--- a/drivers/bus/ifpga/meson.build
+++ b/drivers/bus/ifpga/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2010-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
 
 deps += ['pci', 'kvargs', 'rawdev']
diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build
index 78ec830b2..800ef7eab 100644
--- a/drivers/bus/pci/meson.build
+++ b/drivers/bus/pci/meson.build
@@ -4,23 +4,23 @@
 deps += ['pci']
 headers = files('rte_bus_pci.h')
 sources = files('pci_common.c',
-	'pci_params.c')
+    'pci_params.c')
 if is_linux
-	sources += files('pci_common_uio.c',
-			'linux/pci.c',
-			'linux/pci_uio.c',
-			'linux/pci_vfio.c')
-	includes += include_directories('linux')
+    sources += files('pci_common_uio.c',
+            'linux/pci.c',
+            'linux/pci_uio.c',
+            'linux/pci_vfio.c')
+    includes += include_directories('linux')
 endif
 if is_freebsd
-	sources += files('pci_common_uio.c',
-			'bsd/pci.c')
-	includes += include_directories('bsd')
+    sources += files('pci_common_uio.c',
+            'bsd/pci.c')
+    includes += include_directories('bsd')
 endif
 if is_windows
-	sources += files('windows/pci.c',
-			'windows/pci_netuio.c')
-	includes += include_directories('windows')
+    sources += files('windows/pci.c',
+            'windows/pci_netuio.c')
+    includes += include_directories('windows')
 endif
 
 deps += ['kvargs']
diff --git a/drivers/bus/vdev/meson.build b/drivers/bus/vdev/meson.build
index 44b2966ba..353742334 100644
--- a/drivers/bus/vdev/meson.build
+++ b/drivers/bus/vdev/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('vdev.c',
-	'vdev_params.c')
+    'vdev_params.c')
 headers = files('rte_bus_vdev.h')
 
 deps += ['kvargs']
diff --git a/drivers/bus/vmbus/meson.build b/drivers/bus/vmbus/meson.build
index 47e26703a..50a2409e0 100644
--- a/drivers/bus/vmbus/meson.build
+++ b/drivers/bus/vmbus/meson.build
@@ -1,24 +1,24 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 
 headers = files('rte_bus_vmbus.h','rte_vmbus_reg.h')
 
 sources = files('vmbus_common.c',
-		'vmbus_channel.c',
-		'vmbus_bufring.c',
-		'vmbus_common_uio.c')
+        'vmbus_channel.c',
+        'vmbus_bufring.c',
+        'vmbus_common_uio.c')
 
 if is_linux
-	sources += files('linux/vmbus_bus.c',
-			'linux/vmbus_uio.c')
-	includes += include_directories('linux')
+    sources += files('linux/vmbus_bus.c',
+            'linux/vmbus_uio.c')
+    includes += include_directories('linux')
 else
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
diff --git a/drivers/common/cpt/meson.build b/drivers/common/cpt/meson.build
index 1127267ba..c09824a65 100644
--- a/drivers/common/cpt/meson.build
+++ b/drivers/common/cpt/meson.build
@@ -2,13 +2,12 @@
 # Copyright(c) 2018 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('cpt_fpm_tables.c',
-		'cpt_pmd_ops_helper.c')
+sources = files('cpt_fpm_tables.c', 'cpt_pmd_ops_helper.c')
 
 deps = ['kvargs', 'pci', 'cryptodev']
 includes += include_directories('../../crypto/octeontx')
diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build
index b7f177a62..a16277911 100644
--- a/drivers/common/dpaax/meson.build
+++ b/drivers/common/dpaax/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
@@ -11,8 +11,8 @@ sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
 includes += include_directories('caamflib')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 5d6a86168..36ceab30e 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -9,48 +9,47 @@ LIB_GLUE_BASE = 'librte_common_mlx5_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+        '-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
+        '-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx5', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs, required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources += files('mlx5_nl.c')
 sources += files('mlx5_common_os.c')
 sources += files('mlx5_common_verbs.c')
 if not dlopen_ibverbs
-	sources += files('mlx5_glue.c')
+    sources += files('mlx5_glue.c')
 endif
 
 # To maintain the compatibility with the make build system
@@ -59,171 +58,167 @@ endif
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search", "struct member to search" ]
 has_member_args = [
-	[ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
-	'struct ibv_counter_set_init_attr', 'counter_set_id' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
-	'struct ibv_counters_init_attr', 'comp_mask' ],
-	[ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_devx_uar', 'mmap_off' ],
+        [ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
+            'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
+        [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
+            'struct ibv_counter_set_init_attr', 'counter_set_id' ],
+        [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
+            'struct ibv_counters_init_attr', 'comp_mask' ],
+        [ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
+            'struct mlx5dv_devx_uar', 'mmap_off' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
-	'IBV_ACCESS_RELAXED_ORDERING ' ],
-	[ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
-	[ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
-	[ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
-	[ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_create_flow_action_packet_reformat' ],
-	[ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
-	'IBV_FLOW_SPEC_MPLS' ],
-	[ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
-	[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAG_RX_END_PADDING' ],
-	[ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_query_devx_port' ],
-	[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_create' ],
-	[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
-	[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_query_async' ],
-	[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_qp_query' ],
-	[ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
-	'mlx5dv_pp_alloc' ],
-	[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_devx_tir' ],
-	[ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_get_event' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_meter' ],
-	[ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
-	'MLX5_MMAP_GET_NC_PAGES_CMD' ],
-	[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
-	[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
-	[ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_push_vlan' ],
-	[ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
-	[ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_ENHANCED_MPSW' ],
-	[ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_SEND_EN' ],
-	[ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_WAIT' ],
+        [ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
+            'IBV_ACCESS_RELAXED_ORDERING ' ],
+        [ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
+            'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
+        [ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
+        [ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
+        [ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
+        [ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
+            'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
+        [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
+            'mlx5dv_create_flow_action_packet_reformat' ],
+        [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
+            'IBV_FLOW_SPEC_MPLS' ],
+        [ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
+            'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
+        [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
+            'IBV_WQ_FLAG_RX_END_PADDING' ],
+        [ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
+            'mlx5dv_query_devx_port' ],
+        [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_obj_create' ],
+        [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
+            'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
+            'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
+        [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_obj_query_async' ],
+        [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_qp_query' ],
+        [ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
+            'mlx5dv_pp_alloc' ],
+        [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_dest_devx_tir' ],
+        [ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_get_event' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_flow_meter' ],
+        [ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
+            'MLX5_MMAP_GET_NC_PAGES_CMD' ],
+        [ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
+            'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
+        [ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
+            'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
+        [ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_push_vlan' ],
+        [ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
+        [ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_ENHANCED_MPSW' ],
+        [ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_SEND_EN' ],
+        [ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_WAIT' ],
         [ 'HAVE_MLX5_OPCODE_ACCESS_ASO', 'infiniband/mlx5dv.h',
-        'MLX5_OPCODE_ACCESS_ASO' ],
-	[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseLR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseLR4_Full' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
-	[ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
-	'IFLA_NUM_VF' ],
-	[ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
-	'IFLA_EXT_MASK' ],
-	[ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
-	'IFLA_PHYS_SWITCH_ID' ],
-	[ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
-	'IFLA_PHYS_PORT_NAME' ],
-	[ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
-	'RDMA_NL_NLDEV' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_GET' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_PORT_GET' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_NAME' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_PORT_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
-	[ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
-	'mlx5dv_dump_dr_domain'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_sampler'],
-	[ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_domain_set_reclaim_device_memory'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_array'],
-	[ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_aso' ],
-	[ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
-	'INFINIBAND_VERBS_H' ],
+            'MLX5_OPCODE_ACCESS_ASO' ],
+        [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseKR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseCR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseSR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseLR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseKR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseCR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseSR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseLR4_Full' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
+        [ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
+            'IFLA_NUM_VF' ],
+        [ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
+            'IFLA_EXT_MASK' ],
+        [ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
+            'IFLA_PHYS_SWITCH_ID' ],
+        [ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
+            'IFLA_PHYS_PORT_NAME' ],
+        [ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
+            'RDMA_NL_NLDEV' ],
+        [ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_CMD_GET' ],
+        [ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_CMD_PORT_GET' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_DEV_INDEX' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_DEV_NAME' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_PORT_INDEX' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
+        [ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
+            'mlx5dv_dump_dr_domain'],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_flow_sampler'],
+        [ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_domain_set_reclaim_device_memory'],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_dest_array'],
+        [ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_aso' ],
+        [ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
+            'INFINIBAND_VERBS_H' ],
         [ 'HAVE_MLX5_UMR_IMKEY', 'infiniband/mlx5dv.h',
-        'MLX5_WQE_UMR_CTRL_FLAG_INLINE' ],
+            'MLX5_WQE_UMR_CTRL_FLAG_INLINE' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix : file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3], prefix : file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx5_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx5_glue'
-	dlopen_lib_name = 'rte_common_' + dlopen_name
-	dlopen_so_version = LIB_GLUE_VERSION
-	dlopen_sources = files('mlx5_glue.c')
-	dlopen_install_dir = [ eal_pmd_path + '-glue' ]
-	dlopen_includes = [global_inc]
-	dlopen_includes += include_directories(
-		'../../../../lib/librte_eal/include/generic',
-	)
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: dlopen_includes,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx5_glue'
+    dlopen_lib_name = 'rte_common_' + dlopen_name
+    dlopen_so_version = LIB_GLUE_VERSION
+    dlopen_sources = files('mlx5_glue.c')
+    dlopen_install_dir = [ eal_pmd_path + '-glue' ]
+    dlopen_includes = [global_inc]
+    dlopen_includes += include_directories('../../../../lib/librte_eal/include/generic')
+    shared_lib = shared_library(
+            dlopen_lib_name,
+            dlopen_sources,
+            include_directories: dlopen_includes,
+            c_args: cflags,
+            dependencies: libs,
+            link_args: [
+                '-Wl,-export-dynamic',
+                '-Wl,-h,@0@'.format(LIB_GLUE),
+            ],
+            soversion: dlopen_so_version,
+            install: true,
+            install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index b2efea443..f8618a551 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -2,38 +2,38 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not (is_linux or (is_windows and is_ms_linker))
-	build = false
-	reason = 'only supported on Linux and Windows build with clang'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows build with clang'
+    subdir_done()
 endif
 
 deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs']
 sources += files(
-	'mlx5_devx_cmds.c',
-	'mlx5_common.c',
-	'mlx5_common_mp.c',
-	'mlx5_common_mr.c',
-	'mlx5_malloc.c',
-	'mlx5_common_pci.c',
-	'mlx5_common_devx.c',
+    'mlx5_devx_cmds.c',
+    'mlx5_common.c',
+    'mlx5_common_mp.c',
+    'mlx5_common_mr.c',
+    'mlx5_malloc.c',
+    'mlx5_common_pci.c',
+    'mlx5_common_devx.c',
 )
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 subdir(exec_env)
diff --git a/drivers/common/mlx5/windows/meson.build b/drivers/common/mlx5/windows/meson.build
index 16349c34f..062a4aa3c 100644
--- a/drivers/common/mlx5/windows/meson.build
+++ b/drivers/common/mlx5/windows/meson.build
@@ -4,17 +4,17 @@
 includes += include_directories('.')
 
 sources += files(
-	'mlx5_glue.c',
-	'mlx5_common_os.c',
+    'mlx5_glue.c',
+    'mlx5_common_os.c',
 )
 
 res_lib = run_command(python3, '-c', 'import os; print(os.environ["DEVX_LIB_PATH"])')
 res_inc = run_command(python3, '-c', 'import os; print(os.environ["DEVX_INC_PATH"])')
 
 if (res_lib.returncode() != 0 or res_inc.returncode() != 0)
-	build = false
-	reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
-	subdir_done()
+    build = false
+    reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
+    subdir_done()
 endif
 
 devx_lib_dir = res_lib.stdout().strip()
@@ -23,21 +23,21 @@ devx_inc_dir = res_inc.stdout().strip()
 ext_deps += cc.find_library('mlx5devx', dirs: devx_lib_dir, required: true)
 includes += include_directories(devx_inc_dir)
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 # Generate an empty mlx5_autoconf.h file for compatibility with Linux
diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index a929e2311..d87df53f0 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -12,9 +12,9 @@ endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/common/octeontx2/meson.build b/drivers/common/octeontx2/meson.build
index 97293d1a7..ae22db060 100644
--- a/drivers/common/octeontx2/meson.build
+++ b/drivers/common/octeontx2/meson.build
@@ -3,24 +3,27 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources= files('otx2_dev.c',
-		'otx2_irq.c',
-		'otx2_mbox.c',
-		'otx2_common.c',
-		'otx2_sec_idev.c',
-	       )
+        'otx2_irq.c',
+        'otx2_mbox.c',
+        'otx2_common.c',
+        'otx2_sec_idev.c',
+)
 
 deps = ['eal', 'pci', 'ethdev', 'kvargs']
-includes += include_directories('../../common/octeontx2',
-		'../../mempool/octeontx2', '../../bus/pci')
+includes += include_directories(
+        '../../common/octeontx2',
+        '../../mempool/octeontx2',
+        '../../bus/pci',
+)
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index fe278f734..0690b24e2 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017-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
 
 qat_crypto = true
@@ -15,55 +15,58 @@ qat_compress_path = 'compress/qat'
 qat_compress_relpath = '../../' + qat_compress_path
 
 if disable_drivers.contains(qat_crypto_path)
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 if disable_drivers.contains(qat_compress_path)
-	qat_compress = false
-	dpdk_drvs_disabled += qat_compress_path
-	set_variable(qat_compress_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_compress = false
+    dpdk_drvs_disabled += qat_compress_path
+    set_variable(qat_compress_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 
 libcrypto = dependency('libcrypto', required: false, method: 'pkg-config')
 if qat_crypto and not libcrypto.found()
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'missing dependency, libcrypto')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'missing dependency, libcrypto')
 endif
 
 # The driver should not build if both compression and crypto are disabled
 #FIXME common code depends on compression files so check only compress!
 if not qat_compress # and not qat_crypto
-	build = false
-	reason = '' # rely on reason for compress/crypto above
-	subdir_done()
+    build = false
+    reason = '' # rely on reason for compress/crypto above
+    subdir_done()
 endif
 
 deps += ['bus_pci', 'cryptodev', 'net', 'compressdev']
-sources += files('qat_common.c',
-		'qat_qp.c',
-		'qat_device.c',
-		'qat_logs.c')
+sources += files(
+        'qat_common.c',
+        'qat_qp.c',
+        'qat_device.c',
+        'qat_logs.c',
+)
 includes += include_directories('qat_adf',
-		qat_crypto_relpath,
-		qat_compress_relpath)
+        qat_crypto_relpath,
+        qat_compress_relpath,
+)
 
 if qat_compress
-	foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
-		sources += files(join_paths(qat_compress_relpath, f))
-	endforeach
+    foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
+        sources += files(join_paths(qat_compress_relpath, f))
+    endforeach
 endif
 
 if qat_crypto
-	foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
-			'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
-		sources += files(join_paths(qat_crypto_relpath, f))
-	endforeach
-	deps += ['security']
-	ext_deps += libcrypto
-	cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
+    foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
+            'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
+        sources += files(join_paths(qat_crypto_relpath, f))
+    endforeach
+    deps += ['security']
+    ext_deps += libcrypto
+    cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
 endif
diff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build
index 1a39418c6..f52320458 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -6,87 +6,87 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 sources = [
-	'efx_bootcfg.c',
-	'efx_crc32.c',
-	'efx_ev.c',
-	'efx_evb.c',
-	'efx_filter.c',
-	'efx_hash.c',
-	'efx_intr.c',
-	'efx_lic.c',
-	'efx_mac.c',
-	'efx_mae.c',
-	'efx_mcdi.c',
-	'efx_mon.c',
-	'efx_nic.c',
-	'efx_nvram.c',
-	'efx_pci.c',
-	'efx_phy.c',
-	'efx_port.c',
-	'efx_proxy.c',
-	'efx_rx.c',
-	'efx_sram.c',
-	'efx_tunnel.c',
-	'efx_tx.c',
-	'efx_vpd.c',
-	'efx_virtio.c',
-	'mcdi_mon.c',
-	'siena_mac.c',
-	'siena_mcdi.c',
-	'siena_nic.c',
-	'siena_nvram.c',
-	'siena_phy.c',
-	'siena_sram.c',
-	'siena_vpd.c',
-	'ef10_ev.c',
-	'ef10_evb.c',
-	'ef10_filter.c',
-	'ef10_image.c',
-	'ef10_intr.c',
-	'ef10_mac.c',
-	'ef10_mcdi.c',
-	'ef10_nic.c',
-	'ef10_nvram.c',
-	'ef10_phy.c',
-	'ef10_proxy.c',
-	'ef10_rx.c',
-	'ef10_tx.c',
-	'ef10_vpd.c',
-	'hunt_nic.c',
-	'medford_nic.c',
-	'medford2_nic.c',
-	'rhead_ev.c',
-	'rhead_intr.c',
-	'rhead_nic.c',
-	'rhead_pci.c',
-	'rhead_rx.c',
-	'rhead_tunnel.c',
-	'rhead_tx.c',
-	'rhead_virtio.c',
+    'efx_bootcfg.c',
+    'efx_crc32.c',
+    'efx_ev.c',
+    'efx_evb.c',
+    'efx_filter.c',
+    'efx_hash.c',
+    'efx_intr.c',
+    'efx_lic.c',
+    'efx_mac.c',
+    'efx_mae.c',
+    'efx_mcdi.c',
+    'efx_mon.c',
+    'efx_nic.c',
+    'efx_nvram.c',
+    'efx_pci.c',
+    'efx_phy.c',
+    'efx_port.c',
+    'efx_proxy.c',
+    'efx_rx.c',
+    'efx_sram.c',
+    'efx_tunnel.c',
+    'efx_tx.c',
+    'efx_vpd.c',
+    'efx_virtio.c',
+    'mcdi_mon.c',
+    'siena_mac.c',
+    'siena_mcdi.c',
+    'siena_nic.c',
+    'siena_nvram.c',
+    'siena_phy.c',
+    'siena_sram.c',
+    'siena_vpd.c',
+    'ef10_ev.c',
+    'ef10_evb.c',
+    'ef10_filter.c',
+    'ef10_image.c',
+    'ef10_intr.c',
+    'ef10_mac.c',
+    'ef10_mcdi.c',
+    'ef10_nic.c',
+    'ef10_nvram.c',
+    'ef10_phy.c',
+    'ef10_proxy.c',
+    'ef10_rx.c',
+    'ef10_tx.c',
+    'ef10_vpd.c',
+    'hunt_nic.c',
+    'medford_nic.c',
+    'medford2_nic.c',
+    'rhead_ev.c',
+    'rhead_intr.c',
+    'rhead_nic.c',
+    'rhead_pci.c',
+    'rhead_rx.c',
+    'rhead_tunnel.c',
+    'rhead_tx.c',
+    'rhead_virtio.c',
 ]
 
 extra_flags = [
-	'-Wno-sign-compare',
-	'-Wno-unused-parameter',
-	'-Wno-unused-variable',
-	'-Wno-empty-body',
-	'-Wno-unused-but-set-variable'
+    '-Wno-sign-compare',
+    '-Wno-unused-parameter',
+    '-Wno-unused-variable',
+    '-Wno-empty-body',
+    '-Wno-unused-but-set-variable'
 ]
 
 c_args = cflags
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 if build
-	base_lib = static_library('sfc_base', sources,
-		include_directories: includes,
-		dependencies: static_rte_eal,
-		c_args: c_args)
+    base_lib = static_library('sfc_base', sources,
+        include_directories: includes,
+        dependencies: static_rte_eal,
+        c_args: c_args)
 
-	base_objs = base_lib.extract_all_objects()
+    base_objs = base_lib.extract_all_objects()
 else
-	base_objs = []
+    base_objs = []
 endif
diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index 1ca951073..e8bc1bc02 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -6,32 +6,32 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+    '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+    '-Waggregate-return',
+    '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 subdir('base')
@@ -39,8 +39,8 @@ objs = [base_objs]
 
 deps += ['bus_pci']
 sources = files(
-	'sfc_efx.c',
-	'sfc_efx_mcdi.c',
+    'sfc_efx.c',
+    'sfc_efx_mcdi.c',
 )
 
 includes += include_directories('base')
diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meson.build
index d847c2ea6..4b3eaa227 100644
--- a/drivers/compress/isal/meson.build
+++ b/drivers/compress/isal/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libisal', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libisal"'
+    build = false
+    reason = 'missing dependency, "libisal"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build
index 2a6dc3f7c..f3b890f36 100644
--- a/drivers/compress/mlx5/meson.build
+++ b/drivers/compress/mlx5/meson.build
@@ -2,25 +2,25 @@
 # Copyright 2021 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 fmt_name = 'mlx5_compress'
 deps += ['common_mlx5', 'eal', 'compressdev']
 sources = files(
-	'mlx5_compress.c',
+    'mlx5_compress.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/compress/zlib/meson.build b/drivers/compress/zlib/meson.build
index 82cf0dddd..f8937cad3 100644
--- a/drivers/compress/zlib/meson.build
+++ b/drivers/compress/zlib/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "zlib"'
+    build = false
+    reason = 'missing dependency, "zlib"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build
index ea83e8774..0fcac2a8e 100644
--- a/drivers/crypto/aesni_gcm/meson.build
+++ b/drivers/crypto/aesni_gcm/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.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('aesni_gcm_pmd.c', 'aesni_gcm_pmd_ops.c')
diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build
index 419b4743f..ed6b9f53e 100644
--- a/drivers/crypto/aesni_mb/meson.build
+++ b/drivers/crypto/aesni_mb/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.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
 
diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build
index 027173bc1..40a4dbb7b 100644
--- a/drivers/crypto/armv8/meson.build
+++ b/drivers/crypto/armv8/meson.build
@@ -3,9 +3,9 @@
 
 dep = dependency('libAArch64crypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libAArch64crypto"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libAArch64crypto"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 7aa0f05db..7801ab348 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -5,16 +5,16 @@
 
 deps += ['eal', 'bus_vdev']
 sources = files(
-		'bcmfs_logs.c',
-		'bcmfs_device.c',
-		'bcmfs_vfio.c',
-		'bcmfs_qp.c',
-		'hw/bcmfs4_rm.c',
-		'hw/bcmfs5_rm.c',
-		'hw/bcmfs_rm_common.c',
-		'bcmfs_sym_pmd.c',
-		'bcmfs_sym_capabilities.c',
-		'bcmfs_sym_session.c',
-		'bcmfs_sym.c',
-		'bcmfs_sym_engine.c'
-		)
+        'bcmfs_logs.c',
+        'bcmfs_device.c',
+        'bcmfs_vfio.c',
+        'bcmfs_qp.c',
+        'hw/bcmfs4_rm.c',
+        'hw/bcmfs5_rm.c',
+        'hw/bcmfs_rm_common.c',
+        'bcmfs_sym_pmd.c',
+        'bcmfs_sym_capabilities.c',
+        'bcmfs_sym_session.c',
+        'bcmfs_sym.c',
+        'bcmfs_sym_engine.c'
+        )
diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build
index 68e6b1d44..b28d5c66a 100644
--- a/drivers/crypto/caam_jr/meson.build
+++ b/drivers/crypto/caam_jr/meson.build
@@ -2,15 +2,15 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_vdev', 'bus_dpaa', 'security']
 sources = files('caam_jr_capabilities.c',
-		'caam_jr_hw.c',
-		'caam_jr_uio.c',
-		'caam_jr.c')
+        'caam_jr_hw.c',
+        'caam_jr_uio.c',
+        'caam_jr.c')
 
 includes += include_directories('../../bus/dpaa/include/')
 includes += include_directories('../../common/dpaax/')
diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index ff66427ae..2d203fe72 100644
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build
@@ -2,21 +2,21 @@
 # Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 deps += 'bus_pci'
 
 sources = files('rte_ccp_pmd.c',
-		'ccp_crypto.c',
-		'ccp_dev.c',
-		'ccp_pci.c',
-		'ccp_pmd_ops.c')
+        'ccp_crypto.c',
+        'ccp_dev.c',
+        'ccp_pci.c',
+        'ccp_pmd_ops.c')
 
 ext_deps += dep
diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build
index 69c7264e5..b007f06ba 100644
--- a/drivers/crypto/dpaa2_sec/meson.build
+++ b/drivers/crypto/dpaa2_sec/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['security', 'mempool_dpaa2']
 sources = files('dpaa2_sec_dpseci.c',
-		'mc/dpseci.c')
+        'mc/dpseci.c')
 
 includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib')
diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build
index c391a2671..44fd60e5a 100644
--- a/drivers/crypto/dpaa_sec/meson.build
+++ b/drivers/crypto/dpaa_sec/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa', 'mempool_dpaa', 'security']
diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build
index 7560fb7cf..e6e0f08c3 100644
--- a/drivers/crypto/kasumi/meson.build
+++ b/drivers/crypto/kasumi/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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
 
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index b4c55b5ff..c0c828fbf 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -5,9 +5,9 @@
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build
index 9c0e89c2c..cef8379ba 100644
--- a/drivers/crypto/nitrox/meson.build
+++ b/drivers/crypto/nitrox/meson.build
@@ -2,17 +2,17 @@
 # Copyright(C) 2019 Marvell International Ltd.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 sources = files(
-		'nitrox_device.c',
-		'nitrox_hal.c',
-		'nitrox_logs.c',
-		'nitrox_sym.c',
-		'nitrox_sym_capabilities.c',
-		'nitrox_sym_reqmgr.c',
-		'nitrox_qp.c'
-		)
+        'nitrox_device.c',
+        'nitrox_hal.c',
+        'nitrox_logs.c',
+        'nitrox_sym.c',
+        'nitrox_sym_capabilities.c',
+        'nitrox_sym_reqmgr.c',
+        'nitrox_qp.c'
+        )
diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build
index a353d37a1..f08801929 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -1,17 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 deps += ['common_cpt']
 
 sources = files('otx_cryptodev.c',
-		'otx_cryptodev_capabilities.c',
-		'otx_cryptodev_hw_access.c',
-		'otx_cryptodev_mbox.c',
-		'otx_cryptodev_ops.c')
+        'otx_cryptodev_capabilities.c',
+        'otx_cryptodev_hw_access.c',
+        'otx_cryptodev_mbox.c',
+        'otx_cryptodev_ops.c')
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build
index 283818e5d..00b00df56 100644
--- a/drivers/crypto/octeontx2/meson.build
+++ b/drivers/crypto/octeontx2/meson.build
@@ -2,9 +2,9 @@
 # Copyright (C) 2019 Marvell International Ltd.
 
 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
 
 deps += ['bus_pci']
@@ -15,11 +15,11 @@ deps += ['eventdev']
 deps += ['security']
 
 sources = files('otx2_cryptodev.c',
-		'otx2_cryptodev_capabilities.c',
-		'otx2_cryptodev_hw_access.c',
-		'otx2_cryptodev_mbox.c',
-		'otx2_cryptodev_ops.c',
-		'otx2_cryptodev_sec.c')
+        'otx2_cryptodev_capabilities.c',
+        'otx2_cryptodev_hw_access.c',
+        'otx2_cryptodev_mbox.c',
+        'otx2_cryptodev_ops.c',
+        'otx2_cryptodev_sec.c')
 
 includes += include_directories('../../common/cpt')
 includes += include_directories('../../common/octeontx2')
diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index 47fb2bb75..b21fca0be 100644
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index 92e0ed656..523a90166 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -11,14 +11,14 @@ qat_deps += 'cryptodev'
 qat_deps += 'net'
 qat_deps += 'security'
 if dep.found()
-	# Add our sources files to the list
-	qat_sources += files('qat_sym_pmd.c',
-			     'qat_sym.c',
-			     'qat_sym_session.c',
-			     'qat_sym_hw_dp.c',
-			     'qat_asym_pmd.c',
-			     'qat_asym.c')
-	qat_ext_deps += dep
-	qat_cflags += '-DBUILD_QAT_SYM'
-	qat_cflags += '-DBUILD_QAT_ASYM'
+    # Add our sources files to the list
+    qat_sources += files('qat_sym_pmd.c',
+                 'qat_sym.c',
+                 'qat_sym_session.c',
+                 'qat_sym_hw_dp.c',
+                 'qat_asym_pmd.c',
+                 'qat_asym.c')
+    qat_ext_deps += dep
+    qat_cflags += '-DBUILD_QAT_SYM'
+    qat_cflags += '-DBUILD_QAT_ASYM'
 endif
diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build
index b67d9306e..202577c08 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -3,16 +3,16 @@
 
 deps += ['bus_vdev', 'reorder']
 sources = files(
-	'rte_cryptodev_scheduler.c',
-	'scheduler_failover.c',
-	'scheduler_multicore.c',
-	'scheduler_pkt_size_distr.c',
-	'scheduler_pmd.c',
-	'scheduler_pmd_ops.c',
-	'scheduler_roundrobin.c',
+    'rte_cryptodev_scheduler.c',
+    'scheduler_failover.c',
+    'scheduler_multicore.c',
+    'scheduler_pkt_size_distr.c',
+    'scheduler_pmd.c',
+    'scheduler_pmd_ops.c',
+    'scheduler_roundrobin.c',
 )
 
 headers = files(
-	'rte_cryptodev_scheduler.h',
-	'rte_cryptodev_scheduler_operations.h',
+    'rte_cryptodev_scheduler.h',
+    'rte_cryptodev_scheduler_operations.h',
 )
diff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build
index c1c5fd37f..0c087baa2 100644
--- a/drivers/crypto/snow3g/meson.build
+++ b/drivers/crypto/snow3g/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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))
+    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
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 
 endif
 
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 20e9e9551..950f41132 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -4,4 +4,4 @@
 includes += include_directories('../../../lib/librte_vhost')
 deps += 'bus_pci'
 sources = files('virtio_cryptodev.c', 'virtio_pci.c',
-		'virtio_rxtx.c', 'virtqueue.c')
+        'virtio_rxtx.c', 'virtqueue.c')
diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build
index c3454d799..a5f77a22d 100644
--- a/drivers/crypto/zuc/meson.build
+++ b/drivers/crypto/zuc/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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
 
diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build
index f22638b8e..5f2d7ccc8 100644
--- a/drivers/event/dlb2/meson.build
+++ b/drivers/event/dlb2/meson.build
@@ -9,13 +9,13 @@ if not is_linux or not dpdk_conf.has('RTE_ARCH_X86_64')
 endif
 
 sources = files('dlb2.c',
-		'dlb2_iface.c',
-		'dlb2_xstats.c',
-		'pf/dlb2_main.c',
-		'pf/dlb2_pf.c',
-		'pf/base/dlb2_resource.c',
-		'rte_pmd_dlb2.c',
-		'dlb2_selftest.c'
+        'dlb2_iface.c',
+        'dlb2_xstats.c',
+        'pf/dlb2_main.c',
+        'pf/dlb2_pf.c',
+        'pf/base/dlb2_resource.c',
+        'rte_pmd_dlb2.c',
+        'dlb2_selftest.c'
 )
 
 headers = files('rte_pmd_dlb2.h')
diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build
index 85105a210..4d7d0021a 100644
--- a/drivers/event/dpaa/meson.build
+++ b/drivers/event/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['net_dpaa', 'crypto_dpaa_sec']
 sources = files('dpaa_eventdev.c')
diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build
index 21aff6276..355305778 100644
--- a/drivers/event/dpaa2/meson.build
+++ b/drivers/event/dpaa2/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec']
 sources = files('dpaa2_hw_dpcon.c',
-		'dpaa2_eventdev.c',
-		'dpaa2_eventdev_selftest.c')
+        'dpaa2_eventdev.c',
+        'dpaa2_eventdev_selftest.c')
 
 includes += include_directories('../../crypto/dpaa2_sec/')
diff --git a/drivers/event/dsw/meson.build b/drivers/event/dsw/meson.build
index 60ab13d90..2df0fac4f 100644
--- a/drivers/event/dsw/meson.build
+++ b/drivers/event/dsw/meson.build
@@ -3,6 +3,6 @@
 
 deps += ['bus_vdev']
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
 sources = files('dsw_evdev.c', 'dsw_event.c', 'dsw_xstats.c')
diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build
index 41e367684..c08855419 100644
--- a/drivers/event/octeontx/meson.build
+++ b/drivers/event/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = files('ssovf_worker.c',
-		'ssovf_evdev.c',
-		'ssovf_evdev_selftest.c',
-		'ssovf_probe.c',
-		'timvf_worker.c',
-		'timvf_evdev.c',
-		'timvf_probe.c'
+        'ssovf_evdev.c',
+        'ssovf_evdev_selftest.c',
+        'ssovf_probe.c',
+        'timvf_worker.c',
+        'timvf_evdev.c',
+        'timvf_probe.c'
 )
 
 deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx']
diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build
index 22e7e4cb6..f6f9e028e 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -3,21 +3,21 @@
 #
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_worker.c',
-		'otx2_worker_dual.c',
-		'otx2_evdev.c',
-		'otx2_evdev_adptr.c',
-		'otx2_evdev_crypto_adptr.c',
-		'otx2_evdev_irq.c',
-		'otx2_evdev_selftest.c',
-		'otx2_tim_evdev.c',
-		'otx2_tim_worker.c'
-		)
+        'otx2_worker_dual.c',
+        'otx2_evdev.c',
+        'otx2_evdev_adptr.c',
+        'otx2_evdev_crypto_adptr.c',
+        'otx2_evdev_irq.c',
+        'otx2_evdev_selftest.c',
+        'otx2_tim_evdev.c',
+        'otx2_tim_worker.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'crypto_octeontx2', 'mempool_octeontx2', 'net_octeontx2']
 
diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build
index cc6029c6f..e3ec3aaf7 100644
--- a/drivers/event/opdl/meson.build
+++ b/drivers/event/opdl/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = files(
-	'opdl_evdev.c',
-	'opdl_evdev_init.c',
-	'opdl_evdev_xstats.c',
-	'opdl_ring.c',
-	'opdl_test.c',
+    'opdl_evdev.c',
+    'opdl_evdev_init.c',
+    'opdl_evdev_xstats.c',
+    'opdl_ring.c',
+    'opdl_test.c',
 )
 deps += ['bus_vdev']
diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build
index 985012219..db403b1b8 100644
--- a/drivers/event/sw/meson.build
+++ b/drivers/event/sw/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('sw_evdev_scheduler.c',
-	'sw_evdev_selftest.c',
-	'sw_evdev_worker.c',
-	'sw_evdev_xstats.c',
-	'sw_evdev.c'
+    'sw_evdev_selftest.c',
+    'sw_evdev_worker.c',
+    'sw_evdev_xstats.c',
+    'sw_evdev.c'
 )
 deps += ['hash', 'bus_vdev']
diff --git a/drivers/mempool/bucket/meson.build b/drivers/mempool/bucket/meson.build
index 61de2dc9b..0051b6ac3 100644
--- a/drivers/mempool/bucket/meson.build
+++ b/drivers/mempool/bucket/meson.build
@@ -7,8 +7,8 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_bucket.c')
diff --git a/drivers/mempool/dpaa/meson.build b/drivers/mempool/dpaa/meson.build
index 09f5295d9..c4e9994b8 100644
--- a/drivers/mempool/dpaa/meson.build
+++ b/drivers/mempool/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa']
diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build
index 17ad0a8ea..3d16d4415 100644
--- a/drivers/mempool/dpaa2/meson.build
+++ b/drivers/mempool/dpaa2/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_fslmc']
diff --git a/drivers/mempool/octeontx/meson.build b/drivers/mempool/octeontx/meson.build
index b5695a932..2b8879d0c 100644
--- a/drivers/mempool/octeontx/meson.build
+++ b/drivers/mempool/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('octeontx_fpavf.c',
-		'rte_mempool_octeontx.c'
+        'rte_mempool_octeontx.c'
 )
 
 deps += ['mbuf', 'bus_pci', 'common_octeontx']
diff --git a/drivers/mempool/octeontx2/meson.build b/drivers/mempool/octeontx2/meson.build
index 0586321ab..8a8928825 100644
--- a/drivers/mempool/octeontx2/meson.build
+++ b/drivers/mempool/octeontx2/meson.build
@@ -3,20 +3,20 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_mempool_ops.c',
-		'otx2_mempool.c',
-		'otx2_mempool_irq.c',
-		'otx2_mempool_debug.c'
-		)
+        'otx2_mempool.c',
+        'otx2_mempool_irq.c',
+        'otx2_mempool_debug.c'
+        )
 
 deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_octeontx2', 'mempool']
diff --git a/drivers/mempool/stack/meson.build b/drivers/mempool/stack/meson.build
index 8425772a4..371cf131b 100644
--- a/drivers/mempool/stack/meson.build
+++ b/drivers/mempool/stack/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_stack.c')
diff --git a/drivers/net/af_packet/meson.build b/drivers/net/af_packet/meson.build
index 50a2f05d3..c014e9b61 100644
--- a/drivers/net/af_packet/meson.build
+++ b/drivers/net/af_packet/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('rte_eth_af_packet.c')
diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index 60ccffabb..3ed2b2978 100644
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -2,26 +2,26 @@
 # 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('rte_eth_af_xdp.c')
 
 bpf_dep = dependency('libbpf', required: false, method: 'pkg-config')
 if not bpf_dep.found()
-	bpf_dep = cc.find_library('bpf', required: false)
+    bpf_dep = cc.find_library('bpf', required: false)
 endif
 
 if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linux/if_xdp.h')
-	ext_deps += bpf_dep
-	bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
-			required: false, method: 'pkg-config')
-	if bpf_ver_dep.found()
-		dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
-	endif
+    ext_deps += bpf_dep
+    bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
+            required: false, method: 'pkg-config')
+    if bpf_ver_dep.found()
+        dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
+    endif
 else
-	build = false
-	reason = 'missing dependency, "libbpf"'
+    build = false
+    reason = 'missing dependency, "libbpf"'
 endif
diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build
index 91e8c0dda..8d87744c2 100644
--- a/drivers/net/ark/meson.build
+++ b/drivers/net/ark/meson.build
@@ -2,18 +2,20 @@
 # 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('ark_ddm.c',
-	'ark_ethdev.c',
-	'ark_ethdev_rx.c',
-	'ark_ethdev_tx.c',
-	'ark_mpu.c',
-	'ark_pktchkr.c',
-	'ark_pktdir.c',
-	'ark_pktgen.c',
-	'ark_rqp.c',
-	'ark_udm.c')
+sources = files(
+        'ark_ddm.c',
+        'ark_ethdev.c',
+        'ark_ethdev_rx.c',
+        'ark_ethdev_tx.c',
+        'ark_mpu.c',
+        'ark_pktchkr.c',
+        'ark_pktdir.c',
+        'ark_pktgen.c',
+        'ark_rqp.c',
+        'ark_udm.c',
+)
diff --git a/drivers/net/atlantic/meson.build b/drivers/net/atlantic/meson.build
index 01373f868..f26e09ab8 100644
--- a/drivers/net/atlantic/meson.build
+++ b/drivers/net/atlantic/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2018 Aquantia 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(
-	'atl_rxtx.c',
-	'atl_ethdev.c',
-	'atl_hw_regs.c',
-	'hw_atl/hw_atl_b0.c',
-	'hw_atl/hw_atl_llh.c',
-	'hw_atl/hw_atl_utils_fw2x.c',
-	'hw_atl/hw_atl_utils.c',
-	'rte_pmd_atlantic.c',
+    'atl_rxtx.c',
+    'atl_ethdev.c',
+    'atl_hw_regs.c',
+    'hw_atl/hw_atl_b0.c',
+    'hw_atl/hw_atl_llh.c',
+    'hw_atl/hw_atl_utils_fw2x.c',
+    'hw_atl/hw_atl_utils.c',
+    'rte_pmd_atlantic.c',
 )
diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
index 61c8d5b9f..ea9dd1f20 100644
--- a/drivers/net/avp/meson.build
+++ b/drivers/net/avp/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('avp_ethdev.c')
 headers = files('rte_avp_common.h', 'rte_avp_fifo.h')
diff --git a/drivers/net/axgbe/meson.build b/drivers/net/axgbe/meson.build
index 198e19876..cd2c747b1 100644
--- a/drivers/net/axgbe/meson.build
+++ b/drivers/net/axgbe/meson.build
@@ -2,19 +2,19 @@
 # Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('axgbe_ethdev.c',
-		'axgbe_dev.c',
-		'axgbe_mdio.c',
-		'axgbe_phy_impl.c',
-		'axgbe_i2c.c',
-		'axgbe_rxtx.c')
+        'axgbe_dev.c',
+        'axgbe_mdio.c',
+        'axgbe_phy_impl.c',
+        'axgbe_i2c.c',
+        'axgbe_rxtx.c')
 
 cflags += '-Wno-cast-qual'
 
 if arch_subdir == 'x86'
-	sources += files('axgbe_rxtx_vec_sse.c')
+    sources += files('axgbe_rxtx_vec_sse.c')
 endif
diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
index e260b7592..4714ec493 100644
--- a/drivers/net/bnx2x/meson.build
+++ b/drivers/net/bnx2x/meson.build
@@ -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
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
@@ -13,9 +13,9 @@ reason = 'missing dependency, "zlib"'
 ext_deps += dep
 cflags += '-DZLIB_CONST'
 sources = files('bnx2x.c',
-	'bnx2x_ethdev.c',
-	'bnx2x_rxtx.c',
-	'bnx2x_stats.c',
-	'bnx2x_vfpf.c',
-	'ecore_sp.c',
-	'elink.c')
+    'bnx2x_ethdev.c',
+    'bnx2x_rxtx.c',
+    'bnx2x_stats.c',
+    'bnx2x_vfpf.c',
+    'ecore_sp.c',
+    'elink.c')
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 092655697..0448e12bc 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -3,9 +3,9 @@
 # Copyright(c) 2020 Broadcom
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 headers = files('rte_pmd_bnxt.h')
@@ -14,72 +14,72 @@ includes += include_directories('tf_ulp')
 includes += include_directories('tf_core')
 
 sources = files('bnxt_cpr.c',
-	'bnxt_ethdev.c',
-	'bnxt_filter.c',
-	'bnxt_flow.c',
-	'bnxt_hwrm.c',
-	'bnxt_irq.c',
-	'bnxt_ring.c',
-	'bnxt_rxq.c',
-	'bnxt_rxr.c',
-	'bnxt_stats.c',
-	'bnxt_txq.c',
-	'bnxt_txr.c',
-	'bnxt_util.c',
-	'bnxt_vnic.c',
-	'bnxt_reps.c',
+    'bnxt_ethdev.c',
+    'bnxt_filter.c',
+    'bnxt_flow.c',
+    'bnxt_hwrm.c',
+    'bnxt_irq.c',
+    'bnxt_ring.c',
+    'bnxt_rxq.c',
+    'bnxt_rxr.c',
+    'bnxt_stats.c',
+    'bnxt_txq.c',
+    'bnxt_txr.c',
+    'bnxt_util.c',
+    'bnxt_vnic.c',
+    'bnxt_reps.c',
 
-	'tf_core/tf_core.c',
-	'tf_core/bitalloc.c',
-	'tf_core/tf_msg.c',
-	'tf_core/rand.c',
-	'tf_core/stack.c',
+    'tf_core/tf_core.c',
+    'tf_core/bitalloc.c',
+    'tf_core/tf_msg.c',
+    'tf_core/rand.c',
+    'tf_core/stack.c',
         'tf_core/tf_em_common.c',
         'tf_core/tf_em_internal.c',
-	'tf_core/tf_rm.c',
-	'tf_core/tf_tbl.c',
-	'tf_core/tfp.c',
-	'tf_core/tf_session.c',
-	'tf_core/tf_device.c',
-	'tf_core/tf_device_p4.c',
-	'tf_core/tf_identifier.c',
-	'tf_core/tf_shadow_tbl.c',
-	'tf_core/tf_shadow_tcam.c',
-	'tf_core/tf_tcam.c',
-	'tf_core/tf_util.c',
-	'tf_core/tf_if_tbl.c',
-	'tf_core/ll.c',
-	'tf_core/tf_global_cfg.c',
-	'tf_core/tf_em_host.c',
-	'tf_core/tf_shadow_identifier.c',
-	'tf_core/tf_hash.c',
+    'tf_core/tf_rm.c',
+    'tf_core/tf_tbl.c',
+    'tf_core/tfp.c',
+    'tf_core/tf_session.c',
+    'tf_core/tf_device.c',
+    'tf_core/tf_device_p4.c',
+    'tf_core/tf_identifier.c',
+    'tf_core/tf_shadow_tbl.c',
+    'tf_core/tf_shadow_tcam.c',
+    'tf_core/tf_tcam.c',
+    'tf_core/tf_util.c',
+    'tf_core/tf_if_tbl.c',
+    'tf_core/ll.c',
+    'tf_core/tf_global_cfg.c',
+    'tf_core/tf_em_host.c',
+    'tf_core/tf_shadow_identifier.c',
+    'tf_core/tf_hash.c',
 
-	'hcapi/hcapi_cfa_p4.c',
+    'hcapi/hcapi_cfa_p4.c',
 
-	'tf_ulp/bnxt_ulp.c',
-	'tf_ulp/ulp_mark_mgr.c',
-	'tf_ulp/ulp_flow_db.c',
-	'tf_ulp/ulp_template_db_tbl.c',
-	'tf_ulp/ulp_template_db_class.c',
-	'tf_ulp/ulp_template_db_act.c',
-	'tf_ulp/ulp_utils.c',
-	'tf_ulp/ulp_mapper.c',
-	'tf_ulp/ulp_matcher.c',
-	'tf_ulp/ulp_rte_parser.c',
-	'tf_ulp/bnxt_ulp_flow.c',
-	'tf_ulp/ulp_port_db.c',
-	'tf_ulp/ulp_def_rules.c',
-	'tf_ulp/ulp_fc_mgr.c',
-	'tf_ulp/ulp_tun.c',
-	'tf_ulp/ulp_template_db_wh_plus_act.c',
-	'tf_ulp/ulp_template_db_wh_plus_class.c',
-	'tf_ulp/ulp_template_db_stingray_act.c',
-	'tf_ulp/ulp_template_db_stingray_class.c',
+    'tf_ulp/bnxt_ulp.c',
+    'tf_ulp/ulp_mark_mgr.c',
+    'tf_ulp/ulp_flow_db.c',
+    'tf_ulp/ulp_template_db_tbl.c',
+    'tf_ulp/ulp_template_db_class.c',
+    'tf_ulp/ulp_template_db_act.c',
+    'tf_ulp/ulp_utils.c',
+    'tf_ulp/ulp_mapper.c',
+    'tf_ulp/ulp_matcher.c',
+    'tf_ulp/ulp_rte_parser.c',
+    'tf_ulp/bnxt_ulp_flow.c',
+    'tf_ulp/ulp_port_db.c',
+    'tf_ulp/ulp_def_rules.c',
+    'tf_ulp/ulp_fc_mgr.c',
+    'tf_ulp/ulp_tun.c',
+    'tf_ulp/ulp_template_db_wh_plus_act.c',
+    'tf_ulp/ulp_template_db_wh_plus_class.c',
+    'tf_ulp/ulp_template_db_stingray_act.c',
+    'tf_ulp/ulp_template_db_stingray_class.c',
 
-	'rte_pmd_bnxt.c')
+    'rte_pmd_bnxt.c')
 
 if arch_subdir == 'x86'
-	sources += files('bnxt_rxtx_vec_sse.c')
+    sources += files('bnxt_rxtx_vec_sse.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('bnxt_rxtx_vec_neon.c')
+    sources += files('bnxt_rxtx_vec_neon.c')
 endif
diff --git a/drivers/net/bonding/meson.build b/drivers/net/bonding/meson.build
index 4682903a6..67d7ab9d9 100644
--- a/drivers/net/bonding/meson.build
+++ b/drivers/net/bonding/meson.build
@@ -2,14 +2,14 @@
 # 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
 
 name = 'bond' #, james bond :-)
 sources = files('rte_eth_bond_api.c', 'rte_eth_bond_pmd.c', 'rte_eth_bond_flow.c',
-	'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
+    'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
 
 deps += 'sched' # needed for rte_bitmap.h
 deps += ['ip_frag']
diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
index 52896ea85..5f6f7451a 100644
--- a/drivers/net/cxgbe/meson.build
+++ b/drivers/net/cxgbe/meson.build
@@ -2,22 +2,22 @@
 # 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('cxgbe_ethdev.c',
-	'cxgbe_main.c',
-	'cxgbevf_ethdev.c',
-	'cxgbevf_main.c',
-	'sge.c',
-	'cxgbe_filter.c',
-	'cxgbe_flow.c',
-	'clip_tbl.c',
-	'mps_tcam.c',
-	'l2t.c',
-	'smt.c',
-	'base/t4_hw.c',
-	'base/t4vf_hw.c')
+    'cxgbe_main.c',
+    'cxgbevf_ethdev.c',
+    'cxgbevf_main.c',
+    'sge.c',
+    'cxgbe_filter.c',
+    'cxgbe_flow.c',
+    'clip_tbl.c',
+    'mps_tcam.c',
+    'l2t.c',
+    'smt.c',
+    'base/t4_hw.c',
+    'base/t4vf_hw.c')
 includes += include_directories('base')
diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build
index 0f72730b0..62989b24a 100644
--- a/drivers/net/dpaa/meson.build
+++ b/drivers/net/dpaa/meson.build
@@ -2,20 +2,20 @@
 # Copyright 2018-2020 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['mempool_dpaa']
 
 sources = files('dpaa_ethdev.c',
-		'fmlib/fm_lib.c',
-		'fmlib/fm_vsp.c',
-		'dpaa_flow.c',
-		'dpaa_rxtx.c',
-		'dpaa_fmc.c')
+        'fmlib/fm_lib.c',
+        'fmlib/fm_vsp.c',
+        'dpaa_flow.c',
+        'dpaa_rxtx.c',
+        'dpaa_fmc.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 headers = files('rte_pmd_dpaa.h')
diff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build
index f5f411d59..84319d2db 100644
--- a/drivers/net/dpaa2/meson.build
+++ b/drivers/net/dpaa2/meson.build
@@ -2,23 +2,23 @@
 # Copyright 2018-2021 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['mempool_dpaa2']
 sources = files('base/dpaa2_hw_dpni.c',
-		'dpaa2_tm.c',
-		'dpaa2_mux.c',
-		'dpaa2_ethdev.c',
-		'dpaa2_flow.c',
-		'dpaa2_rxtx.c',
-		'dpaa2_sparser.c',
-		'dpaa2_ptp.c',
-		'mc/dprtc.c',
-		'mc/dpkg.c',
-		'mc/dpdmux.c',
-		'mc/dpni.c')
+        'dpaa2_tm.c',
+        'dpaa2_mux.c',
+        'dpaa2_ethdev.c',
+        'dpaa2_flow.c',
+        'dpaa2_rxtx.c',
+        'dpaa2_sparser.c',
+        'dpaa2_ptp.c',
+        'mc/dprtc.c',
+        'mc/dpkg.c',
+        'mc/dpdmux.c',
+        'mc/dpni.c')
 
 includes += include_directories('base', 'mc')
 
diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index d13f693d3..4d3a65fd7 100644
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -2,37 +2,37 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'e1000_base.c',
-	'e1000_80003es2lan.c',
-	'e1000_82540.c',
-	'e1000_82541.c',
-	'e1000_82542.c',
-	'e1000_82543.c',
-	'e1000_82571.c',
-	'e1000_82575.c',
-	'e1000_api.c',
-	'e1000_i210.c',
-	'e1000_ich8lan.c',
-	'e1000_mac.c',
-	'e1000_manage.c',
-	'e1000_mbx.c',
-	'e1000_nvm.c',
-	'e1000_osdep.c',
-	'e1000_phy.c',
-	'e1000_vf.c'
+    'e1000_base.c',
+    'e1000_80003es2lan.c',
+    'e1000_82540.c',
+    'e1000_82541.c',
+    'e1000_82542.c',
+    'e1000_82543.c',
+    'e1000_82571.c',
+    'e1000_82575.c',
+    'e1000_api.c',
+    'e1000_i210.c',
+    'e1000_ich8lan.c',
+    'e1000_mac.c',
+    'e1000_manage.c',
+    'e1000_mbx.c',
+    'e1000_nvm.c',
+    'e1000_osdep.c',
+    'e1000_phy.c',
+    'e1000_vf.c'
 ]
 
 error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',
-	'-Wno-unused-variable', '-Wno-misleading-indentation',
-	'-Wno-implicit-fallthrough']
+    '-Wno-unused-variable', '-Wno-misleading-indentation',
+    '-Wno-implicit-fallthrough']
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('e1000_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/e1000/meson.build b/drivers/net/e1000/meson.build
index 43ad52cbc..e2305c21a 100644
--- a/drivers/net/e1000/meson.build
+++ b/drivers/net/e1000/meson.build
@@ -2,22 +2,22 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'e1000_logs.c',
-	'em_ethdev.c',
-	'em_rxtx.c',
-	'igb_ethdev.c',
-	'igb_flow.c',
-	'igb_pf.c',
-	'igb_rxtx.c'
+    'e1000_logs.c',
+    'em_ethdev.c',
+    'em_rxtx.c',
+    'igb_ethdev.c',
+    'igb_flow.c',
+    'igb_pf.c',
+    'igb_rxtx.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
index 772fbfc88..d57b506a6 100644
--- a/drivers/net/ena/meson.build
+++ b/drivers/net/ena/meson.build
@@ -2,14 +2,14 @@
 # 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('ena_ethdev.c',
-	'base/ena_com.c',
-	'base/ena_eth_com.c')
+    'base/ena_com.c',
+    'base/ena_eth_com.c')
 
 deps += ['timer']
 
diff --git a/drivers/net/enetc/meson.build b/drivers/net/enetc/meson.build
index 850307c04..1cfe6a089 100644
--- a/drivers/net/enetc/meson.build
+++ b/drivers/net/enetc/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax']
 sources = files('enetc_ethdev.c',
-		'enetc_rxtx.c')
+        'enetc_rxtx.c')
 
 includes += include_directories('base')
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index 94fcc79c6..de520ff6f 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -2,40 +2,40 @@
 # Copyright(c) 2018 Cisco Systems, 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(
-	'base/vnic_cq.c',
-	'base/vnic_dev.c',
-	'base/vnic_intr.c',
-	'base/vnic_rq.c',
-	'base/vnic_wq.c',
-	'enic_ethdev.c',
-	'enic_flow.c',
-	'enic_fm_flow.c',
-	'enic_main.c',
-	'enic_res.c',
-	'enic_rxtx.c',
-	'enic_vf_representor.c',
-	)
+    'base/vnic_cq.c',
+    'base/vnic_dev.c',
+    'base/vnic_intr.c',
+    'base/vnic_rq.c',
+    'base/vnic_wq.c',
+    'enic_ethdev.c',
+    'enic_flow.c',
+    'enic_fm_flow.c',
+    'enic_main.c',
+    'enic_res.c',
+    'enic_rxtx.c',
+    'enic_vf_representor.c',
+    )
 deps += ['hash']
 includes += include_directories('base')
 
 # The current implementation assumes 64-bit pointers
 if cc.get_define('__AVX2__', args: machine_args) != '' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('enic_rxtx_vec_avx2.c')
+    sources += files('enic_rxtx_vec_avx2.c')
 # Build the avx2 handler if the compiler supports it, even though 'machine'
 # does not. This is to support users who build for the min supported machine
 # and need to run the binary on newer CPUs too.
 # This part is from i40e meson.build
 elif cc.has_argument('-mavx2') and dpdk_conf.get('RTE_ARCH_64')
-	enic_avx2_lib = static_library('enic_avx2_lib',
-			'enic_rxtx_vec_avx2.c',
-			dependencies: [static_rte_ethdev, static_rte_bus_pci],
-			include_directories: includes,
-			c_args: [cflags, '-mavx2'])
-	objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
+    enic_avx2_lib = static_library('enic_avx2_lib',
+            'enic_rxtx_vec_avx2.c',
+            dependencies: [static_rte_ethdev, static_rte_bus_pci],
+            include_directories: includes,
+            c_args: [cflags, '-mavx2'])
+    objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
 endif
diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
index d8343be63..5f6967bd8 100644
--- a/drivers/net/failsafe/meson.build
+++ b/drivers/net/failsafe/meson.build
@@ -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
 
 cflags += '-std=gnu99'
@@ -12,16 +12,16 @@ cflags += '-D_DEFAULT_SOURCE'
 cflags += '-D_XOPEN_SOURCE=700'
 cflags += '-pedantic'
 if is_linux
-	cflags += '-DLINUX'
+    cflags += '-DLINUX'
 else
-	cflags += '-DBSD'
+    cflags += '-DBSD'
 endif
 
 sources = files('failsafe_args.c',
-	'failsafe.c',
-	'failsafe_eal.c',
-	'failsafe_ether.c',
-	'failsafe_flow.c',
-	'failsafe_intr.c',
-	'failsafe_ops.c',
-	'failsafe_rxtx.c')
+    'failsafe.c',
+    'failsafe_eal.c',
+    'failsafe_ether.c',
+    'failsafe_flow.c',
+    'failsafe_intr.c',
+    'failsafe_ops.c',
+    'failsafe_rxtx.c')
diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build
index 6ac11b201..c6536558a 100644
--- a/drivers/net/fm10k/base/meson.build
+++ b/drivers/net/fm10k/base/meson.build
@@ -2,27 +2,27 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'fm10k_api.c',
-	'fm10k_common.c',
-	'fm10k_mbx.c',
-	'fm10k_pf.c',
-	'fm10k_tlv.c',
-	'fm10k_vf.c'
+    'fm10k_api.c',
+    'fm10k_common.c',
+    'fm10k_mbx.c',
+    'fm10k_pf.c',
+    'fm10k_tlv.c',
+    'fm10k_vf.c'
 ]
 
 error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value',
-	'-Wno-strict-aliasing', '-Wno-format-extra-args',
-	'-Wno-unused-variable',
-	'-Wno-implicit-fallthrough'
+    '-Wno-strict-aliasing', '-Wno-format-extra-args',
+    '-Wno-unused-variable',
+    '-Wno-implicit-fallthrough'
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('fm10k_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/fm10k/meson.build b/drivers/net/fm10k/meson.build
index 299b9ffb5..2397b68a4 100644
--- a/drivers/net/fm10k/meson.build
+++ b/drivers/net/fm10k/meson.build
@@ -2,20 +2,20 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'fm10k_ethdev.c',
-	'fm10k_rxtx.c',
+    'fm10k_ethdev.c',
+    'fm10k_rxtx.c',
 )
 if arch_subdir == 'x86'
-	sources += files('fm10k_rxtx_vec.c')
+    sources += files('fm10k_rxtx_vec.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/hinic/base/meson.build b/drivers/net/hinic/base/meson.build
index 6cf947f84..6b23d3157 100644
--- a/drivers/net/hinic/base/meson.build
+++ b/drivers/net/hinic/base/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 sources = [
-	'hinic_pmd_api_cmd.c',
-	'hinic_pmd_cfg.c',
-	'hinic_pmd_cmdq.c',
-	'hinic_pmd_eqs.c',
-	'hinic_pmd_hwdev.c',
-	'hinic_pmd_hwif.c',
-	'hinic_pmd_mgmt.c',
-	'hinic_pmd_niccfg.c',
-	'hinic_pmd_nicio.c',
-	'hinic_pmd_wq.c',
- 	'hinic_pmd_mbox.c',
+    'hinic_pmd_api_cmd.c',
+    'hinic_pmd_cfg.c',
+    'hinic_pmd_cmdq.c',
+    'hinic_pmd_eqs.c',
+    'hinic_pmd_hwdev.c',
+    'hinic_pmd_hwif.c',
+    'hinic_pmd_mgmt.c',
+    'hinic_pmd_niccfg.c',
+    'hinic_pmd_nicio.c',
+    'hinic_pmd_wq.c',
+     'hinic_pmd_mbox.c',
 ]
 
 extra_flags = []
@@ -32,6 +32,6 @@ deps += ['hash']
 c_args = cflags
 
 base_lib = static_library('hinic_base', sources,
-	dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
-	c_args: c_args)
+    dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index 61ea3954c..8eac1542e 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'hinic_pmd_ethdev.c',
-	'hinic_pmd_rx.c',
-	'hinic_pmd_tx.c',
- 	'hinic_pmd_flow.c',
-	)
+    'hinic_pmd_ethdev.c',
+    'hinic_pmd_rx.c',
+    'hinic_pmd_tx.c',
+     'hinic_pmd_flow.c',
+    )
 
 includes += include_directories('base')
diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build
index dc0baf767..53c7df7da 100644
--- a/drivers/net/hns3/meson.build
+++ b/drivers/net/hns3/meson.build
@@ -2,38 +2,40 @@
 # Copyright(c) 2018-2021 Hisilicon Limited
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 if arch_subdir != 'x86' and arch_subdir != 'arm' or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
-	subdir_done()
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
+    subdir_done()
 endif
 
-sources = files('hns3_cmd.c',
-	'hns3_dcb.c',
-	'hns3_intr.c',
-	'hns3_ethdev.c',
-	'hns3_ethdev_vf.c',
-	'hns3_fdir.c',
-	'hns3_flow.c',
-	'hns3_mbx.c',
-	'hns3_regs.c',
-	'hns3_rss.c',
-	'hns3_rxtx.c',
-	'hns3_stats.c',
-	'hns3_mp.c',
-	'hns3_tm.c',
-	'hns3_ptp.c')
+sources = files(
+        'hns3_cmd.c',
+        'hns3_dcb.c',
+        'hns3_intr.c',
+        'hns3_ethdev.c',
+        'hns3_ethdev_vf.c',
+        'hns3_fdir.c',
+        'hns3_flow.c',
+        'hns3_mbx.c',
+        'hns3_regs.c',
+        'hns3_rss.c',
+        'hns3_rxtx.c',
+        'hns3_stats.c',
+        'hns3_mp.c',
+        'hns3_tm.c',
+        'hns3_ptp.c',
+)
 
 deps += ['hash']
 
 if arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('hns3_rxtx_vec.c')
-	if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
-		sources += files('hns3_rxtx_vec_sve.c')
-	endif
+    sources += files('hns3_rxtx_vec.c')
+    if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
+        sources += files('hns3_rxtx_vec_sve.c')
+    endif
 endif
diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 8bc6a0fa0..4ee3b26e4 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -2,29 +2,29 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'i40e_adminq.c',
-	'i40e_common.c',
-	'i40e_dcb.c',
-	'i40e_diag.c',
-	'i40e_hmc.c',
-	'i40e_lan_hmc.c',
-	'i40e_nvm.c'
+    'i40e_adminq.c',
+    'i40e_common.c',
+    'i40e_dcb.c',
+    'i40e_diag.c',
+    'i40e_hmc.c',
+    'i40e_lan_hmc.c',
+    'i40e_nvm.c'
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-format-security',
-		'-Wno-format-nonliteral',
-		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
+        '-Wno-format', '-Wno-format-security',
+        '-Wno-format-nonliteral',
+        '-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('i40e_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index ce3cc658e..187bfc104 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -2,76 +2,76 @@
 # Copyright(c) 2017 Intel Corporation
 
 cflags += ['-DPF_DRIVER',
-	'-DVF_DRIVER',
-	'-DINTEGRATED_VF',
-	'-DX722_A0_SUPPORT']
+    '-DVF_DRIVER',
+    '-DINTEGRATED_VF',
+    '-DX722_A0_SUPPORT']
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'i40e_ethdev.c',
-	'i40e_rxtx.c',
-	'i40e_ethdev_vf.c',
-	'i40e_pf.c',
-	'i40e_fdir.c',
-	'i40e_flow.c',
-	'i40e_tm.c',
-	'i40e_hash.c',
-	'i40e_vf_representor.c',
-	'rte_pmd_i40e.c'
-	)
+    'i40e_ethdev.c',
+    'i40e_rxtx.c',
+    'i40e_ethdev_vf.c',
+    'i40e_pf.c',
+    'i40e_fdir.c',
+    'i40e_flow.c',
+    'i40e_tm.c',
+    'i40e_hash.c',
+    'i40e_vf_representor.c',
+    'rte_pmd_i40e.c'
+    )
 
 deps += ['hash']
 includes += include_directories('base')
 
 if arch_subdir == 'x86'
-	sources += files('i40e_rxtx_vec_sse.c')
+    sources += files('i40e_rxtx_vec_sse.c')
 
-	if is_windows and cc.get_id() != 'clang'
-		cflags += ['-fno-asynchronous-unwind-tables']
-	endif
+    if is_windows and cc.get_id() != 'clang'
+        cflags += ['-fno-asynchronous-unwind-tables']
+    endif
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('i40e_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		i40e_avx2_lib = static_library('i40e_avx2_lib',
-				'i40e_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('i40e_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        i40e_avx2_lib = static_library('i40e_avx2_lib',
+                'i40e_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
+    endif
 
-	i40e_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    i40e_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	i40e_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    i40e_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		i40e_avx512_lib = static_library('i40e_avx512_lib',
-				'i40e_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
-	endif
+    if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        i40e_avx512_lib = static_library('i40e_avx512_lib',
+                'i40e_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
+    endif
 elif arch_subdir == 'ppc'
        sources += files('i40e_rxtx_vec_altivec.c')
 elif arch_subdir == 'arm'
diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index ac2af81f7..b124af68d 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 cflags += ['-Wno-strict-aliasing']
@@ -13,57 +13,57 @@ includes += include_directories('../../common/iavf')
 deps += ['common_iavf']
 
 sources = files(
-	'iavf_ethdev.c',
-	'iavf_rxtx.c',
-	'iavf_vchnl.c',
-	'iavf_generic_flow.c',
-	'iavf_fdir.c',
-	'iavf_hash.c',
+    'iavf_ethdev.c',
+    'iavf_rxtx.c',
+    'iavf_vchnl.c',
+    'iavf_generic_flow.c',
+    'iavf_fdir.c',
+    'iavf_hash.c',
 )
 
 if arch_subdir == 'x86'
-	sources += files('iavf_rxtx_vec_sse.c')
+    sources += files('iavf_rxtx_vec_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('iavf_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		iavf_avx2_lib = static_library('iavf_avx2_lib',
-				'iavf_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('iavf_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        iavf_avx2_lib = static_library('iavf_avx2_lib',
+                'iavf_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
+    endif
 
-	iavf_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    iavf_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	iavf_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    iavf_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		iavf_avx512_lib = static_library('iavf_avx512_lib',
-				'iavf_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
-	endif
+    if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        iavf_avx512_lib = static_library('iavf_avx512_lib',
+                'iavf_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
+    endif
 endif
 
 headers = files('rte_pmd_iavf.h')
diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build
index c44d0e035..6c548a997 100644
--- a/drivers/net/ice/base/meson.build
+++ b/drivers/net/ice/base/meson.build
@@ -2,39 +2,40 @@
 # Copyright(c) 2018-2021 Intel Corporation
 
 sources = [
-	'ice_controlq.c',
-	'ice_common.c',
-	'ice_sched.c',
-	'ice_switch.c',
-	'ice_nvm.c',
-	'ice_flex_pipe.c',
-	'ice_flow.c',
-	'ice_dcb.c',
-	'ice_fdir.c',
-	'ice_acl.c',
-	'ice_acl_ctrl.c',
-	'ice_vlan_mode.c',
+        'ice_controlq.c',
+        'ice_common.c',
+        'ice_sched.c',
+        'ice_switch.c',
+        'ice_nvm.c',
+        'ice_flex_pipe.c',
+        'ice_flow.c',
+        'ice_dcb.c',
+        'ice_fdir.c',
+        'ice_acl.c',
+        'ice_acl_ctrl.c',
+        'ice_vlan_mode.c',
 ]
 
-error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-variable',
-		'-Wno-unused-parameter',
+error_cflags = [
+        '-Wno-unused-value',
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-variable',
+        '-Wno-unused-parameter',
 ]
 
 if is_windows and cc.get_id() != 'clang'
-	cflags += ['-fno-asynchronous-unwind-tables']
+    cflags += ['-fno-asynchronous-unwind-tables']
 endif
 
 c_args = cflags
 
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ice_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+        dependencies: static_rte_eal,
+        c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build
index 44ef64b4c..4cb3e1dd4 100644
--- a/drivers/net/ice/meson.build
+++ b/drivers/net/ice/meson.build
@@ -5,68 +5,70 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ice_ethdev.c',
-	'ice_rxtx.c',
-	'ice_switch_filter.c',
-	'ice_generic_flow.c',
-	'ice_fdir_filter.c',
-	'ice_hash.c',
-	'ice_acl_filter.c'
-	)
+        'ice_ethdev.c',
+        'ice_rxtx.c',
+        'ice_switch_filter.c',
+        'ice_generic_flow.c',
+        'ice_fdir_filter.c',
+        'ice_hash.c',
+        'ice_acl_filter.c'
+)
 
 deps += ['hash', 'net', 'common_iavf']
 includes += include_directories('base', '../../common/iavf')
 
 if arch_subdir == 'x86'
-	sources += files('ice_rxtx_vec_sse.c')
+    sources += files('ice_rxtx_vec_sse.c')
 
-	if is_windows and cc.get_id() != 'clang'
-		cflags += ['-fno-asynchronous-unwind-tables']
-	endif
+    if is_windows and cc.get_id() != 'clang'
+        cflags += ['-fno-asynchronous-unwind-tables']
+    endif
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		sources += files('ice_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		ice_avx2_lib = static_library('ice_avx2_lib',
-				'ice_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        sources += files('ice_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        ice_avx2_lib = static_library('ice_avx2_lib',
+                'ice_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
+    endif
 
-	ice_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    ice_avx512_cpu_support = (
+            cc.get_define('__AVX512F__', args: machine_args) != '' and
+                cc.get_define('__AVX512BW__', args: machine_args) != ''
+    )
 
-	ice_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    ice_avx512_cc_support = (
+            not machine_args.contains('-mno-avx512f') and
+                cc.has_argument('-mavx512f') and
+                cc.has_argument('-mavx512bw')
+    )
 
-	if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		ice_avx512_lib = static_library('ice_avx512_lib',
-				'ice_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
-	endif
+    if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        ice_avx512_lib = static_library('ice_avx512_lib',
+                'ice_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
+    endif
 endif
 
 sources += files('ice_dcf.c',
-		 'ice_dcf_vf_representor.c',
-		 'ice_dcf_ethdev.c',
-		 'ice_dcf_parent.c')
+         'ice_dcf_vf_representor.c',
+         'ice_dcf_ethdev.c',
+         'ice_dcf_parent.c')
 
 headers = files('rte_pmd_ice.h')
diff --git a/drivers/net/igc/base/meson.build b/drivers/net/igc/base/meson.build
index 690704fe0..e09c8b6c0 100644
--- a/drivers/net/igc/base/meson.build
+++ b/drivers/net/igc/base/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 sources = [
-	'igc_api.c',
-	'igc_base.c',
-	'igc_i225.c',
-	'igc_mac.c',
-	'igc_manage.c',
-	'igc_nvm.c',
-	'igc_osdep.c',
-	'igc_phy.c',
+    'igc_api.c',
+    'igc_base.c',
+    'igc_i225.c',
+    'igc_mac.c',
+    'igc_manage.c',
+    'igc_nvm.c',
+    'igc_osdep.c',
+    'igc_phy.c',
 ]
 
 base_lib = static_library('igc_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/igc/meson.build b/drivers/net/igc/meson.build
index b971e6f8c..b62a5f7d3 100644
--- a/drivers/net/igc/meson.build
+++ b/drivers/net/igc/meson.build
@@ -2,20 +2,20 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'igc_logs.c',
-	'igc_ethdev.c',
-	'igc_txrx.c',
-	'igc_filter.c',
-	'igc_flow.c'
+    'igc_logs.c',
+    'igc_ethdev.c',
+    'igc_txrx.c',
+    'igc_filter.c',
+    'igc_flow.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build
index 631ea27f5..9b33d12a7 100644
--- a/drivers/net/ionic/meson.build
+++ b/drivers/net/ionic/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2019 Pensando
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files(
-	'ionic_mac_api.c',
-	'ionic_rx_filter.c',
-	'ionic_rxtx.c',
-	'ionic_dev.c',
-	'ionic_ethdev.c',
-	'ionic_lif.c',
-	'ionic_main.c'
+    'ionic_mac_api.c',
+    'ionic_rx_filter.c',
+    'ionic_rxtx.c',
+    'ionic_dev.c',
+    'ionic_ethdev.c',
+    'ionic_lif.c',
+    'ionic_main.c'
 )
diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build
index 65de9d517..6863cd904 100644
--- a/drivers/net/ipn3ke/meson.build
+++ b/drivers/net/ipn3ke/meson.build
@@ -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
 
 #
@@ -16,15 +16,15 @@ endif
 #
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 includes += include_directories('../../raw/ifpga')
 
 sources += files('ipn3ke_ethdev.c',
-	'ipn3ke_representor.c',
-	'ipn3ke_tm.c',
-	'ipn3ke_flow.c')
+    'ipn3ke_representor.c',
+    'ipn3ke_tm.c',
+    'ipn3ke_flow.c')
 deps += ['bus_ifpga', 'ethdev', 'sched']
diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
index 48bbb86cb..b7dfbc977 100644
--- a/drivers/net/ixgbe/base/meson.build
+++ b/drivers/net/ixgbe/base/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'ixgbe_82598.c',
-	'ixgbe_82599.c',
-	'ixgbe_api.c',
-	'ixgbe_common.c',
-	'ixgbe_dcb_82598.c',
-	'ixgbe_dcb_82599.c',
-	'ixgbe_dcb.c',
-	'ixgbe_hv_vf.c',
-	'ixgbe_mbx.c',
-	'ixgbe_phy.c',
-	'ixgbe_vf.c',
-	'ixgbe_x540.c',
-	'ixgbe_x550.c'
+    'ixgbe_82598.c',
+    'ixgbe_82599.c',
+    'ixgbe_api.c',
+    'ixgbe_common.c',
+    'ixgbe_dcb_82598.c',
+    'ixgbe_dcb_82599.c',
+    'ixgbe_dcb.c',
+    'ixgbe_hv_vf.c',
+    'ixgbe_mbx.c',
+    'ixgbe_phy.c',
+    'ixgbe_vf.c',
+    'ixgbe_x540.c',
+    'ixgbe_x550.c'
 ]
 
 error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
-		]
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
+        ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ixgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build
index 76cbfb830..e7ac0f2c7 100644
--- a/drivers/net/ixgbe/meson.build
+++ b/drivers/net/ixgbe/meson.build
@@ -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
 
 cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
@@ -13,25 +13,25 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ixgbe_82599_bypass.c',
-	'ixgbe_bypass.c',
-	'ixgbe_ethdev.c',
-	'ixgbe_fdir.c',
-	'ixgbe_flow.c',
-	'ixgbe_ipsec.c',
-	'ixgbe_pf.c',
-	'ixgbe_rxtx.c',
-	'ixgbe_tm.c',
-	'ixgbe_vf_representor.c',
-	'rte_pmd_ixgbe.c'
+    'ixgbe_82599_bypass.c',
+    'ixgbe_bypass.c',
+    'ixgbe_ethdev.c',
+    'ixgbe_fdir.c',
+    'ixgbe_flow.c',
+    'ixgbe_ipsec.c',
+    'ixgbe_pf.c',
+    'ixgbe_rxtx.c',
+    'ixgbe_tm.c',
+    'ixgbe_vf_representor.c',
+    'rte_pmd_ixgbe.c'
 )
 
 deps += ['hash', 'security']
 
 if arch_subdir == 'x86'
-	sources += files('ixgbe_rxtx_vec_sse.c')
+    sources += files('ixgbe_rxtx_vec_sse.c')
 elif arch_subdir == 'arm'
-	sources += files('ixgbe_rxtx_vec_neon.c')
+    sources += files('ixgbe_rxtx_vec_neon.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
index 4d5e5fe36..c0751aeb5 100644
--- a/drivers/net/kni/meson.build
+++ b/drivers/net/kni/meson.build
@@ -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
 
 # this driver can be built if-and-only-if KNI library is buildable
diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build
index 4965ebe85..e32029e85 100644
--- a/drivers/net/liquidio/meson.build
+++ b/drivers/net/liquidio/meson.build
@@ -2,13 +2,13 @@
 # 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('base/lio_23xx_vf.c',
-	'base/lio_mbox.c',
-	'lio_ethdev.c',
-	'lio_rxtx.c')
+    'base/lio_mbox.c',
+    'lio_ethdev.c',
+    'lio_rxtx.c')
 includes += include_directories('base')
diff --git a/drivers/net/memif/meson.build b/drivers/net/memif/meson.build
index 9c3ba432d..3201f3bab 100644
--- a/drivers/net/memif/meson.build
+++ b/drivers/net/memif/meson.build
@@ -2,11 +2,11 @@
 # Copyright 2018-2019 Cisco Systems, Inc.  All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('rte_eth_memif.c',
-		'memif_socket.c')
+        'memif_socket.c')
 
 deps += ['hash']
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index d7602b748..2ddfea51f 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -3,9 +3,9 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 static_ibverbs = (get_option('ibverbs_link') == 'static')
@@ -14,74 +14,74 @@ LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+        '-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
+        '-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx4', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs,
+            required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources = files(
-	'mlx4.c',
-	'mlx4_ethdev.c',
-	'mlx4_flow.c',
-	'mlx4_intr.c',
-	'mlx4_mp.c',
-	'mlx4_mr.c',
-	'mlx4_rxq.c',
-	'mlx4_rxtx.c',
-	'mlx4_txq.c',
-	'mlx4_utils.c',
+    'mlx4.c',
+    'mlx4_ethdev.c',
+    'mlx4_flow.c',
+    'mlx4_intr.c',
+    'mlx4_mp.c',
+    'mlx4_mr.c',
+    'mlx4_rxq.c',
+    'mlx4_rxtx.c',
+    'mlx4_txq.c',
+    'mlx4_utils.c',
 )
 if not dlopen_ibverbs
-	sources += files('mlx4_glue.c')
+    sources += files('mlx4_glue.c')
 endif
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 # To maintain the compatibility with the make build system
 # mlx4_autoconf.h file is still generated.
@@ -90,49 +90,49 @@ endif
 #   "symbol to search", "struct member to search" ]
 #
 has_member_args = [
-	[ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
-	'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
+    [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
+    'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
-	'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
-	[ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
-	'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
+    [ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
+    'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
+    [ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
+    'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
+        dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix: file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3],
+        prefix: file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx4_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx4_glue'
-	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' ]
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: global_inc,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx4_glue'
+    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' ]
+    shared_lib = shared_library(
+        dlopen_lib_name,
+        dlopen_sources,
+        include_directories: global_inc,
+        c_args: cflags,
+        dependencies: libs,
+        link_args: [
+        '-Wl,-export-dynamic',
+        '-Wl,-h,@0@'.format(LIB_GLUE),
+        ],
+        soversion: dlopen_so_version,
+        install: true,
+        install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/net/mlx5/linux/meson.build b/drivers/net/mlx5/linux/meson.build
index 8412edce7..9eda20e82 100644
--- a/drivers/net/mlx5/linux/meson.build
+++ b/drivers/net/mlx5/linux/meson.build
@@ -3,12 +3,12 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_socket.c',
-	'mlx5_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_verbs.c',
-	'mlx5_mp_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+    'mlx5_socket.c',
+    'mlx5_os.c',
+    'mlx5_ethdev_os.c',
+    'mlx5_verbs.c',
+    'mlx5_mp_os.c',
+    'mlx5_vlan_os.c',
+    'mlx5_flow_os.c',
 )
 
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index f2fafbdd0..c071275d4 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -3,60 +3,60 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not (is_linux or is_windows)
-	build = false
-	reason = 'only supported on Linux and Windows'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5']
 sources = files(
-	'mlx5.c',
-	'mlx5_ethdev.c',
-	'mlx5_flow.c',
-	'mlx5_flow_meter.c',
-	'mlx5_flow_dv.c',
+    'mlx5.c',
+    'mlx5_ethdev.c',
+    'mlx5_flow.c',
+    'mlx5_flow_meter.c',
+    'mlx5_flow_dv.c',
         'mlx5_flow_age.c',
-	'mlx5_mac.c',
-	'mlx5_mr.c',
-	'mlx5_rss.c',
-	'mlx5_rxmode.c',
-	'mlx5_rxq.c',
-	'mlx5_rxtx.c',
-	'mlx5_stats.c',
-	'mlx5_trigger.c',
-	'mlx5_txq.c',
-	'mlx5_txpp.c',
-	'mlx5_vlan.c',
-	'mlx5_utils.c',
-	'mlx5_devx.c',
+    'mlx5_mac.c',
+    'mlx5_mr.c',
+    'mlx5_rss.c',
+    'mlx5_rxmode.c',
+    'mlx5_rxq.c',
+    'mlx5_rxtx.c',
+    'mlx5_stats.c',
+    'mlx5_trigger.c',
+    'mlx5_txq.c',
+    'mlx5_txpp.c',
+    'mlx5_vlan.c',
+    'mlx5_utils.c',
+    'mlx5_devx.c',
 )
 
 if is_linux
-	sources += files(
-		'mlx5_flow_verbs.c',
-	)
-	if (dpdk_conf.has('RTE_ARCH_X86_64')
-		or dpdk_conf.has('RTE_ARCH_ARM64')
-		or dpdk_conf.has('RTE_ARCH_PPC_64'))
-		sources += files('mlx5_rxtx_vec.c')
-	endif
+    sources += files(
+        'mlx5_flow_verbs.c',
+    )
+    if (dpdk_conf.has('RTE_ARCH_X86_64')
+        or dpdk_conf.has('RTE_ARCH_ARM64')
+        or dpdk_conf.has('RTE_ARCH_PPC_64'))
+        sources += files('mlx5_rxtx_vec.c')
+    endif
 endif
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 subdir(exec_env)
diff --git a/drivers/net/mlx5/windows/meson.build b/drivers/net/mlx5/windows/meson.build
index ddb6c6ca9..cb3460709 100644
--- a/drivers/net/mlx5/windows/meson.build
+++ b/drivers/net/mlx5/windows/meson.build
@@ -3,9 +3,9 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_os.c',
-	'mlx5_mp_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+    'mlx5_os.c',
+    'mlx5_mp_os.c',
+    'mlx5_ethdev_os.c',
+    'mlx5_vlan_os.c',
+    'mlx5_flow_os.c',
 )
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 0be7b3d8b..c0d516f5e 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -4,23 +4,23 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mvneta_ethdev.c',
-	'mvneta_rxtx.c'
+    'mvneta_ethdev.c',
+    'mvneta_rxtx.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index bfda5439b..8250c3254 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -4,26 +4,26 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mrvl_ethdev.c',
-	'mrvl_flow.c',
-	'mrvl_qos.c',
-	'mrvl_mtr.c',
-	'mrvl_tm.c'
+    'mrvl_ethdev.c',
+    'mrvl_flow.c',
+    'mrvl_qos.c',
+    'mrvl_mtr.c',
+    'mrvl_tm.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build
index c190124db..1dac5e512 100644
--- a/drivers/net/netvsc/meson.build
+++ b/drivers/net/netvsc/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Microsoft Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 build = dpdk_conf.has('RTE_BUS_VMBUS')
diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build
index f4a89b87d..0af4ddf80 100644
--- a/drivers/net/nfb/meson.build
+++ b/drivers/net/nfb/meson.build
@@ -4,9 +4,9 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('netcope-common', required: false, method: 'pkg-config')
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 21b20c9ac..766e9c737 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
+    build = false
+    reason = 'only supported on 64-bit Linux'
 endif
 sources = files('nfpcore/nfp_cpp_pcie_ops.c',
-	'nfpcore/nfp_nsp.c',
-	'nfpcore/nfp_cppcore.c',
-	'nfpcore/nfp_resource.c',
-	'nfpcore/nfp_mip.c',
-	'nfpcore/nfp_nffw.c',
-	'nfpcore/nfp_rtsym.c',
-	'nfpcore/nfp_nsp_cmds.c',
-	'nfpcore/nfp_crc.c',
-	'nfpcore/nfp_mutex.c',
-	'nfpcore/nfp_nsp_eth.c',
-	'nfpcore/nfp_hwinfo.c',
-	'nfp_net.c')
+    'nfpcore/nfp_nsp.c',
+    'nfpcore/nfp_cppcore.c',
+    'nfpcore/nfp_resource.c',
+    'nfpcore/nfp_mip.c',
+    'nfpcore/nfp_nffw.c',
+    'nfpcore/nfp_rtsym.c',
+    'nfpcore/nfp_nsp_cmds.c',
+    'nfpcore/nfp_crc.c',
+    'nfpcore/nfp_mutex.c',
+    'nfpcore/nfp_nsp_eth.c',
+    'nfpcore/nfp_hwinfo.c',
+    'nfp_net.c')
diff --git a/drivers/net/null/meson.build b/drivers/net/null/meson.build
index d9fb88fd7..0251578aa 100644
--- a/drivers/net/null/meson.build
+++ b/drivers/net/null/meson.build
@@ -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
 
 sources = files('rte_eth_null.c')
diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index b8fe4b301..88dfca6e1 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'octeontx_pkovf.c',
-	'octeontx_pkivf.c',
-	'octeontx_bgx.c'
+    'octeontx_pkovf.c',
+    'octeontx_pkivf.c',
+    'octeontx_bgx.c'
 ]
 
 depends = ['ethdev', 'mempool_octeontx']
 static_objs = []
 foreach d: depends
-	if not is_variable('shared_rte_' + d)
-		subdir_done()
-	endif
-	static_objs += get_variable('static_rte_' + d)
+    if not is_variable('shared_rte_' + d)
+        subdir_done()
+    endif
+    static_objs += get_variable('static_rte_' + d)
 endforeach
 
 c_args = cflags
 base_lib = static_library('octeontx_base', sources,
-	c_args: c_args,
-	dependencies: static_objs,
+    c_args: c_args,
+    dependencies: static_objs,
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 4e784b948..1baac9768 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -2,18 +2,18 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('octeontx_rxtx.c',
-		'octeontx_ethdev.c',
-		'octeontx_ethdev_ops.c'
-		)
+        'octeontx_ethdev.c',
+        'octeontx_ethdev_ops.c'
+        )
 
 deps += ['mempool_octeontx', 'eventdev']
 
diff --git a/drivers/net/octeontx2/meson.build b/drivers/net/octeontx2/meson.build
index 779a75b5d..fbcdd61e1 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,49 +3,49 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_rx.c',
-		'otx2_tx.c',
-		'otx2_tm.c',
-		'otx2_rss.c',
-		'otx2_mac.c',
-		'otx2_ptp.c',
-		'otx2_flow.c',
-		'otx2_link.c',
-		'otx2_vlan.c',
-		'otx2_stats.c',
-		'otx2_mcast.c',
-		'otx2_lookup.c',
-		'otx2_ethdev.c',
-		'otx2_flow_ctrl.c',
-		'otx2_flow_dump.c',
-		'otx2_flow_parse.c',
-		'otx2_flow_utils.c',
-		'otx2_ethdev_irq.c',
-		'otx2_ethdev_ops.c',
-		'otx2_ethdev_sec.c',
-		'otx2_ethdev_debug.c',
-		'otx2_ethdev_devargs.c'
-		)
+        'otx2_tx.c',
+        'otx2_tm.c',
+        'otx2_rss.c',
+        'otx2_mac.c',
+        'otx2_ptp.c',
+        'otx2_flow.c',
+        'otx2_link.c',
+        'otx2_vlan.c',
+        'otx2_stats.c',
+        'otx2_mcast.c',
+        'otx2_lookup.c',
+        'otx2_ethdev.c',
+        'otx2_flow_ctrl.c',
+        'otx2_flow_dump.c',
+        'otx2_flow_parse.c',
+        'otx2_flow_utils.c',
+        'otx2_ethdev_irq.c',
+        'otx2_ethdev_ops.c',
+        'otx2_ethdev_sec.c',
+        'otx2_ethdev_debug.c',
+        'otx2_ethdev_devargs.c'
+        )
 
 deps += ['bus_pci', 'cryptodev', 'eventdev', 'security']
 deps += ['common_octeontx2', 'mempool_octeontx2']
 
 extra_flags = ['-flax-vector-conversions']
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build
index b65d91e70..61c055158 100644
--- a/drivers/net/pcap/meson.build
+++ b/drivers/net/pcap/meson.build
@@ -2,14 +2,14 @@
 # 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 dpdk_conf.has('RTE_PORT_PCAP')
-	build = false
-	reason = 'missing dependency, "libpcap"'
+    build = false
+    reason = 'missing dependency, "libpcap"'
 endif
 sources = files('rte_eth_pcap.c')
 ext_deps += pcap_dep
diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build
index da0787c28..811053ae9 100644
--- a/drivers/net/pfe/meson.build
+++ b/drivers/net/pfe/meson.build
@@ -2,18 +2,18 @@
 # Copyright 2019 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['common_dpaax']
 
 sources = files('pfe_ethdev.c',
-		'pfe_hal.c',
-		'pfe_hif_lib.c',
-		'pfe_hif.c')
+        'pfe_hal.c',
+        'pfe_hif_lib.c',
+        'pfe_hif.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/qede/base/meson.build b/drivers/net/qede/base/meson.build
index 03a6c44f5..d6ffc1799 100644
--- a/drivers/net/qede/base/meson.build
+++ b/drivers/net/qede/base/meson.build
@@ -2,47 +2,47 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = [
-	'bcm_osal.c',
-	'ecore_cxt.c',
-	'ecore_dcbx.c',
-	'ecore_dev.c',
-	'ecore_hw.c',
-	'ecore_init_fw_funcs.c',
-	'ecore_init_ops.c',
-	'ecore_int.c',
-	'ecore_l2.c',
-	'ecore_mcp.c',
-	'ecore_sp_commands.c',
-	'ecore_spq.c',
-	'ecore_sriov.c',
-	'ecore_vf.c',
+    'bcm_osal.c',
+    'ecore_cxt.c',
+    'ecore_dcbx.c',
+    'ecore_dev.c',
+    'ecore_hw.c',
+    'ecore_init_fw_funcs.c',
+    'ecore_init_ops.c',
+    'ecore_int.c',
+    'ecore_l2.c',
+    'ecore_mcp.c',
+    'ecore_sp_commands.c',
+    'ecore_spq.c',
+    'ecore_sriov.c',
+    'ecore_vf.c',
 ]
 
 
 error_cflags = [
-	'-Wno-unused-parameter',
-	'-Wno-sign-compare',
-	'-Wno-missing-prototypes',
-	'-Wno-cast-qual',
-	'-Wno-unused-function',
-	'-Wno-unused-variable',
-	'-Wno-strict-aliasing',
-	'-Wno-missing-prototypes',
-	'-Wno-unused-value',
-	'-Wno-format-nonliteral',
-	'-Wno-shift-negative-value',
-	'-Wno-unused-but-set-variable',
-	'-Wno-missing-declarations',
-	'-Wno-maybe-uninitialized',
-	'-Wno-strict-prototypes',
-	'-Wno-shift-negative-value',
-	'-Wno-implicit-fallthrough',
-	'-Wno-format-extra-args',
-	'-Wno-visibility',
-	'-Wno-empty-body',
-	'-Wno-invalid-source-encoding',
-	'-Wno-sometimes-uninitialized',
-	'-Wno-pointer-bool-conversion',
+    '-Wno-unused-parameter',
+    '-Wno-sign-compare',
+    '-Wno-missing-prototypes',
+    '-Wno-cast-qual',
+    '-Wno-unused-function',
+    '-Wno-unused-variable',
+    '-Wno-strict-aliasing',
+    '-Wno-missing-prototypes',
+    '-Wno-unused-value',
+    '-Wno-format-nonliteral',
+    '-Wno-shift-negative-value',
+    '-Wno-unused-but-set-variable',
+    '-Wno-missing-declarations',
+    '-Wno-maybe-uninitialized',
+    '-Wno-strict-prototypes',
+    '-Wno-shift-negative-value',
+    '-Wno-implicit-fallthrough',
+    '-Wno-format-extra-args',
+    '-Wno-visibility',
+    '-Wno-empty-body',
+    '-Wno-invalid-source-encoding',
+    '-Wno-sometimes-uninitialized',
+    '-Wno-pointer-bool-conversion',
 ]
 c_args = cflags
 foreach flag: error_cflags
@@ -52,6 +52,6 @@ foreach flag: error_cflags
 endforeach
 
 base_lib = static_library('qede_base', sources,
-	dependencies: [static_rte_net, static_rte_bus_pci],
-	c_args: c_args)
+    dependencies: [static_rte_net, static_rte_bus_pci],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 05ce69560..03626eae7 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'qede_ethdev.c',
-	'qede_filter.c',
-	'qede_main.c',
-	'qede_rxtx.c',
-	'qede_debug.c',
-	'qede_regs.c',
-	'qede_sriov.c',
+    'qede_ethdev.c',
+    'qede_filter.c',
+    'qede_main.c',
+    'qede_rxtx.c',
+    'qede_debug.c',
+    'qede_regs.c',
+    'qede_sriov.c',
 )
 
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
diff --git a/drivers/net/ring/meson.build b/drivers/net/ring/meson.build
index fb6a5f7d6..0156b37aa 100644
--- a/drivers/net/ring/meson.build
+++ b/drivers/net/ring/meson.build
@@ -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
 
 sources = files('rte_eth_ring.c')
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index 0c5cfb905..6ffbda597 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -7,14 +7,14 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
@@ -24,42 +24,42 @@ extra_flags += '-Wno-strict-aliasing'
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+    '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+    '-Waggregate-return',
+    '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 deps += ['common_sfc_efx', 'bus_pci']
 sources = files(
-	'sfc_ethdev.c',
-	'sfc_kvargs.c',
-	'sfc.c',
-	'sfc_mcdi.c',
-	'sfc_sriov.c',
-	'sfc_intr.c',
-	'sfc_ev.c',
-	'sfc_port.c',
-	'sfc_rx.c',
-	'sfc_tx.c',
-	'sfc_tso.c',
-	'sfc_filter.c',
-	'sfc_switch.c',
-	'sfc_mae.c',
-	'sfc_flow.c',
-	'sfc_dp.c',
-	'sfc_ef10_rx.c',
-	'sfc_ef10_essb_rx.c',
-	'sfc_ef10_tx.c',
-	'sfc_ef100_rx.c',
-	'sfc_ef100_tx.c',
+    'sfc_ethdev.c',
+    'sfc_kvargs.c',
+    'sfc.c',
+    'sfc_mcdi.c',
+    'sfc_sriov.c',
+    'sfc_intr.c',
+    'sfc_ev.c',
+    'sfc_port.c',
+    'sfc_rx.c',
+    'sfc_tx.c',
+    'sfc_tso.c',
+    'sfc_filter.c',
+    'sfc_switch.c',
+    'sfc_mae.c',
+    'sfc_flow.c',
+    'sfc_dp.c',
+    'sfc_ef10_rx.c',
+    'sfc_ef10_essb_rx.c',
+    'sfc_ef10_tx.c',
+    'sfc_ef100_rx.c',
+    'sfc_ef100_tx.c',
 )
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index e31bdece7..0bde03a0c 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -2,23 +2,23 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 headers = files('rte_eth_softnic.h')
 sources = files('rte_eth_softnic_tm.c',
-	'rte_eth_softnic.c',
-	'rte_eth_softnic_mempool.c',
-	'rte_eth_softnic_swq.c',
-	'rte_eth_softnic_link.c',
-	'rte_eth_softnic_tap.c',
-	'rte_eth_softnic_action.c',
-	'rte_eth_softnic_pipeline.c',
-	'rte_eth_softnic_thread.c',
-	'rte_eth_softnic_cli.c',
-	'rte_eth_softnic_flow.c',
-	'rte_eth_softnic_meter.c',
-	'rte_eth_softnic_cryptodev.c',
-	'parser.c',
-	'conn.c')
+    'rte_eth_softnic.c',
+    'rte_eth_softnic_mempool.c',
+    'rte_eth_softnic_swq.c',
+    'rte_eth_softnic_link.c',
+    'rte_eth_softnic_tap.c',
+    'rte_eth_softnic_action.c',
+    'rte_eth_softnic_pipeline.c',
+    'rte_eth_softnic_thread.c',
+    'rte_eth_softnic_cli.c',
+    'rte_eth_softnic_flow.c',
+    'rte_eth_softnic_meter.c',
+    'rte_eth_softnic_cryptodev.c',
+    'parser.c',
+    'conn.c')
 deps += ['pipeline', 'port', 'table', 'sched', 'cryptodev']
diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
index 4f8f3325f..dd288bfac 100644
--- a/drivers/net/szedata2/meson.build
+++ b/drivers/net/szedata2/meson.build
@@ -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
 
 dep = dependency('libsze2', required: false, method: 'pkg-config')
diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build
index d51bd3190..8b506a9c0 100644
--- a/drivers/net/tap/meson.build
+++ b/drivers/net/tap/meson.build
@@ -2,16 +2,16 @@
 # Copyright 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files(
-	'rte_eth_tap.c',
-	'tap_bpf_api.c',
-	'tap_flow.c',
-	'tap_intr.c',
-	'tap_netlink.c',
-	'tap_tcmsgs.c',
+    'rte_eth_tap.c',
+    'tap_bpf_api.c',
+    'tap_flow.c',
+    'tap_intr.c',
+    'tap_netlink.c',
+    'tap_tcmsgs.c',
 )
 
 deps = ['bus_vdev', 'gso', 'hash']
@@ -25,21 +25,21 @@ cflags += '-DTAP_MAX_QUEUES=16'
 #   "enum/define", "symbol to search" ]
 #
 args = [
-	[ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_UNSPEC' ],
-	[ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_KEY_VLAN_PRIO' ],
-	[ 'HAVE_TC_BPF', 'linux/pkt_cls.h',
-	  'TCA_BPF_UNSPEC' ],
-	[ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h',
-	  'TCA_BPF_FD' ],
-	[ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_UNSPEC' ],
-	[ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_FD' ],
+    [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h',
+      'TCA_FLOWER_UNSPEC' ],
+    [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h',
+      'TCA_FLOWER_KEY_VLAN_PRIO' ],
+    [ 'HAVE_TC_BPF', 'linux/pkt_cls.h',
+      'TCA_BPF_UNSPEC' ],
+    [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h',
+      'TCA_BPF_FD' ],
+    [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h',
+      'TCA_ACT_BPF_UNSPEC' ],
+    [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h',
+      'TCA_ACT_BPF_FD' ],
 ]
 config = configuration_data()
 foreach arg:args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
 endforeach
 configure_file(output : 'tap_autoconf.h', configuration : config)
diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build
index 8998264a3..b75e1c83e 100644
--- a/drivers/net/thunderx/base/meson.build
+++ b/drivers/net/thunderx/base/meson.build
@@ -2,15 +2,15 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'nicvf_hw.c',
-	'nicvf_mbox.c',
-	'nicvf_bsvf.c'
+    'nicvf_hw.c',
+    'nicvf_mbox.c',
+    'nicvf_bsvf.c'
 ]
 
 c_args = cflags
 base_lib = static_library('nicvf_base', sources,
-	c_args: c_args,
-	dependencies: static_rte_ethdev
+    c_args: c_args,
+    dependencies: static_rte_ethdev
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index dad5c5924..468a450ec 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -2,25 +2,25 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('nicvf_rxtx.c',
-		'nicvf_ethdev.c',
-		'nicvf_svf.c'
+        'nicvf_ethdev.c',
+        'nicvf_svf.c'
 )
 
 if cc.has_argument('-fno-prefetch-loop-arrays')
-	cflags += '-fno-prefetch-loop-arrays'
+    cflags += '-fno-prefetch-loop-arrays'
 endif
 
 if cc.has_argument('-Wno-maybe-uninitialized')
-	cflags += '-Wno-maybe-uninitialized'
+    cflags += '-Wno-maybe-uninitialized'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build
index 33d0adf0d..9b48ff153 100644
--- a/drivers/net/txgbe/base/meson.build
+++ b/drivers/net/txgbe/base/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2015-2020
 
 sources = [
-	'txgbe_dcb_hw.c',
-	'txgbe_dcb.c',
-	'txgbe_eeprom.c',
-	'txgbe_hw.c',
-	'txgbe_mbx.c',
-	'txgbe_mng.c',
-	'txgbe_phy.c',
-	'txgbe_vf.c',
+    'txgbe_dcb_hw.c',
+    'txgbe_dcb.c',
+    'txgbe_eeprom.c',
+    'txgbe_hw.c',
+    'txgbe_mbx.c',
+    'txgbe_mng.c',
+    'txgbe_phy.c',
+    'txgbe_vf.c',
 ]
 
 error_cflags = []
 
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('txgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build
index 3b9994aa9..74290d439 100644
--- a/drivers/net/txgbe/meson.build
+++ b/drivers/net/txgbe/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2015-2020
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'txgbe_ethdev.c',
-	'txgbe_ethdev_vf.c',
-	'txgbe_fdir.c',
-	'txgbe_flow.c',
-	'txgbe_ipsec.c',
-	'txgbe_ptypes.c',
-	'txgbe_pf.c',
-	'txgbe_rxtx.c',
-	'txgbe_tm.c',
+    'txgbe_ethdev.c',
+    'txgbe_ethdev_vf.c',
+    'txgbe_fdir.c',
+    'txgbe_flow.c',
+    'txgbe_ipsec.c',
+    'txgbe_ptypes.c',
+    'txgbe_pf.c',
+    'txgbe_rxtx.c',
+    'txgbe_tm.c',
 )
 
 deps += ['hash', 'security']
diff --git a/drivers/net/vdev_netvsc/meson.build b/drivers/net/vdev_netvsc/meson.build
index 49d3a2c7b..b20a053bc 100644
--- a/drivers/net/vdev_netvsc/meson.build
+++ b/drivers/net/vdev_netvsc/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('vdev_netvsc.c')
 
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
index 804b7a1dd..858b79fdf 100644
--- a/drivers/net/vhost/meson.build
+++ b/drivers/net/vhost/meson.build
@@ -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
 
 build = dpdk_conf.has('RTE_LIB_VHOST')
diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
index d595cfdca..06bd0b6ed 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -2,54 +2,54 @@
 # 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('virtio.c',
-	'virtio_ethdev.c',
-	'virtio_pci_ethdev.c',
-	'virtio_pci.c',
-	'virtio_rxtx.c',
-	'virtio_rxtx_simple.c',
-	'virtqueue.c')
+    'virtio_ethdev.c',
+    'virtio_pci_ethdev.c',
+    'virtio_pci.c',
+    'virtio_rxtx.c',
+    'virtio_rxtx_simple.c',
+    'virtqueue.c')
 deps += ['kvargs', 'bus_pci']
 
 if arch_subdir == 'x86'
-	if not machine_args.contains('-mno-avx512f')
-		if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
-			cflags += ['-DCC_AVX512_SUPPORT']
-			virtio_avx512_lib = static_library('virtio_avx512_lib',
-					      'virtio_rxtx_packed.c',
-					      dependencies: [static_rte_ethdev,
-						static_rte_kvargs, static_rte_bus_pci],
-					      include_directories: includes,
-					      c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
-			objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
-			if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-				cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
-			elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-				cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
-			elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-				cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
-			endif
-		endif
-	endif
-	sources += files('virtio_rxtx_simple_sse.c')
+    if not machine_args.contains('-mno-avx512f')
+        if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
+            cflags += ['-DCC_AVX512_SUPPORT']
+            virtio_avx512_lib = static_library('virtio_avx512_lib',
+                          'virtio_rxtx_packed.c',
+                          dependencies: [static_rte_ethdev,
+                        static_rte_kvargs, static_rte_bus_pci],
+                          include_directories: includes,
+                          c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
+            objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
+            if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
+                cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
+            elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
+                cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
+            elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
+                cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
+            endif
+        endif
+    endif
+    sources += files('virtio_rxtx_simple_sse.c')
 elif arch_subdir == 'ppc'
-	sources += files('virtio_rxtx_simple_altivec.c')
+    sources += files('virtio_rxtx_simple_altivec.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('virtio_rxtx_packed.c')
-	sources += files('virtio_rxtx_simple_neon.c')
+    sources += files('virtio_rxtx_packed.c')
+    sources += files('virtio_rxtx_simple_neon.c')
 endif
 
 if is_linux
-	sources += files('virtio_user_ethdev.c',
-		'virtio_user/vhost_kernel.c',
-		'virtio_user/vhost_kernel_tap.c',
-		'virtio_user/vhost_user.c',
-		'virtio_user/vhost_vdpa.c',
-		'virtio_user/virtio_user_dev.c')
-	deps += ['bus_vdev']
+    sources += files('virtio_user_ethdev.c',
+        'virtio_user/vhost_kernel.c',
+        'virtio_user/vhost_kernel_tap.c',
+        'virtio_user/vhost_user.c',
+        'virtio_user/vhost_vdpa.c',
+        'virtio_user/virtio_user_dev.c')
+    deps += ['bus_vdev']
 endif
diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build
index 0641f776f..ed563386d 100644
--- a/drivers/net/vmxnet3/meson.build
+++ b/drivers/net/vmxnet3/meson.build
@@ -2,13 +2,15 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources += files(
-	'vmxnet3_ethdev.c',
-	'vmxnet3_rxtx.c',
+        'vmxnet3_ethdev.c',
+        'vmxnet3_rxtx.c',
 )
 
 error_cflags = [
-		'-Wno-unused-parameter', '-Wno-unused-value',
-                '-Wno-strict-aliasing', '-Wno-format-extra-args',
+        '-Wno-unused-parameter',
+        '-Wno-unused-value',
+        '-Wno-strict-aliasing',
+        '-Wno-format-extra-args',
 ]
 foreach flag: error_cflags
         if cc.has_argument(flag)
diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
index 3549afafa..a7e7f4b71 100644
--- a/drivers/raw/ifpga/base/meson.build
+++ b/drivers/raw/ifpga/base/meson.build
@@ -2,42 +2,42 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = [
-	'ifpga_api.c',
-	'ifpga_enumerate.c',
-	'ifpga_feature_dev.c',
-	'ifpga_fme.c',
-	'ifpga_fme_iperf.c',
-	'ifpga_fme_dperf.c',
-	'ifpga_fme_error.c',
-	'ifpga_port.c',
-	'ifpga_port_error.c',
-	'ifpga_fme_pr.c',
-	'ifpga_fme_rsu.c',
-	'ifpga_sec_mgr.c',
-	'opae_hw_api.c',
-	'opae_ifpga_hw_api.c',
-	'opae_debug.c',
-	'opae_spi.c',
-	'opae_spi_transaction.c',
-	'opae_intel_max10.c',
-	'opae_i2c.c',
-	'opae_at24_eeprom.c',
-	'opae_eth_group.c',
+    'ifpga_api.c',
+    'ifpga_enumerate.c',
+    'ifpga_feature_dev.c',
+    'ifpga_fme.c',
+    'ifpga_fme_iperf.c',
+    'ifpga_fme_dperf.c',
+    'ifpga_fme_error.c',
+    'ifpga_port.c',
+    'ifpga_port_error.c',
+    'ifpga_fme_pr.c',
+    'ifpga_fme_rsu.c',
+    'ifpga_sec_mgr.c',
+    'opae_hw_api.c',
+    'opae_ifpga_hw_api.c',
+    'opae_debug.c',
+    'opae_spi.c',
+    'opae_spi_transaction.c',
+    'opae_intel_max10.c',
+    'opae_i2c.c',
+    'opae_at24_eeprom.c',
+    'opae_eth_group.c',
 ]
 
 rtdep = dependency('librt', required: false)
 if not rtdep.found()
-	rtdep = cc.find_library('librt', required: false)
+    rtdep = cc.find_library('librt', required: false)
 endif
 if not rtdep.found()
-	build = false
-	reason = 'missing dependency, "librt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "librt"'
+    subdir_done()
 endif
 
 ext_deps += rtdep
 
 base_lib = static_library('ifpga_rawdev_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 60ea59ae2..aeccc1796 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
-	'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
+    'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
 
 sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c')
 
diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build
index 6fbae05b7..9599b879c 100644
--- a/drivers/raw/ioat/meson.build
+++ b/drivers/raw/ioat/meson.build
@@ -4,15 +4,15 @@
 build = dpdk_conf.has('RTE_ARCH_X86')
 reason = 'only supported on x86'
 sources = files(
-	'idxd_pci.c',
-	'idxd_vdev.c',
-	'ioat_common.c',
-	'ioat_rawdev.c',
-	'ioat_rawdev_test.c')
+    'idxd_pci.c',
+    'idxd_vdev.c',
+    'ioat_common.c',
+    'ioat_rawdev.c',
+    'ioat_rawdev_test.c')
 deps += ['bus_pci',
-	'bus_vdev',
-	'mbuf',
-	'rawdev']
+    'bus_vdev',
+    'mbuf',
+    'rawdev']
 
 headers = files('rte_ioat_rawdev.h',
-		'rte_ioat_rawdev_fns.h')
+        'rte_ioat_rawdev_fns.h')
diff --git a/drivers/raw/ntb/meson.build b/drivers/raw/ntb/meson.build
index 1b7c6eb44..bfe0b0e36 100644
--- a/drivers/raw/ntb/meson.build
+++ b/drivers/raw/ntb/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2019 Intel Corporation.
 
 deps += ['rawdev', 'mbuf', 'mempool',
-	 'pci', 'bus_pci']
+     'pci', 'bus_pci']
 sources = files('ntb.c',
                 'ntb_hw_intel.c')
 headers = files('rte_pmd_ntb.h')
diff --git a/drivers/raw/octeontx2_dma/meson.build b/drivers/raw/octeontx2_dma/meson.build
index 11f74680a..e744fccaa 100644
--- a/drivers/raw/octeontx2_dma/meson.build
+++ b/drivers/raw/octeontx2_dma/meson.build
@@ -8,11 +8,11 @@ sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c')
 extra_flags = []
 # This integrated controller runs only on a arm64 machine, remove 32bit warnings
 if not dpdk_conf.get('RTE_ARCH_64')
-	extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
+    extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
 endif
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
diff --git a/drivers/raw/octeontx2_ep/meson.build b/drivers/raw/octeontx2_ep/meson.build
index 0e6338f76..fed71db5e 100644
--- a/drivers/raw/octeontx2_ep/meson.build
+++ b/drivers/raw/octeontx2_ep/meson.build
@@ -4,6 +4,6 @@
 
 deps += ['bus_pci', 'common_octeontx2', 'rawdev']
 sources = files('otx2_ep_rawdev.c',
-		'otx2_ep_enqdeq.c',
-		'otx2_ep_test.c',
-		'otx2_ep_vf.c')
+        'otx2_ep_enqdeq.c',
+        'otx2_ep_test.c',
+        'otx2_ep_vf.c')
diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build
index 87e961181..cd8da347f 100644
--- a/drivers/regex/mlx5/meson.build
+++ b/drivers/regex/mlx5/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2020 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['common_mlx5', 'eal', 'regexdev']
 sources = files(
-	'mlx5_regex.c',
-	'mlx5_rxp.c',
-	'mlx5_regex_devx.c',
-	'mlx5_regex_control.c',
-	'mlx5_regex_fastpath.c',
+    'mlx5_regex.c',
+    'mlx5_rxp.c',
+    'mlx5_regex_devx.c',
+    'mlx5_regex_control.c',
+    'mlx5_regex_fastpath.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/regex/octeontx2/meson.build b/drivers/regex/octeontx2/meson.build
index 6ccc8589a..55af764b9 100644
--- a/drivers/regex/octeontx2/meson.build
+++ b/drivers/regex/octeontx2/meson.build
@@ -3,24 +3,24 @@
 #
 
 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
 
 lib = cc.find_library('librxp_compiler', required: false)
 if lib.found()
-	ext_deps += lib
-	ext_deps += cc.find_library('libstdc++', required: true)
-	includes += include_directories(inc_dir)
-	cflags += ['-DREE_COMPILER_SDK']
+    ext_deps += lib
+    ext_deps += cc.find_library('libstdc++', required: true)
+    includes += include_directories(inc_dir)
+    cflags += ['-DREE_COMPILER_SDK']
 endif
 
 sources = files('otx2_regexdev.c',
-		'otx2_regexdev_hw_access.c',
-		'otx2_regexdev_mbox.c',
-		'otx2_regexdev_compiler.c'
-		)
+        'otx2_regexdev_hw_access.c',
+        'otx2_regexdev_mbox.c',
+        'otx2_regexdev_compiler.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'regexdev']
 
diff --git a/drivers/vdpa/mlx5/meson.build b/drivers/vdpa/mlx5/meson.build
index a83ca86b3..642a72319 100644
--- a/drivers/vdpa/mlx5/meson.build
+++ b/drivers/vdpa/mlx5/meson.build
@@ -2,35 +2,35 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched']
 sources = files(
-	'mlx5_vdpa.c',
-	'mlx5_vdpa_mem.c',
-	'mlx5_vdpa_event.c',
-	'mlx5_vdpa_virtq.c',
-	'mlx5_vdpa_steer.c',
-	'mlx5_vdpa_lm.c',
+    'mlx5_vdpa.c',
+    'mlx5_vdpa_mem.c',
+    'mlx5_vdpa_event.c',
+    'mlx5_vdpa_virtq.c',
+    'mlx5_vdpa_steer.c',
+    'mlx5_vdpa_lm.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+    '-std=c11',
+    '-Wno-strict-prototypes',
+    '-D_BSD_SOURCE',
+    '-D_DEFAULT_SOURCE',
+    '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
-- 
2.27.0

[dpdk-dev] [PATCH 10/14] examples: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/bbdev_app/meson.build                |  2 +-
 examples/bond/meson.build                     |  2 +-
 examples/cmdline/meson.build                  |  2 +-
 examples/distributor/meson.build              |  4 +--
 examples/ethtool/meson.build                  |  8 ++---
 examples/eventdev_pipeline/meson.build        |  6 ++--
 examples/fips_validation/meson.build          | 22 +++++++-------
 examples/flow_classify/meson.build            |  2 +-
 examples/flow_filtering/meson.build           |  2 +-
 examples/helloworld/meson.build               |  2 +-
 examples/ioat/meson.build                     |  4 +--
 examples/ip_fragmentation/meson.build         |  2 +-
 examples/ip_pipeline/meson.build              | 30 +++++++++----------
 examples/ip_reassembly/meson.build            |  2 +-
 examples/ipsec-secgw/meson.build              | 26 ++++++++--------
 examples/ipv4_multicast/meson.build           |  2 +-
 examples/kni/meson.build                      |  4 +--
 examples/l2fwd-cat/meson.build                |  4 +--
 examples/l2fwd-crypto/meson.build             |  4 +--
 examples/l2fwd-event/meson.build              | 12 ++++----
 examples/l2fwd-jobstats/meson.build           |  2 +-
 examples/l2fwd-keepalive/meson.build          |  6 ++--
 examples/l2fwd/meson.build                    |  2 +-
 examples/l3fwd-acl/meson.build                |  2 +-
 examples/l3fwd-graph/meson.build              |  2 +-
 examples/l3fwd-power/meson.build              |  2 +-
 examples/l3fwd/meson.build                    |  4 +--
 examples/link_status_interrupt/meson.build    |  2 +-
 .../client_server_mp/mp_client/meson.build    |  2 +-
 .../client_server_mp/mp_server/meson.build    |  2 +-
 examples/multi_process/hotplug_mp/meson.build |  2 +-
 examples/multi_process/simple_mp/meson.build  |  2 +-
 .../multi_process/symmetric_mp/meson.build    |  2 +-
 examples/ntb/meson.build                      |  8 ++---
 examples/packet_ordering/meson.build          |  2 +-
 .../l3fwd-thread/meson.build                  | 20 ++++++-------
 .../pthread_shim/meson.build                  | 22 +++++++-------
 examples/pipeline/meson.build                 | 12 ++++----
 examples/ptpclient/meson.build                |  2 +-
 examples/qos_meter/meson.build                |  2 +-
 examples/qos_sched/meson.build                |  4 +--
 examples/rxtx_callbacks/meson.build           |  2 +-
 examples/service_cores/meson.build            |  2 +-
 examples/skeleton/meson.build                 |  2 +-
 examples/timer/meson.build                    |  2 +-
 examples/vdpa/meson.build                     |  6 ++--
 examples/vhost/meson.build                    | 10 +++----
 examples/vhost_blk/meson.build                | 10 +++----
 examples/vhost_crypto/meson.build             |  4 +--
 .../vm_power_manager/guest_cli/meson.build    |  2 +-
 examples/vm_power_manager/meson.build         | 20 ++++++-------
 examples/vmdq/meson.build                     |  2 +-
 examples/vmdq_dcb/meson.build                 |  2 +-
 53 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/examples/bbdev_app/meson.build b/examples/bbdev_app/meson.build
index 8e06a8a23..df8ee6842 100644
--- a/examples/bbdev_app/meson.build
+++ b/examples/bbdev_app/meson.build
@@ -9,5 +9,5 @@
 deps += 'bbdev'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/bond/meson.build b/examples/bond/meson.build
index 69382ffcd..eba94bfe8 100644
--- a/examples/bond/meson.build
+++ b/examples/bond/meson.build
@@ -9,5 +9,5 @@
 deps += 'net_bond'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/cmdline/meson.build b/examples/cmdline/meson.build
index 7de0f1625..04b2995aa 100644
--- a/examples/cmdline/meson.build
+++ b/examples/cmdline/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'commands.c', 'main.c', 'parse_obj_list.c'
+    'commands.c', 'main.c', 'parse_obj_list.c'
 )
diff --git a/examples/distributor/meson.build b/examples/distributor/meson.build
index d8dbc235f..52e91ee78 100644
--- a/examples/distributor/meson.build
+++ b/examples/distributor/meson.build
@@ -9,11 +9,11 @@
 # require the power library
 build = dpdk_conf.has('RTE_LIB_POWER')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 allow_experimental_apis = true
 deps += ['distributor', 'power']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build
index 4d08bc4c5..1b57daaff 100644
--- a/examples/ethtool/meson.build
+++ b/examples/ethtool/meson.build
@@ -8,17 +8,17 @@
 
 build = is_linux
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 sources = files('lib/rte_ethtool.c',
-	'ethtool-app/ethapp.c',
-	'ethtool-app/main.c')
+    'ethtool-app/ethapp.c',
+    'ethtool-app/main.c')
 includes = include_directories('lib', 'ethtool-app')
 
 deps += 'bus_pci'
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += 'net_ixgbe'
+    deps += 'net_ixgbe'
 endif
 
 allow_experimental_apis = true
diff --git a/examples/eventdev_pipeline/meson.build b/examples/eventdev_pipeline/meson.build
index 1dfeba0d3..ca983aa05 100644
--- a/examples/eventdev_pipeline/meson.build
+++ b/examples/eventdev_pipeline/meson.build
@@ -9,7 +9,7 @@
 allow_experimental_apis = true
 deps += 'eventdev'
 sources = files(
-	'main.c',
-	'pipeline_worker_generic.c',
-	'pipeline_worker_tx.c'
+    'main.c',
+    'pipeline_worker_generic.c',
+    'pipeline_worker_tx.c'
 )
diff --git a/examples/fips_validation/meson.build b/examples/fips_validation/meson.build
index e2745d278..6cdffc82f 100644
--- a/examples/fips_validation/meson.build
+++ b/examples/fips_validation/meson.build
@@ -9,15 +9,15 @@
 deps += ['cryptodev']
 allow_experimental_apis = true
 sources = files(
-	'fips_validation_aes.c',
-	'fips_validation.c',
-	'fips_validation_hmac.c',
-	'fips_validation_tdes.c',
-	'fips_validation_gcm.c',
-	'fips_validation_cmac.c',
-	'fips_validation_ccm.c',
-	'fips_validation_sha.c',
-	'fips_validation_xts.c',
-	'fips_dev_self_test.c',
-	'main.c'
+    'fips_validation_aes.c',
+    'fips_validation.c',
+    'fips_validation_hmac.c',
+    'fips_validation_tdes.c',
+    'fips_validation_gcm.c',
+    'fips_validation_cmac.c',
+    'fips_validation_ccm.c',
+    'fips_validation_sha.c',
+    'fips_validation_xts.c',
+    'fips_dev_self_test.c',
+    'main.c'
 )
diff --git a/examples/flow_classify/meson.build b/examples/flow_classify/meson.build
index 56472e681..c2364aa2f 100644
--- a/examples/flow_classify/meson.build
+++ b/examples/flow_classify/meson.build
@@ -9,5 +9,5 @@
 deps += 'flow_classify'
 allow_experimental_apis = true
 sources = files(
-	'flow_classify.c'
+    'flow_classify.c'
 )
diff --git a/examples/flow_filtering/meson.build b/examples/flow_filtering/meson.build
index 6f5d1b08a..cde1ef8ec 100644
--- a/examples/flow_filtering/meson.build
+++ b/examples/flow_filtering/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c',
+    'main.c',
 )
diff --git a/examples/helloworld/meson.build b/examples/helloworld/meson.build
index 2b0a25036..0b893d214 100644
--- a/examples/helloworld/meson.build
+++ b/examples/helloworld/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ioat/meson.build b/examples/ioat/meson.build
index e348196ba..24057d9c1 100644
--- a/examples/ioat/meson.build
+++ b/examples/ioat/meson.build
@@ -9,11 +9,11 @@
 allow_experimental_apis = true
 build = dpdk_conf.has('RTE_RAW_IOAT')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['raw_ioat']
 
 sources = files(
-	'ioatfwd.c'
+    'ioatfwd.c'
 )
diff --git a/examples/ip_fragmentation/meson.build b/examples/ip_fragmentation/meson.build
index 1230db477..336a1fcb7 100644
--- a/examples/ip_fragmentation/meson.build
+++ b/examples/ip_fragmentation/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps +=  ['ip_frag', 'lpm']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ip_pipeline/meson.build b/examples/ip_pipeline/meson.build
index 945e28b58..23c785cb4 100644
--- a/examples/ip_pipeline/meson.build
+++ b/examples/ip_pipeline/meson.build
@@ -8,24 +8,24 @@
 
 build = cc.has_header('sys/epoll.h')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['pipeline', 'bus_pci']
 allow_experimental_apis = true
 sources = files(
-	'action.c',
-	'cli.c',
-	'conn.c',
-	'kni.c',
-	'link.c',
-	'main.c',
-	'mempool.c',
-	'parser.c',
-	'pipeline.c',
-	'swq.c',
-	'tap.c',
-	'thread.c',
-	'tmgr.c',
-	'cryptodev.c'
+    'action.c',
+    'cli.c',
+    'conn.c',
+    'kni.c',
+    'link.c',
+    'main.c',
+    'mempool.c',
+    'parser.c',
+    'pipeline.c',
+    'swq.c',
+    'tap.c',
+    'thread.c',
+    'tmgr.c',
+    'cryptodev.c'
 )
diff --git a/examples/ip_reassembly/meson.build b/examples/ip_reassembly/meson.build
index 517bd4e19..bf5eab6f0 100644
--- a/examples/ip_reassembly/meson.build
+++ b/examples/ip_reassembly/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['lpm', 'ip_frag']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ipsec-secgw/meson.build b/examples/ipsec-secgw/meson.build
index d0373dab5..298a32bf6 100644
--- a/examples/ipsec-secgw/meson.build
+++ b/examples/ipsec-secgw/meson.build
@@ -9,17 +9,17 @@
 deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev']
 allow_experimental_apis = true
 sources = files(
-	'esp.c',
-	'event_helper.c',
-	'flow.c',
-	'ipsec.c',
-	'ipsec_process.c',
-	'ipsec-secgw.c',
-	'ipsec_worker.c',
-	'parser.c',
-	'rt.c',
-	'sa.c',
-	'sad.c',
-	'sp4.c',
-	'sp6.c'
+    'esp.c',
+    'event_helper.c',
+    'flow.c',
+    'ipsec.c',
+    'ipsec_process.c',
+    'ipsec-secgw.c',
+    'ipsec_worker.c',
+    'parser.c',
+    'rt.c',
+    'sa.c',
+    'sad.c',
+    'sp4.c',
+    'sp6.c'
 )
diff --git a/examples/ipv4_multicast/meson.build b/examples/ipv4_multicast/meson.build
index 7dc13fb8f..a3f667304 100644
--- a/examples/ipv4_multicast/meson.build
+++ b/examples/ipv4_multicast/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'hash'
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/kni/meson.build b/examples/kni/meson.build
index e119eebab..e782f458d 100644
--- a/examples/kni/meson.build
+++ b/examples/kni/meson.build
@@ -9,11 +9,11 @@
 # this app can be built if-and-only-if KNI library is buildable
 build = dpdk_conf.has('RTE_LIB_KNI')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['kni', 'bus_pci']
 sources = files(
-	'main.c'
+    'main.c'
 )
 allow_experimental_apis = true
diff --git a/examples/l2fwd-cat/meson.build b/examples/l2fwd-cat/meson.build
index 60169bcbd..3b48a0972 100644
--- a/examples/l2fwd-cat/meson.build
+++ b/examples/l2fwd-cat/meson.build
@@ -9,12 +9,12 @@
 pqos = cc.find_library('pqos', required: false)
 build = pqos.found()
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 ext_deps += pqos
 allow_experimental_apis = true
 cflags += '-I/usr/local/include' # assume pqos lib installed in /usr/local
 sources = files(
-	'cat.c', 'l2fwd-cat.c'
+    'cat.c', 'l2fwd-cat.c'
 )
diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build
index 1813f015b..8fe4c451d 100644
--- a/examples/l2fwd-crypto/meson.build
+++ b/examples/l2fwd-crypto/meson.build
@@ -8,9 +8,9 @@
 
 deps += 'cryptodev'
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l2fwd-event/meson.build b/examples/l2fwd-event/meson.build
index 4a546eaf8..2388f59e9 100644
--- a/examples/l2fwd-event/meson.build
+++ b/examples/l2fwd-event/meson.build
@@ -10,10 +10,10 @@
 allow_experimental_apis = true
 deps += 'eventdev'
 sources = files(
-	'main.c',
-	'l2fwd_poll.c',
-	'l2fwd_common.c',
-	'l2fwd_event.c',
-	'l2fwd_event_internal_port.c',
-	'l2fwd_event_generic.c'
+    'main.c',
+    'l2fwd_poll.c',
+    'l2fwd_common.c',
+    'l2fwd_event.c',
+    'l2fwd_event_internal_port.c',
+    'l2fwd_event_generic.c'
 )
diff --git a/examples/l2fwd-jobstats/meson.build b/examples/l2fwd-jobstats/meson.build
index 72273736b..a42914025 100644
--- a/examples/l2fwd-jobstats/meson.build
+++ b/examples/l2fwd-jobstats/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['jobstats', 'timer']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l2fwd-keepalive/meson.build b/examples/l2fwd-keepalive/meson.build
index a56d67967..3ca5b6fd9 100644
--- a/examples/l2fwd-keepalive/meson.build
+++ b/examples/l2fwd-keepalive/meson.build
@@ -9,12 +9,12 @@
 allow_experimental_apis = true
 librt = cc.find_library('rt', required: false)
 if not librt.found()
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 ext_deps += librt
 deps += 'timer'
 sources = files(
-	'main.c', 'shm.c'
+    'main.c', 'shm.c'
 )
diff --git a/examples/l2fwd/meson.build b/examples/l2fwd/meson.build
index 50d88caa0..f50bf0927 100644
--- a/examples/l2fwd/meson.build
+++ b/examples/l2fwd/meson.build
@@ -9,5 +9,5 @@
 # Enable experimental API flag as l2fwd uses rte_ethdev_set_ptype API
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l3fwd-acl/meson.build b/examples/l3fwd-acl/meson.build
index 6fa468b3a..b0b42afcb 100644
--- a/examples/l3fwd-acl/meson.build
+++ b/examples/l3fwd-acl/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['acl', 'lpm', 'hash']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/l3fwd-graph/meson.build b/examples/l3fwd-graph/meson.build
index a816bd890..2550bdea7 100644
--- a/examples/l3fwd-graph/meson.build
+++ b/examples/l3fwd-graph/meson.build
@@ -8,6 +8,6 @@
 
 deps += ['graph', 'eal', 'lpm', 'ethdev', 'node' ]
 sources = files(
-	'main.c'
+    'main.c'
 )
 allow_experimental_apis = true
diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index eb8aef306..b4cb93c9c 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -14,5 +14,5 @@ endif
 allow_experimental_apis = true
 deps += ['power', 'timer', 'lpm', 'hash', 'metrics', 'telemetry']
 sources = files(
-	'main.c', 'perf_core.c'
+    'main.c', 'perf_core.c'
 )
diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build
index 7d72b1b36..05b2ba45f 100644
--- a/examples/l3fwd/meson.build
+++ b/examples/l3fwd/meson.build
@@ -9,6 +9,6 @@
 allow_experimental_apis = true
 deps += ['hash', 'lpm', 'eventdev']
 sources = files(
-	'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c',
-	'l3fwd_event_internal_port.c', 'l3fwd_event_generic.c', 'main.c'
+    'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c',
+    'l3fwd_event_internal_port.c', 'l3fwd_event_generic.c', 'main.c'
 )
diff --git a/examples/link_status_interrupt/meson.build b/examples/link_status_interrupt/meson.build
index 2b0a25036..0b893d214 100644
--- a/examples/link_status_interrupt/meson.build
+++ b/examples/link_status_interrupt/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/multi_process/client_server_mp/mp_client/meson.build b/examples/multi_process/client_server_mp/mp_client/meson.build
index 69c3d3bfb..e9edb216e 100644
--- a/examples/multi_process/client_server_mp/mp_client/meson.build
+++ b/examples/multi_process/client_server_mp/mp_client/meson.build
@@ -10,5 +10,5 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-	'client.c'
+    'client.c'
 )
diff --git a/examples/multi_process/client_server_mp/mp_server/meson.build b/examples/multi_process/client_server_mp/mp_server/meson.build
index 0ef6424f4..a166a0fb9 100644
--- a/examples/multi_process/client_server_mp/mp_server/meson.build
+++ b/examples/multi_process/client_server_mp/mp_server/meson.build
@@ -10,5 +10,5 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-	'args.c', 'init.c', 'main.c'
+    'args.c', 'init.c', 'main.c'
 )
diff --git a/examples/multi_process/hotplug_mp/meson.build b/examples/multi_process/hotplug_mp/meson.build
index f82f4d48a..821e6d6bb 100644
--- a/examples/multi_process/hotplug_mp/meson.build
+++ b/examples/multi_process/hotplug_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'commands.c', 'main.c'
+    'commands.c', 'main.c'
 )
diff --git a/examples/multi_process/simple_mp/meson.build b/examples/multi_process/simple_mp/meson.build
index cb02c65a6..6b4ee638d 100644
--- a/examples/multi_process/simple_mp/meson.build
+++ b/examples/multi_process/simple_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'mp_commands.c', 'main.c'
+    'mp_commands.c', 'main.c'
 )
diff --git a/examples/multi_process/symmetric_mp/meson.build b/examples/multi_process/symmetric_mp/meson.build
index 14167825b..201558f89 100644
--- a/examples/multi_process/symmetric_mp/meson.build
+++ b/examples/multi_process/symmetric_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build
index 02be9fc80..6010458e9 100644
--- a/examples/ntb/meson.build
+++ b/examples/ntb/meson.build
@@ -8,15 +8,15 @@
 
 allow_experimental_apis = true
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'rawdev'
 cflags += ['-D_FILE_OFFSET_BITS=64']
 sources = files(
-	'ntb_fwd.c'
+    'ntb_fwd.c'
 )
 if dpdk_conf.has('RTE_RAW_NTB')
-	deps += 'raw_ntb'
+    deps += 'raw_ntb'
 endif
diff --git a/examples/packet_ordering/meson.build b/examples/packet_ordering/meson.build
index b38195914..99dd1bb76 100644
--- a/examples/packet_ordering/meson.build
+++ b/examples/packet_ordering/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'reorder'
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/performance-thread/l3fwd-thread/meson.build b/examples/performance-thread/l3fwd-thread/meson.build
index 4858b201e..58d4e96a4 100644
--- a/examples/performance-thread/l3fwd-thread/meson.build
+++ b/examples/performance-thread/l3fwd-thread/meson.build
@@ -8,7 +8,7 @@
 
 build = dpdk_conf.has('RTE_ARCH_X86_64')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['timer', 'lpm']
@@ -16,17 +16,17 @@ allow_experimental_apis = true
 
 # get the performance thread (pt) architecture subdir
 if dpdk_conf.has('RTE_ARCH_ARM64')
-	pt_arch_dir = '../common/arch/arm64'
+    pt_arch_dir = '../common/arch/arm64'
 else
-	pt_arch_dir = '../common/arch/x86'
+    pt_arch_dir = '../common/arch/x86'
 endif
 sources += files('main.c',
-	'../common/lthread.c',
-	'../common/lthread_cond.c',
-	'../common/lthread_diag.c',
-	'../common/lthread_mutex.c',
-	'../common/lthread_sched.c',
-	'../common/lthread_tls.c',
-	pt_arch_dir + '/ctx.c')
+    '../common/lthread.c',
+    '../common/lthread_cond.c',
+    '../common/lthread_diag.c',
+    '../common/lthread_mutex.c',
+    '../common/lthread_sched.c',
+    '../common/lthread_tls.c',
+    pt_arch_dir + '/ctx.c')
 
 includes += include_directories('../common', pt_arch_dir)
diff --git a/examples/performance-thread/pthread_shim/meson.build b/examples/performance-thread/pthread_shim/meson.build
index d49979930..866e6c94e 100644
--- a/examples/performance-thread/pthread_shim/meson.build
+++ b/examples/performance-thread/pthread_shim/meson.build
@@ -8,7 +8,7 @@
 
 build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['timer']
@@ -16,18 +16,18 @@ allow_experimental_apis = true
 
 # get the performance thread (pt) architecture subdir
 if dpdk_conf.has('RTE_ARCH_ARM64')
-	pt_arch_dir = '../common/arch/arm64'
+    pt_arch_dir = '../common/arch/arm64'
 else
-	pt_arch_dir = '../common/arch/x86'
+    pt_arch_dir = '../common/arch/x86'
 endif
 sources += files('main.c',
-	'pthread_shim.c',
-	'../common/lthread.c',
-	'../common/lthread_cond.c',
-	'../common/lthread_diag.c',
-	'../common/lthread_mutex.c',
-	'../common/lthread_sched.c',
-	'../common/lthread_tls.c',
-	pt_arch_dir + '/ctx.c')
+    'pthread_shim.c',
+    '../common/lthread.c',
+    '../common/lthread_cond.c',
+    '../common/lthread_diag.c',
+    '../common/lthread_mutex.c',
+    '../common/lthread_sched.c',
+    '../common/lthread_tls.c',
+    pt_arch_dir + '/ctx.c')
 
 includes += include_directories('../common', pt_arch_dir)
diff --git a/examples/pipeline/meson.build b/examples/pipeline/meson.build
index 4f5925d7c..02c0944f5 100644
--- a/examples/pipeline/meson.build
+++ b/examples/pipeline/meson.build
@@ -8,15 +8,15 @@
 
 build = cc.has_header('sys/epoll.h')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['pipeline', 'bus_pci']
 allow_experimental_apis = true
 sources = files(
-	'cli.c',
-	'conn.c',
-	'main.c',
-	'obj.c',
-	'thread.c',
+    'cli.c',
+    'conn.c',
+    'main.c',
+    'obj.c',
+    'thread.c',
 )
diff --git a/examples/ptpclient/meson.build b/examples/ptpclient/meson.build
index d4171a218..abe196195 100644
--- a/examples/ptpclient/meson.build
+++ b/examples/ptpclient/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'ptpclient.c'
+    'ptpclient.c'
 )
diff --git a/examples/qos_meter/meson.build b/examples/qos_meter/meson.build
index 2f9ab13af..43fff9cad 100644
--- a/examples/qos_meter/meson.build
+++ b/examples/qos_meter/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'meter'
 sources = files(
-	'main.c', 'rte_policer.c'
+    'main.c', 'rte_policer.c'
 )
diff --git a/examples/qos_sched/meson.build b/examples/qos_sched/meson.build
index ba59d3c9e..ef8e40739 100644
--- a/examples/qos_sched/meson.build
+++ b/examples/qos_sched/meson.build
@@ -9,6 +9,6 @@
 allow_experimental_apis = true
 deps += ['sched', 'cfgfile']
 sources = files(
-	'app_thread.c', 'args.c', 'cfg_file.c', 'cmdline.c',
-	'init.c', 'main.c', 'stats.c'
+    'app_thread.c', 'args.c', 'cfg_file.c', 'cmdline.c',
+    'init.c', 'main.c', 'stats.c'
 )
diff --git a/examples/rxtx_callbacks/meson.build b/examples/rxtx_callbacks/meson.build
index a7bf12dd3..12b41f59f 100644
--- a/examples/rxtx_callbacks/meson.build
+++ b/examples/rxtx_callbacks/meson.build
@@ -10,5 +10,5 @@
 allow_experimental_apis = true
 
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/service_cores/meson.build b/examples/service_cores/meson.build
index 2b0a25036..0b893d214 100644
--- a/examples/service_cores/meson.build
+++ b/examples/service_cores/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/skeleton/meson.build b/examples/skeleton/meson.build
index ef46b187e..7e0b7d112 100644
--- a/examples/skeleton/meson.build
+++ b/examples/skeleton/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'basicfwd.c'
+    'basicfwd.c'
 )
diff --git a/examples/timer/meson.build b/examples/timer/meson.build
index 87c21a867..e03b69266 100644
--- a/examples/timer/meson.build
+++ b/examples/timer/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'timer'
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vdpa/meson.build b/examples/vdpa/meson.build
index 26f6089c9..3ddbbc126 100644
--- a/examples/vdpa/meson.build
+++ b/examples/vdpa/meson.build
@@ -7,12 +7,12 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vhost/meson.build b/examples/vhost/meson.build
index 9d9947c58..41ab9cfb1 100644
--- a/examples/vhost/meson.build
+++ b/examples/vhost/meson.build
@@ -7,17 +7,17 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'main.c', 'virtio_net.c'
+    'main.c', 'virtio_net.c'
 )
 
 if dpdk_conf.has('RTE_RAW_IOAT')
-	deps += 'raw_ioat'
-	sources += files('ioat.c')
+    deps += 'raw_ioat'
+    sources += files('ioat.c')
 endif
diff --git a/examples/vhost_blk/meson.build b/examples/vhost_blk/meson.build
index 354ba0584..ad6157769 100644
--- a/examples/vhost_blk/meson.build
+++ b/examples/vhost_blk/meson.build
@@ -7,17 +7,17 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 if not cc.has_header('linux/virtio_blk.h')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'blk.c', 'vhost_blk.c', 'vhost_blk_compat.c'
+    'blk.c', 'vhost_blk.c', 'vhost_blk_compat.c'
 )
diff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build
index 403f21098..d379ba078 100644
--- a/examples/vhost_crypto/meson.build
+++ b/examples/vhost_crypto/meson.build
@@ -8,11 +8,11 @@
 
 build = dpdk_conf.has('RTE_LIB_VHOST')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 allow_experimental_apis = true
 deps += ['vhost', 'cryptodev']
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
index cd9526601..6ac09ef02 100644
--- a/examples/vm_power_manager/guest_cli/meson.build
+++ b/examples/vm_power_manager/guest_cli/meson.build
@@ -14,7 +14,7 @@ endif
 deps += ['power']
 
 sources = files(
-	'main.c', 'parse.c', 'vm_power_cli_guest.c'
+    'main.c', 'parse.c', 'vm_power_cli_guest.c'
 )
 
 allow_experimental_apis = true
diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index 637bd2323..67e72a222 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -7,34 +7,34 @@
 # DPDK instance, use 'make'
 
 if not dpdk_conf.has('RTE_LIB_POWER')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += ['power']
 
 if dpdk_conf.has('RTE_NET_BNXT')
-	deps += ['net_bnxt']
+    deps += ['net_bnxt']
 endif
 
 if dpdk_conf.has('RTE_NET_I40E')
-	deps += ['net_i40e']
+    deps += ['net_i40e']
 endif
 
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += ['net_ixgbe']
+    deps += ['net_ixgbe']
 endif
 
 allow_experimental_apis = true
 sources = files(
-	'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
+    'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
 )
 
 # If we're on X86, pull in the x86 code for the branch monitor algo.
 if dpdk_conf.has('RTE_ARCH_X86_64')
-	sources += files('oob_monitor_x86.c')
+    sources += files('oob_monitor_x86.c')
 else
-	sources += files('oob_monitor_nop.c')
+    sources += files('oob_monitor_nop.c')
 endif
 
 opt_dep = cc.find_library('virt', required : false)
@@ -43,6 +43,6 @@ ext_deps += opt_dep
 
 opt_dep = dependency('jansson', required : false, method: 'pkg-config')
 if opt_dep.found()
-	ext_deps += opt_dep
-	cflags += '-DUSE_JANSSON'
+    ext_deps += opt_dep
+    cflags += '-DUSE_JANSSON'
 endif
diff --git a/examples/vmdq/meson.build b/examples/vmdq/meson.build
index 2b0a25036..0b893d214 100644
--- a/examples/vmdq/meson.build
+++ b/examples/vmdq/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
diff --git a/examples/vmdq_dcb/meson.build b/examples/vmdq_dcb/meson.build
index 2b0a25036..0b893d214 100644
--- a/examples/vmdq_dcb/meson.build
+++ b/examples/vmdq_dcb/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+    'main.c'
 )
-- 
2.27.0

[dpdk-dev] [PATCH 11/14] app: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/test-bbdev/meson.build         |  12 +-
 app/test-compress-perf/meson.build |  10 +-
 app/test-crypto-perf/meson.build   |  20 +-
 app/test-eventdev/meson.build      |  24 +-
 app/test-flow-perf/meson.build     |   8 +-
 app/test-pipeline/meson.build      |  18 +-
 app/test-pmd/meson.build           |  60 ++--
 app/test/meson.build               | 530 +++++++++++++++--------------
 8 files changed, 342 insertions(+), 340 deletions(-)

diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 6d50e0339..6fafd55b9 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('main.c',
-		'test_bbdev.c',
-		'test_bbdev_perf.c',
-		'test_bbdev_vector.c')
+        'test_bbdev.c',
+        'test_bbdev_perf.c',
+        'test_bbdev_vector.c')
 deps += ['bbdev', 'bus_vdev']
 if dpdk_conf.has('RTE_BASEBAND_FPGA_LTE_FEC')
-	deps += ['baseband_fpga_lte_fec']
+    deps += ['baseband_fpga_lte_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_FPGA_5GNR_FEC')
-	deps += ['baseband_fpga_5gnr_fec']
+    deps += ['baseband_fpga_5gnr_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_ACC100')
-	deps += ['baseband_acc100']
+    deps += ['baseband_acc100']
 endif
diff --git a/app/test-compress-perf/meson.build b/app/test-compress-perf/meson.build
index a1a484da9..4dbf1c78f 100644
--- a/app/test-compress-perf/meson.build
+++ b/app/test-compress-perf/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('comp_perf_options_parse.c',
-		'main.c',
-		'comp_perf_test_verify.c',
-		'comp_perf_test_throughput.c',
-		'comp_perf_test_cyclecount.c',
-		'comp_perf_test_common.c')
+        'main.c',
+        'comp_perf_test_verify.c',
+        'comp_perf_test_throughput.c',
+        'comp_perf_test_cyclecount.c',
+        'comp_perf_test_common.c')
 deps = ['compressdev']
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 558c64878..b974161c7 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('cperf_ops.c',
-		'cperf_options_parsing.c',
-		'cperf_test_common.c',
-		'cperf_test_latency.c',
-		'cperf_test_pmd_cyclecount.c',
-		'cperf_test_throughput.c',
-		'cperf_test_vector_parsing.c',
-		'cperf_test_vectors.c',
-		'cperf_test_verify.c',
-		'main.c')
+        'cperf_options_parsing.c',
+        'cperf_test_common.c',
+        'cperf_test_latency.c',
+        'cperf_test_pmd_cyclecount.c',
+        'cperf_test_throughput.c',
+        'cperf_test_vector_parsing.c',
+        'cperf_test_vectors.c',
+        'cperf_test_verify.c',
+        'main.c')
 deps += ['cryptodev', 'net', 'security']
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index 9e588d9ec..edb3f293f 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = files('evt_main.c',
-		'evt_options.c',
-		'evt_test.c',
-		'parser.c',
-		'test_order_common.c',
-		'test_order_atq.c',
-		'test_order_queue.c',
-		'test_perf_common.c',
-		'test_perf_atq.c',
-		'test_perf_queue.c',
-		'test_pipeline_common.c',
-		'test_pipeline_atq.c',
-		'test_pipeline_queue.c')
+        'evt_options.c',
+        'evt_test.c',
+        'parser.c',
+        'test_order_common.c',
+        'test_order_atq.c',
+        'test_order_queue.c',
+        'test_perf_common.c',
+        'test_perf_atq.c',
+        'test_perf_queue.c',
+        'test_pipeline_common.c',
+        'test_pipeline_atq.c',
+        'test_pipeline_queue.c')
 deps += 'eventdev'
diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build
index 6eaf83b41..2cfb03963 100644
--- a/app/test-flow-perf/meson.build
+++ b/app/test-flow-perf/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2020 Mellanox Technologies, Ltd
 
 sources = files(
-	'actions_gen.c',
-	'flow_gen.c',
-	'items_gen.c',
-	'main.c',
+    'actions_gen.c',
+    'flow_gen.c',
+    'items_gen.c',
+    'main.c',
 )
 
 deps += ['ethdev']
diff --git a/app/test-pipeline/meson.build b/app/test-pipeline/meson.build
index d5eddaba9..bfe9b0e24 100644
--- a/app/test-pipeline/meson.build
+++ b/app/test-pipeline/meson.build
@@ -2,13 +2,13 @@
 # Copyright(c) 2019 Intel Corporation
 
 sources = files(
-	'config.c',
-	'init.c',
-	'main.c',
-	'pipeline_acl.c',
-	'pipeline_hash.c',
-	'pipeline_lpm.c',
-	'pipeline_lpm_ipv6.c',
-	'pipeline_stub.c',
-	'runtime.c')
+    'config.c',
+    'init.c',
+    'main.c',
+    'pipeline_acl.c',
+    'pipeline_hash.c',
+    'pipeline_lpm.c',
+    'pipeline_lpm_ipv6.c',
+    'pipeline_stub.c',
+    'runtime.c')
 deps += ['pipeline', 'pci']
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 7e9c7bdd6..3adadbd98 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -5,57 +5,57 @@
 name = 'testpmd'
 cflags += '-Wno-deprecated-declarations'
 sources = files('5tswap.c',
-	'cmdline.c',
-	'cmdline_flow.c',
-	'cmdline_mtr.c',
-	'cmdline_tm.c',
-	'config.c',
-	'csumonly.c',
-	'flowgen.c',
-	'icmpecho.c',
-	'ieee1588fwd.c',
-	'iofwd.c',
-	'macfwd.c',
-	'macswap.c',
-	'noisy_vnf.c',
-	'parameters.c',
-	'rxonly.c',
-	'testpmd.c',
-	'txonly.c',
-	'util.c')
+    'cmdline.c',
+    'cmdline_flow.c',
+    'cmdline_mtr.c',
+    'cmdline_tm.c',
+    'config.c',
+    'csumonly.c',
+    'flowgen.c',
+    'icmpecho.c',
+    'ieee1588fwd.c',
+    'iofwd.c',
+    'macfwd.c',
+    'macswap.c',
+    'noisy_vnf.c',
+    'parameters.c',
+    'rxonly.c',
+    'testpmd.c',
+    'txonly.c',
+    'util.c')
 
 deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-	deps += 'bitratestats'
+    deps += 'bitratestats'
 endif
 if dpdk_conf.has('RTE_LIB_PDUMP')
-	deps += 'pdump'
+    deps += 'pdump'
 endif
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-	deps += 'bitratestats'
+    deps += 'bitratestats'
 endif
 if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
-	deps += 'latencystats'
+    deps += 'latencystats'
 endif
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
 if dpdk_conf.has('RTE_NET_BOND')
-	deps += 'net_bond'
+    deps += 'net_bond'
 endif
 if dpdk_conf.has('RTE_NET_BNXT')
-	deps += 'net_bnxt'
+    deps += 'net_bnxt'
 endif
 if dpdk_conf.has('RTE_NET_I40E')
-	deps += 'net_i40e'
+    deps += 'net_i40e'
 endif
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += 'net_ixgbe'
+    deps += 'net_ixgbe'
 endif
 if dpdk_conf.has('RTE_NET_DPAA')
-	deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
+    deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
 endif
 if dpdk_conf.has('RTE_LIB_BPF')
-	sources += files('bpf_cmd.c')
-	deps += 'bpf'
+    sources += files('bpf_cmd.c')
+    deps += 'bpf'
 endif
diff --git a/app/test/meson.build b/app/test/meson.build
index bd50818f8..cef9554ba 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -2,181 +2,183 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not get_option('tests')
-	subdir_done()
+    subdir_done()
 endif
 
-test_sources = files('commands.c',
-	'packet_burst_generator.c',
-	'test.c',
-	'test_acl.c',
-	'test_alarm.c',
-	'test_atomic.c',
-	'test_barrier.c',
-	'test_bitops.c',
-	'test_bitmap.c',
-	'test_bpf.c',
-	'test_byteorder.c',
-	'test_cmdline.c',
-	'test_cmdline_cirbuf.c',
-	'test_cmdline_etheraddr.c',
-	'test_cmdline_ipaddr.c',
-	'test_cmdline_lib.c',
-	'test_cmdline_num.c',
-	'test_cmdline_portlist.c',
-	'test_cmdline_string.c',
-	'test_common.c',
-	'test_cpuflags.c',
-	'test_crc.c',
-	'test_cryptodev.c',
-	'test_cryptodev_asym.c',
-	'test_cryptodev_blockcipher.c',
-	'test_cryptodev_security_pdcp.c',
-	'test_cycles.c',
-	'test_debug.c',
-	'test_distributor.c',
-	'test_distributor_perf.c',
-	'test_eal_flags.c',
-	'test_eal_fs.c',
-	'test_efd.c',
-	'test_efd_perf.c',
-	'test_errno.c',
-	'test_ethdev_link.c',
-	'test_event_crypto_adapter.c',
-	'test_event_eth_rx_adapter.c',
-	'test_event_ring.c',
-	'test_event_timer_adapter.c',
-	'test_eventdev.c',
-	'test_external_mem.c',
-	'test_fbarray.c',
-	'test_fib.c',
-	'test_fib_perf.c',
-	'test_fib6.c',
-	'test_fib6_perf.c',
-	'test_func_reentrancy.c',
-	'test_flow_classify.c',
-	'test_graph.c',
-	'test_graph_perf.c',
-	'test_hash.c',
-	'test_hash_functions.c',
-	'test_hash_multiwriter.c',
-	'test_hash_readwrite.c',
-	'test_hash_perf.c',
-	'test_hash_readwrite_lf_perf.c',
-	'test_interrupts.c',
+test_sources = files(
+        'commands.c',
+        'packet_burst_generator.c',
+        'test.c',
+        'test_acl.c',
+        'test_alarm.c',
+        'test_atomic.c',
+        'test_barrier.c',
+        'test_bitops.c',
+        'test_bitmap.c',
+        'test_bpf.c',
+        'test_byteorder.c',
+        'test_cmdline.c',
+        'test_cmdline_cirbuf.c',
+        'test_cmdline_etheraddr.c',
+        'test_cmdline_ipaddr.c',
+        'test_cmdline_lib.c',
+        'test_cmdline_num.c',
+        'test_cmdline_portlist.c',
+        'test_cmdline_string.c',
+        'test_common.c',
+        'test_cpuflags.c',
+        'test_crc.c',
+        'test_cryptodev.c',
+        'test_cryptodev_asym.c',
+        'test_cryptodev_blockcipher.c',
+        'test_cryptodev_security_pdcp.c',
+        'test_cycles.c',
+        'test_debug.c',
+        'test_distributor.c',
+        'test_distributor_perf.c',
+        'test_eal_flags.c',
+        'test_eal_fs.c',
+        'test_efd.c',
+        'test_efd_perf.c',
+        'test_errno.c',
+        'test_ethdev_link.c',
+        'test_event_crypto_adapter.c',
+        'test_event_eth_rx_adapter.c',
+        'test_event_ring.c',
+        'test_event_timer_adapter.c',
+        'test_eventdev.c',
+        'test_external_mem.c',
+        'test_fbarray.c',
+        'test_fib.c',
+        'test_fib_perf.c',
+        'test_fib6.c',
+        'test_fib6_perf.c',
+        'test_func_reentrancy.c',
+        'test_flow_classify.c',
+        'test_graph.c',
+        'test_graph_perf.c',
+        'test_hash.c',
+        'test_hash_functions.c',
+        'test_hash_multiwriter.c',
+        'test_hash_readwrite.c',
+        'test_hash_perf.c',
+        'test_hash_readwrite_lf_perf.c',
+        'test_interrupts.c',
         'test_ipfrag.c',
-	'test_ipsec.c',
-	'test_ipsec_sad.c',
-	'test_ipsec_perf.c',
-	'test_kni.c',
-	'test_kvargs.c',
-	'test_lcores.c',
-	'test_logs.c',
-	'test_lpm.c',
-	'test_lpm6.c',
-	'test_lpm6_perf.c',
-	'test_lpm_perf.c',
-	'test_malloc.c',
-	'test_mbuf.c',
-	'test_member.c',
-	'test_member_perf.c',
-	'test_memcpy.c',
-	'test_memcpy_perf.c',
-	'test_memory.c',
-	'test_mempool.c',
-	'test_mempool_perf.c',
-	'test_memzone.c',
-	'test_meter.c',
-	'test_metrics.c',
-	'test_mcslock.c',
-	'test_mp_secondary.c',
-	'test_per_lcore.c',
-	'test_pflock.c',
-	'test_pmd_perf.c',
-	'test_power.c',
-	'test_power_cpufreq.c',
-	'test_power_kvm_vm.c',
-	'test_prefetch.c',
-	'test_rand_perf.c',
-	'test_rawdev.c',
-	'test_rcu_qsbr.c',
-	'test_rcu_qsbr_perf.c',
-	'test_reciprocal_division.c',
-	'test_reciprocal_division_perf.c',
-	'test_red.c',
-	'test_reorder.c',
-	'test_rib.c',
-	'test_rib6.c',
-	'test_ring.c',
-	'test_ring_mpmc_stress.c',
-	'test_ring_hts_stress.c',
-	'test_ring_mt_peek_stress.c',
-	'test_ring_mt_peek_stress_zc.c',
-	'test_ring_perf.c',
-	'test_ring_rts_stress.c',
-	'test_ring_st_peek_stress.c',
-	'test_ring_st_peek_stress_zc.c',
-	'test_ring_stress.c',
-	'test_rwlock.c',
-	'test_sched.c',
-	'test_security.c',
-	'test_service_cores.c',
-	'test_spinlock.c',
-	'test_stack.c',
-	'test_stack_perf.c',
-	'test_string_fns.c',
-	'test_table.c',
-	'test_table_acl.c',
-	'test_table_combined.c',
-	'test_table_pipeline.c',
-	'test_table_ports.c',
-	'test_table_tables.c',
-	'test_tailq.c',
-	'test_thash.c',
-	'test_timer.c',
-	'test_timer_perf.c',
-	'test_timer_racecond.c',
-	'test_timer_secondary.c',
-	'test_ticketlock.c',
-	'test_trace.c',
-	'test_trace_register.c',
-	'test_trace_perf.c',
-	'test_version.c',
-	'virtual_pmd.c'
+        'test_ipsec.c',
+        'test_ipsec_sad.c',
+        'test_ipsec_perf.c',
+        'test_kni.c',
+        'test_kvargs.c',
+        'test_lcores.c',
+        'test_logs.c',
+        'test_lpm.c',
+        'test_lpm6.c',
+        'test_lpm6_perf.c',
+        'test_lpm_perf.c',
+        'test_malloc.c',
+        'test_mbuf.c',
+        'test_member.c',
+        'test_member_perf.c',
+        'test_memcpy.c',
+        'test_memcpy_perf.c',
+        'test_memory.c',
+        'test_mempool.c',
+        'test_mempool_perf.c',
+        'test_memzone.c',
+        'test_meter.c',
+        'test_metrics.c',
+        'test_mcslock.c',
+        'test_mp_secondary.c',
+        'test_per_lcore.c',
+        'test_pflock.c',
+        'test_pmd_perf.c',
+        'test_power.c',
+        'test_power_cpufreq.c',
+        'test_power_kvm_vm.c',
+        'test_prefetch.c',
+        'test_rand_perf.c',
+        'test_rawdev.c',
+        'test_rcu_qsbr.c',
+        'test_rcu_qsbr_perf.c',
+        'test_reciprocal_division.c',
+        'test_reciprocal_division_perf.c',
+        'test_red.c',
+        'test_reorder.c',
+        'test_rib.c',
+        'test_rib6.c',
+        'test_ring.c',
+        'test_ring_mpmc_stress.c',
+        'test_ring_hts_stress.c',
+        'test_ring_mt_peek_stress.c',
+        'test_ring_mt_peek_stress_zc.c',
+        'test_ring_perf.c',
+        'test_ring_rts_stress.c',
+        'test_ring_st_peek_stress.c',
+        'test_ring_st_peek_stress_zc.c',
+        'test_ring_stress.c',
+        'test_rwlock.c',
+        'test_sched.c',
+        'test_security.c',
+        'test_service_cores.c',
+        'test_spinlock.c',
+        'test_stack.c',
+        'test_stack_perf.c',
+        'test_string_fns.c',
+        'test_table.c',
+        'test_table_acl.c',
+        'test_table_combined.c',
+        'test_table_pipeline.c',
+        'test_table_ports.c',
+        'test_table_tables.c',
+        'test_tailq.c',
+        'test_thash.c',
+        'test_timer.c',
+        'test_timer_perf.c',
+        'test_timer_racecond.c',
+        'test_timer_secondary.c',
+        'test_ticketlock.c',
+        'test_trace.c',
+        'test_trace_register.c',
+        'test_trace_perf.c',
+        'test_version.c',
+        'virtual_pmd.c'
 )
 
-test_deps = ['acl',
-	'bus_pci',
-	'bus_vdev',
-	'bitratestats',
-	'bpf',
-	'cfgfile',
-	'cmdline',
-	'cryptodev',
-	'distributor',
-	'efd',
-	'ethdev',
-	'eventdev',
-	'fib',
-	'flow_classify',
-	'graph',
-	'hash',
-	'ipsec',
-	'latencystats',
-	'lpm',
-	'member',
-	'metrics',
-	'node',
-	'pipeline',
-	'port',
-	'rawdev',
-	'rcu',
-	'reorder',
-	'rib',
-	'ring',
-	'security',
-	'stack',
-	'telemetry',
-	'timer'
+test_deps = [
+        'acl',
+        'bus_pci',
+        'bus_vdev',
+        'bitratestats',
+        'bpf',
+        'cfgfile',
+        'cmdline',
+        'cryptodev',
+        'distributor',
+        'efd',
+        'ethdev',
+        'eventdev',
+        'fib',
+        'flow_classify',
+        'graph',
+        'hash',
+        'ipsec',
+        'latencystats',
+        'lpm',
+        'member',
+        'metrics',
+        'node',
+        'pipeline',
+        'port',
+        'rawdev',
+        'rcu',
+        'reorder',
+        'rib',
+        'ring',
+        'security',
+        'stack',
+        'telemetry',
+        'timer'
 ]
 
 # Each test is marked with flag true/false
@@ -241,7 +243,7 @@ fast_tests = [
         ['rwlock_rds_wrm_autotest', true],
         ['rwlock_rde_wro_autotest', true],
         ['sched_autotest', true],
-		['security_autotest', false],
+        ['security_autotest', false],
         ['spinlock_autotest', true],
         ['stack_autotest', false],
         ['stack_lf_autotest', false],
@@ -306,7 +308,7 @@ perf_test_names = [
         'hash_readwrite_perf_autotest',
         'hash_readwrite_lf_perf_autotest',
         'trace_perf_autotest',
-	'ipsec_perf_autotest',
+        'ipsec_perf_autotest',
 ]
 
 driver_test_names = [
@@ -345,55 +347,55 @@ dump_test_names = [
 # DPDK libraries.  Explicit linkage of drivers (plugin libraries)
 # in applications should not be used.
 if dpdk_conf.has('RTE_MEMPOOL_RING')
-	test_deps += 'mempool_ring'
+    test_deps += 'mempool_ring'
 endif
 if dpdk_conf.has('RTE_MEMPOOL_STACK')
-	test_deps += 'mempool_stack'
+    test_deps += 'mempool_stack'
 endif
 if dpdk_conf.has('RTE_EVENT_SKELETON')
-	test_deps += 'event_skeleton'
+    test_deps += 'event_skeleton'
 endif
 if dpdk_conf.has('RTE_LIB_TELEMETRY')
-	test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
-	fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]]
+    test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
+    fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]]
 endif
 
 # The following linkages of drivers are required because
 # they are used via a driver-specific API.
 if dpdk_conf.has('RTE_NET_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_NET_RING')
-		test_sources += 'test_link_bonding_mode4.c'
-		driver_test_names += 'link_bonding_mode4_autotest'
-	endif
+    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_NET_RING')
+        test_sources += 'test_link_bonding_mode4.c'
+        driver_test_names += 'link_bonding_mode4_autotest'
+    endif
 endif
 if dpdk_conf.has('RTE_NET_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'
-	test_sources += 'test_bitratestats.c'
-	test_sources += 'test_latencystats.c'
-	test_sources += 'sample_packet_forward.c'
-	test_sources += 'test_pdump.c'
-	fast_tests += [['ring_pmd_autotest', true]]
-	perf_test_names += 'ring_pmd_perf_autotest'
-	fast_tests += [['event_eth_tx_adapter_autotest', false]]
-	fast_tests += [['bitratestats_autotest', true]]
-	fast_tests += [['latencystats_autotest', true]]
-	fast_tests += [['pdump_autotest', true]]
+    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'
+    test_sources += 'test_bitratestats.c'
+    test_sources += 'test_latencystats.c'
+    test_sources += 'sample_packet_forward.c'
+    test_sources += 'test_pdump.c'
+    fast_tests += [['ring_pmd_autotest', true]]
+    perf_test_names += 'ring_pmd_perf_autotest'
+    fast_tests += [['event_eth_tx_adapter_autotest', false]]
+    fast_tests += [['bitratestats_autotest', true]]
+    fast_tests += [['latencystats_autotest', true]]
+    fast_tests += [['pdump_autotest', true]]
 endif
 
 if dpdk_conf.has('RTE_LIB_POWER')
-	test_deps += 'power'
+    test_deps += 'power'
 endif
 if dpdk_conf.has('RTE_LIB_KNI')
-	test_deps += 'kni'
+    test_deps += 'kni'
 endif
 if dpdk_conf.has('RTE_LIB_PDUMP')
-	test_deps += 'pdump'
+    test_deps += 'pdump'
 endif
 
 if cc.has_argument('-Wno-format-truncation')
@@ -408,38 +410,38 @@ cflags += ['-DALLOW_INTERNAL_API']
 
 test_dep_objs = []
 if dpdk_conf.has('RTE_LIB_COMPRESSDEV')
-	compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
-	if compress_test_dep.found()
-		test_dep_objs += compress_test_dep
-		test_sources += 'test_compressdev.c'
-		test_deps += 'compressdev'
-		fast_tests += [['compressdev_autotest', false]]
-	endif
+    compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
+    if compress_test_dep.found()
+        test_dep_objs += compress_test_dep
+        test_sources += 'test_compressdev.c'
+        test_deps += 'compressdev'
+        fast_tests += [['compressdev_autotest', false]]
+    endif
 endif
 
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	driver_test_names += 'cryptodev_scheduler_autotest'
-	test_deps += 'crypto_scheduler'
+    driver_test_names += 'cryptodev_scheduler_autotest'
+    test_deps += 'crypto_scheduler'
 endif
 
 foreach d:test_deps
-	def_lib = get_option('default_library')
-	test_dep_objs += get_variable(def_lib + '_rte_' + d)
+    def_lib = get_option('default_library')
+    test_dep_objs += get_variable(def_lib + '_rte_' + d)
 endforeach
 
 link_libs = []
 if get_option('default_library') == 'static'
-	link_libs = dpdk_static_libraries + dpdk_drivers
+    link_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 dpdk_test = executable('dpdk-test',
-	test_sources,
-	link_whole: link_libs,
-	dependencies: test_dep_objs,
-	c_args: cflags,
-	install_rpath: join_paths(get_option('prefix'),
-			 driver_install_path),
-	install: true)
+        test_sources,
+        link_whole: link_libs,
+        dependencies: test_dep_objs,
+        c_args: cflags,
+        install_rpath: join_paths(get_option('prefix'),
+             driver_install_path),
+        install: true)
 
 has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
 message('hugepage availability: @0@'.format(has_hugepage))
@@ -455,59 +457,59 @@ num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip()
 default_test_args = [num_cores_arg]
 
 foreach arg : fast_tests
-	test_args = default_test_args
-	run_test = true
-	if not has_hugepage
-		if arg[1]
-			test_args += ['--no-huge', '-m', '2048']
-		else
-			run_test = false
-		endif
-	endif
+    test_args = default_test_args
+    run_test = true
+    if not has_hugepage
+        if arg[1]
+            test_args += ['--no-huge', '-m', '2048']
+        else
+            run_test = false
+        endif
+    endif
 
-	if (get_option('default_library') == 'shared' and
-		arg[0] == 'event_eth_tx_adapter_autotest')
-		foreach drv:dpdk_drivers
-			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
-		endforeach
-	endif
-	if is_linux
-		test_args += ['--file-prefix=@0@'.format(arg[0])]
-	endif
+    if (get_option('default_library') == 'shared' and
+        arg[0] == 'event_eth_tx_adapter_autotest')
+        foreach drv:dpdk_drivers
+            test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
+        endforeach
+    endif
+    if is_linux
+        test_args += ['--file-prefix=@0@'.format(arg[0])]
+    endif
 
-	if run_test
-		test(arg[0], dpdk_test,
-			env : ['DPDK_TEST=' + arg[0]],
-			args : test_args,
-			timeout : timeout_seconds_fast,
-			is_parallel : false,
-			suite : 'fast-tests')
-	endif
+    if run_test
+        test(arg[0], dpdk_test,
+                env : ['DPDK_TEST=' + arg[0]],
+                args : test_args,
+                timeout : timeout_seconds_fast,
+                is_parallel : false,
+                suite : 'fast-tests')
+    endif
 endforeach
 
 foreach arg : perf_test_names
-	test(arg, dpdk_test,
-	env : ['DPDK_TEST=' + arg],
-	args : default_test_args,
-	timeout : timeout_seconds,
-	is_parallel : false,
-	suite : 'perf-tests')
+    test(arg, dpdk_test,
+            env : ['DPDK_TEST=' + arg],
+            args : default_test_args,
+            timeout : timeout_seconds,
+            is_parallel : false,
+            suite : 'perf-tests')
 endforeach
 
 foreach arg : driver_test_names
-	test(arg, dpdk_test,
-		env : ['DPDK_TEST=' + arg],
-		args : default_test_args,
-		timeout : timeout_seconds,
-		is_parallel : false,
-		suite : 'driver-tests')
+    test(arg, dpdk_test,
+            env : ['DPDK_TEST=' + arg],
+            args : default_test_args,
+            timeout : timeout_seconds,
+            is_parallel : false,
+            suite : 'driver-tests')
 endforeach
 
 foreach arg : dump_test_names
-	test(arg, dpdk_test,
-		env : ['DPDK_TEST=' + arg],
-		args : default_test_args,
-		timeout : timeout_seconds,
-		is_parallel : false,
-		suite : 'debug-tests')
+    test(arg, dpdk_test,
+            env : ['DPDK_TEST=' + arg],
+            args : default_test_args,
+            timeout : timeout_seconds,
+            is_parallel : false,
+            suite : 'debug-tests')
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH 12/14] editorconfig: add entry for meson files

[Bruce Richardson]

Meson style guide recommends four-space indents, like for python, so add
to editorconfig file.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 .editorconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index d70582557..5101630c8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,11 @@ max_line_length = 80
 indent_style = space
 indent_size = 4
 
+[meson.build]
+indent_style = space
+indent_size = 4
+tab_width = 4
+
 [*.rst]
 indent_style = space
 indent_size = 3
-- 
2.27.0

[dpdk-dev] [PATCH 13/14] lib: remove librte_ prefix from directory names

[Bruce Richardson]

There is no reason for the DPDK libraries to all have 'librte_' prefix on
the directory names. This prefix makes the directory names longer and also
makes it awkward to add features referring to individual libraries in the
build - should the lib names be specified with or without the prefix.
Therefore, we can just remove the library prefix and use the library's
unique name as the directory name, i.e. 'eal' rather than 'librte_eal'

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 MAINTAINERS                                   | 210 +++++++++---------
 app/test/test_eal_fs.c                        |   2 +-
 app/test/test_memzone.c                       |   2 +-
 app/test/test_telemetry_json.c                |   2 +-
 config/arm/meson.build                        |   2 +-
 devtools/build-tags.sh                        |  14 +-
 doc/api/doxy-api.conf.in                      | 104 ++++-----
 doc/guides/contributing/abi_versioning.rst    |  12 +-
 doc/guides/contributing/coding_style.rst      |   4 +-
 doc/guides/contributing/documentation.rst     |  10 +-
 doc/guides/prog_guide/event_timer_adapter.rst |   2 +-
 doc/guides/prog_guide/qos_framework.rst       |   4 +-
 doc/guides/prog_guide/rawdev.rst              |   2 +-
 doc/guides/rel_notes/known_issues.rst         |   2 +-
 drivers/common/mlx5/linux/meson.build         |   2 +-
 drivers/crypto/virtio/meson.build             |   2 +-
 kernel/linux/kni/meson.build                  |   4 +-
 lib/{librte_acl => acl}/acl.h                 |   0
 lib/{librte_acl => acl}/acl_bld.c             |   0
 lib/{librte_acl => acl}/acl_gen.c             |   0
 lib/{librte_acl => acl}/acl_run.h             |   0
 lib/{librte_acl => acl}/acl_run_altivec.c     |   0
 lib/{librte_acl => acl}/acl_run_altivec.h     |   0
 lib/{librte_acl => acl}/acl_run_avx2.c        |   0
 lib/{librte_acl => acl}/acl_run_avx2.h        |   0
 lib/{librte_acl => acl}/acl_run_avx512.c      |   0
 .../acl_run_avx512_common.h                   |   0
 lib/{librte_acl => acl}/acl_run_avx512x16.h   |   0
 lib/{librte_acl => acl}/acl_run_avx512x8.h    |   0
 lib/{librte_acl => acl}/acl_run_neon.c        |   0
 lib/{librte_acl => acl}/acl_run_neon.h        |   0
 lib/{librte_acl => acl}/acl_run_scalar.c      |   0
 lib/{librte_acl => acl}/acl_run_sse.c         |   0
 lib/{librte_acl => acl}/acl_run_sse.h         |   0
 lib/{librte_acl => acl}/acl_vect.h            |   0
 lib/{librte_acl => acl}/meson.build           |   0
 lib/{librte_acl => acl}/rte_acl.c             |   0
 lib/{librte_acl => acl}/rte_acl.h             |   0
 lib/{librte_acl => acl}/rte_acl_osdep.h       |   0
 lib/{librte_acl => acl}/tb_mem.c              |   0
 lib/{librte_acl => acl}/tb_mem.h              |   0
 lib/{librte_acl => acl}/version.map           |   0
 lib/{librte_bbdev => bbdev}/meson.build       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.c       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.h       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_op.h    |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h   |   0
 lib/{librte_bbdev => bbdev}/version.map       |   0
 .../meson.build                               |   0
 .../rte_bitrate.c                             |   0
 .../rte_bitrate.h                             |   0
 .../version.map                               |   0
 lib/{librte_bpf => bpf}/bpf.c                 |   0
 lib/{librte_bpf => bpf}/bpf_def.h             |   0
 lib/{librte_bpf => bpf}/bpf_exec.c            |   0
 lib/{librte_bpf => bpf}/bpf_impl.h            |   0
 lib/{librte_bpf => bpf}/bpf_jit_arm64.c       |   0
 lib/{librte_bpf => bpf}/bpf_jit_x86.c         |   0
 lib/{librte_bpf => bpf}/bpf_load.c            |   0
 lib/{librte_bpf => bpf}/bpf_load_elf.c        |   0
 lib/{librte_bpf => bpf}/bpf_pkt.c             |   0
 lib/{librte_bpf => bpf}/bpf_validate.c        |   0
 lib/{librte_bpf => bpf}/meson.build           |   0
 lib/{librte_bpf => bpf}/rte_bpf.h             |   0
 lib/{librte_bpf => bpf}/rte_bpf_ethdev.h      |   0
 lib/{librte_bpf => bpf}/version.map           |   0
 lib/{librte_cfgfile => cfgfile}/meson.build   |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h |   0
 lib/{librte_cfgfile => cfgfile}/version.map   |   0
 lib/{librte_cmdline => cmdline}/cmdline.c     |   0
 lib/{librte_cmdline => cmdline}/cmdline.h     |   0
 .../cmdline_cirbuf.c                          |   0
 .../cmdline_cirbuf.h                          |   0
 .../cmdline_os_unix.c                         |   0
 .../cmdline_os_windows.c                      |   0
 .../cmdline_parse.c                           |   0
 .../cmdline_parse.h                           |   0
 .../cmdline_parse_etheraddr.c                 |   0
 .../cmdline_parse_etheraddr.h                 |   0
 .../cmdline_parse_ipaddr.c                    |   0
 .../cmdline_parse_ipaddr.h                    |   0
 .../cmdline_parse_num.c                       |   0
 .../cmdline_parse_num.h                       |   0
 .../cmdline_parse_portlist.c                  |   0
 .../cmdline_parse_portlist.h                  |   0
 .../cmdline_parse_string.c                    |   0
 .../cmdline_parse_string.h                    |   0
 .../cmdline_private.h                         |   0
 .../cmdline_rdline.c                          |   0
 .../cmdline_rdline.h                          |   0
 .../cmdline_socket.c                          |   0
 .../cmdline_socket.h                          |   0
 .../cmdline_vt100.c                           |   0
 .../cmdline_vt100.h                           |   0
 lib/{librte_cmdline => cmdline}/meson.build   |   0
 lib/{librte_cmdline => cmdline}/version.map   |   0
 .../meson.build                               |   0
 .../rte_comp.c                                |   0
 .../rte_comp.h                                |   0
 .../rte_compressdev.c                         |   0
 .../rte_compressdev.h                         |   0
 .../rte_compressdev_internal.h                |   0
 .../rte_compressdev_pmd.c                     |   0
 .../rte_compressdev_pmd.h                     |   0
 .../version.map                               |   0
 .../cryptodev_trace_points.c                  |   0
 .../meson.build                               |   0
 .../rte_crypto.h                              |   0
 .../rte_crypto_asym.h                         |   0
 .../rte_crypto_sym.h                          |   0
 .../rte_cryptodev.c                           |   0
 .../rte_cryptodev.h                           |   0
 .../rte_cryptodev_pmd.c                       |   0
 .../rte_cryptodev_pmd.h                       |   0
 .../rte_cryptodev_trace.h                     |   0
 .../rte_cryptodev_trace_fp.h                  |   0
 .../version.map                               |   0
 .../distributor_private.h                     |   0
 .../meson.build                               |   0
 .../rte_distributor.c                         |   0
 .../rte_distributor.h                         |   0
 .../rte_distributor_match_generic.c           |   0
 .../rte_distributor_match_sse.c               |   0
 .../rte_distributor_single.c                  |   0
 .../rte_distributor_single.h                  |   0
 .../version.map                               |   0
 .../arm/include/meson.build                   |   0
 .../arm/include/rte_atomic.h                  |   0
 .../arm/include/rte_atomic_32.h               |   0
 .../arm/include/rte_atomic_64.h               |   0
 .../arm/include/rte_byteorder.h               |   0
 .../arm/include/rte_cpuflags.h                |   0
 .../arm/include/rte_cpuflags_32.h             |   0
 .../arm/include/rte_cpuflags_64.h             |   0
 .../arm/include/rte_cycles.h                  |   0
 .../arm/include/rte_cycles_32.h               |   0
 .../arm/include/rte_cycles_64.h               |   0
 lib/{librte_eal => eal}/arm/include/rte_io.h  |   0
 .../arm/include/rte_io_64.h                   |   0
 .../arm/include/rte_mcslock.h                 |   0
 .../arm/include/rte_memcpy.h                  |   0
 .../arm/include/rte_memcpy_32.h               |   0
 .../arm/include/rte_memcpy_64.h               |   0
 .../arm/include/rte_pause.h                   |   0
 .../arm/include/rte_pause_32.h                |   0
 .../arm/include/rte_pause_64.h                |   0
 .../arm/include/rte_pflock.h                  |   0
 .../arm/include/rte_power_intrinsics.h        |   0
 .../arm/include/rte_prefetch.h                |   0
 .../arm/include/rte_prefetch_32.h             |   0
 .../arm/include/rte_prefetch_64.h             |   0
 .../arm/include/rte_rwlock.h                  |   0
 .../arm/include/rte_spinlock.h                |   0
 .../arm/include/rte_ticketlock.h              |   0
 .../arm/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/arm/meson.build       |   0
 lib/{librte_eal => eal}/arm/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/arm/rte_cycles.c      |   0
 lib/{librte_eal => eal}/arm/rte_hypervisor.c  |   0
 .../arm/rte_power_intrinsics.c                |   0
 .../common/eal_common_bus.c                   |   0
 .../common/eal_common_class.c                 |   0
 .../common/eal_common_config.c                |   0
 .../common/eal_common_cpuflags.c              |   0
 .../common/eal_common_debug.c                 |   0
 .../common/eal_common_dev.c                   |   0
 .../common/eal_common_devargs.c               |   0
 .../common/eal_common_dynmem.c                |   0
 .../common/eal_common_errno.c                 |   0
 .../common/eal_common_fbarray.c               |   0
 .../common/eal_common_hexdump.c               |   0
 .../common/eal_common_hypervisor.c            |   0
 .../common/eal_common_launch.c                |   0
 .../common/eal_common_lcore.c                 |   0
 .../common/eal_common_log.c                   |   0
 .../common/eal_common_mcfg.c                  |   0
 .../common/eal_common_memalloc.c              |   0
 .../common/eal_common_memory.c                |   0
 .../common/eal_common_memzone.c               |   0
 .../common/eal_common_options.c               |   0
 .../common/eal_common_proc.c                  |   0
 .../common/eal_common_string_fns.c            |   0
 .../common/eal_common_tailqs.c                |   0
 .../common/eal_common_thread.c                |   0
 .../common/eal_common_timer.c                 |   0
 .../common/eal_common_trace.c                 |   0
 .../common/eal_common_trace_ctf.c             |   0
 .../common/eal_common_trace_points.c          |   0
 .../common/eal_common_trace_utils.c           |   0
 .../common/eal_common_uuid.c                  |   0
 .../common/eal_filesystem.h                   |   0
 .../common/eal_hugepages.h                    |   0
 .../common/eal_internal_cfg.h                 |   0
 lib/{librte_eal => eal}/common/eal_log.h      |   0
 lib/{librte_eal => eal}/common/eal_memalloc.h |   0
 lib/{librte_eal => eal}/common/eal_memcfg.h   |   0
 lib/{librte_eal => eal}/common/eal_options.h  |   0
 lib/{librte_eal => eal}/common/eal_private.h  |   0
 lib/{librte_eal => eal}/common/eal_thread.h   |   0
 lib/{librte_eal => eal}/common/eal_trace.h    |   0
 lib/{librte_eal => eal}/common/hotplug_mp.c   |   0
 lib/{librte_eal => eal}/common/hotplug_mp.h   |   0
 lib/{librte_eal => eal}/common/malloc_elem.c  |   0
 lib/{librte_eal => eal}/common/malloc_elem.h  |   0
 lib/{librte_eal => eal}/common/malloc_heap.c  |   0
 lib/{librte_eal => eal}/common/malloc_heap.h  |   0
 lib/{librte_eal => eal}/common/malloc_mp.c    |   0
 lib/{librte_eal => eal}/common/malloc_mp.h    |   0
 lib/{librte_eal => eal}/common/meson.build    |   0
 .../common/rte_keepalive.c                    |   0
 lib/{librte_eal => eal}/common/rte_malloc.c   |   0
 lib/{librte_eal => eal}/common/rte_random.c   |   0
 .../common/rte_reciprocal.c                   |   0
 lib/{librte_eal => eal}/common/rte_service.c  |   0
 lib/{librte_eal => eal}/common/rte_version.c  |   0
 lib/{librte_eal => eal}/freebsd/eal.c         |   0
 lib/{librte_eal => eal}/freebsd/eal_alarm.c   |   0
 .../freebsd/eal_alarm_private.h               |   0
 .../freebsd/eal_cpuflags.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_debug.c   |   0
 lib/{librte_eal => eal}/freebsd/eal_dev.c     |   0
 .../freebsd/eal_hugepage_info.c               |   0
 .../freebsd/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/freebsd/eal_lcore.c   |   0
 .../freebsd/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_memory.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_thread.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_timer.c   |   0
 .../freebsd/include/meson.build               |   0
 .../freebsd/include/rte_os.h                  |   0
 .../freebsd/include/rte_os_shim.h             |   0
 lib/{librte_eal => eal}/freebsd/meson.build   |   0
 .../include/generic/rte_atomic.h              |   0
 .../include/generic/rte_byteorder.h           |   0
 .../include/generic/rte_cpuflags.h            |   0
 .../include/generic/rte_cycles.h              |   0
 .../include/generic/rte_io.h                  |   0
 .../include/generic/rte_mcslock.h             |   0
 .../include/generic/rte_memcpy.h              |   0
 .../include/generic/rte_pause.h               |   0
 .../include/generic/rte_pflock.h              |   0
 .../include/generic/rte_power_intrinsics.h    |   0
 .../include/generic/rte_prefetch.h            |   0
 .../include/generic/rte_rwlock.h              |   0
 .../include/generic/rte_spinlock.h            |   0
 .../include/generic/rte_ticketlock.h          |   0
 .../include/generic/rte_vect.h                |   0
 lib/{librte_eal => eal}/include/meson.build   |   0
 lib/{librte_eal => eal}/include/rte_alarm.h   |   0
 lib/{librte_eal => eal}/include/rte_bitmap.h  |   0
 lib/{librte_eal => eal}/include/rte_bitops.h  |   0
 .../include/rte_branch_prediction.h           |   0
 lib/{librte_eal => eal}/include/rte_bus.h     |   0
 lib/{librte_eal => eal}/include/rte_class.h   |   0
 lib/{librte_eal => eal}/include/rte_common.h  |   0
 lib/{librte_eal => eal}/include/rte_compat.h  |   0
 lib/{librte_eal => eal}/include/rte_debug.h   |   0
 lib/{librte_eal => eal}/include/rte_dev.h     |   0
 lib/{librte_eal => eal}/include/rte_devargs.h |   0
 lib/{librte_eal => eal}/include/rte_eal.h     |   0
 .../include/rte_eal_interrupts.h              |   0
 .../include/rte_eal_memconfig.h               |   0
 .../include/rte_eal_paging.h                  |   0
 .../include/rte_eal_trace.h                   |   0
 lib/{librte_eal => eal}/include/rte_errno.h   |   0
 lib/{librte_eal => eal}/include/rte_fbarray.h |   0
 .../include/rte_function_versioning.h         |   0
 lib/{librte_eal => eal}/include/rte_hexdump.h |   0
 .../include/rte_hypervisor.h                  |   0
 .../include/rte_interrupts.h                  |   0
 .../include/rte_keepalive.h                   |   0
 lib/{librte_eal => eal}/include/rte_launch.h  |   0
 lib/{librte_eal => eal}/include/rte_lcore.h   |   0
 lib/{librte_eal => eal}/include/rte_log.h     |   0
 lib/{librte_eal => eal}/include/rte_malloc.h  |   0
 lib/{librte_eal => eal}/include/rte_memory.h  |   0
 lib/{librte_eal => eal}/include/rte_memzone.h |   0
 .../include/rte_pci_dev_feature_defs.h        |   0
 .../include/rte_pci_dev_features.h            |   0
 .../include/rte_per_lcore.h                   |   0
 lib/{librte_eal => eal}/include/rte_random.h  |   0
 .../include/rte_reciprocal.h                  |   0
 lib/{librte_eal => eal}/include/rte_service.h |   0
 .../include/rte_service_component.h           |   0
 .../include/rte_string_fns.h                  |   0
 lib/{librte_eal => eal}/include/rte_tailq.h   |   0
 lib/{librte_eal => eal}/include/rte_test.h    |   0
 lib/{librte_eal => eal}/include/rte_thread.h  |   0
 lib/{librte_eal => eal}/include/rte_time.h    |   0
 lib/{librte_eal => eal}/include/rte_trace.h   |   0
 .../include/rte_trace_point.h                 |   0
 .../include/rte_trace_point_register.h        |   0
 lib/{librte_eal => eal}/include/rte_uuid.h    |   0
 lib/{librte_eal => eal}/include/rte_version.h |   0
 lib/{librte_eal => eal}/include/rte_vfio.h    |   0
 lib/{librte_eal => eal}/linux/eal.c           |   0
 lib/{librte_eal => eal}/linux/eal_alarm.c     |   0
 lib/{librte_eal => eal}/linux/eal_cpuflags.c  |   0
 lib/{librte_eal => eal}/linux/eal_debug.c     |   0
 lib/{librte_eal => eal}/linux/eal_dev.c       |   0
 .../linux/eal_hugepage_info.c                 |   0
 .../linux/eal_interrupts.c                    |   0
 lib/{librte_eal => eal}/linux/eal_lcore.c     |   0
 lib/{librte_eal => eal}/linux/eal_log.c       |   0
 lib/{librte_eal => eal}/linux/eal_memalloc.c  |   0
 lib/{librte_eal => eal}/linux/eal_memory.c    |   0
 lib/{librte_eal => eal}/linux/eal_thread.c    |   0
 lib/{librte_eal => eal}/linux/eal_timer.c     |   0
 lib/{librte_eal => eal}/linux/eal_vfio.c      |   0
 lib/{librte_eal => eal}/linux/eal_vfio.h      |   0
 .../linux/eal_vfio_mp_sync.c                  |   0
 .../linux/include/meson.build                 |   0
 .../linux/include/rte_os.h                    |   0
 .../linux/include/rte_os_shim.h               |   0
 lib/{librte_eal => eal}/linux/meson.build     |   0
 lib/{librte_eal => eal}/meson.build           |   0
 .../ppc/include/meson.build                   |   0
 .../ppc/include/rte_altivec.h                 |   0
 .../ppc/include/rte_atomic.h                  |   0
 .../ppc/include/rte_byteorder.h               |   0
 .../ppc/include/rte_cpuflags.h                |   0
 .../ppc/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/ppc/include/rte_io.h  |   0
 .../ppc/include/rte_mcslock.h                 |   0
 .../ppc/include/rte_memcpy.h                  |   0
 .../ppc/include/rte_pause.h                   |   0
 .../ppc/include/rte_pflock.h                  |   0
 .../ppc/include/rte_power_intrinsics.h        |   0
 .../ppc/include/rte_prefetch.h                |   0
 .../ppc/include/rte_rwlock.h                  |   0
 .../ppc/include/rte_spinlock.h                |   0
 .../ppc/include/rte_ticketlock.h              |   0
 .../ppc/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/ppc/meson.build       |   0
 lib/{librte_eal => eal}/ppc/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/ppc/rte_cycles.c      |   0
 lib/{librte_eal => eal}/ppc/rte_hypervisor.c  |   0
 .../ppc/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/unix/eal_file.c       |   0
 .../unix/eal_unix_memory.c                    |   0
 lib/{librte_eal => eal}/unix/eal_unix_timer.c |   0
 lib/{librte_eal => eal}/unix/meson.build      |   0
 lib/{librte_eal => eal}/unix/rte_thread.c     |   0
 lib/{librte_eal => eal}/version.map           |   0
 lib/{librte_eal => eal}/windows/eal.c         |   0
 lib/{librte_eal => eal}/windows/eal_alarm.c   |   0
 lib/{librte_eal => eal}/windows/eal_debug.c   |   0
 lib/{librte_eal => eal}/windows/eal_file.c    |   0
 .../windows/eal_hugepages.c                   |   0
 .../windows/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/windows/eal_lcore.c   |   0
 lib/{librte_eal => eal}/windows/eal_log.c     |   0
 .../windows/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/windows/eal_memory.c  |   0
 lib/{librte_eal => eal}/windows/eal_mp.c      |   0
 lib/{librte_eal => eal}/windows/eal_thread.c  |   0
 lib/{librte_eal => eal}/windows/eal_timer.c   |   0
 lib/{librte_eal => eal}/windows/eal_windows.h |   0
 lib/{librte_eal => eal}/windows/fnmatch.c     |   0
 lib/{librte_eal => eal}/windows/getopt.c      |   0
 .../windows/include/dirent.h                  |   0
 .../windows/include/fnmatch.h                 |   0
 .../windows/include/getopt.h                  |   0
 .../windows/include/meson.build               |   0
 .../windows/include/pthread.h                 |   0
 .../windows/include/regex.h                   |   0
 .../windows/include/rte_os.h                  |   0
 .../windows/include/rte_os_shim.h             |   0
 .../windows/include/rte_virt2phys.h           |   0
 .../windows/include/rte_windows.h             |   0
 .../windows/include/sched.h                   |   0
 .../windows/include/sys/queue.h               |   0
 .../windows/include/unistd.h                  |   0
 lib/{librte_eal => eal}/windows/meson.build   |   0
 lib/{librte_eal => eal}/windows/rte_thread.c  |   0
 .../x86/include/meson.build                   |   0
 .../x86/include/rte_atomic.h                  |   0
 .../x86/include/rte_atomic_32.h               |   0
 .../x86/include/rte_atomic_64.h               |   0
 .../x86/include/rte_byteorder.h               |   0
 .../x86/include/rte_byteorder_32.h            |   0
 .../x86/include/rte_byteorder_64.h            |   0
 .../x86/include/rte_cpuflags.h                |   0
 .../x86/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/x86/include/rte_io.h  |   0
 .../x86/include/rte_mcslock.h                 |   0
 .../x86/include/rte_memcpy.h                  |   0
 .../x86/include/rte_pause.h                   |   0
 .../x86/include/rte_pflock.h                  |   0
 .../x86/include/rte_power_intrinsics.h        |   0
 .../x86/include/rte_prefetch.h                |   0
 lib/{librte_eal => eal}/x86/include/rte_rtm.h |   0
 .../x86/include/rte_rwlock.h                  |   0
 .../x86/include/rte_spinlock.h                |   0
 .../x86/include/rte_ticketlock.h              |   0
 .../x86/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/x86/meson.build       |   0
 lib/{librte_eal => eal}/x86/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/x86/rte_cpuid.h       |   0
 lib/{librte_eal => eal}/x86/rte_cycles.c      |   0
 lib/{librte_eal => eal}/x86/rte_hypervisor.c  |   0
 .../x86/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/x86/rte_spinlock.c    |   0
 lib/{librte_efd => efd}/meson.build           |   0
 lib/{librte_efd => efd}/rte_efd.c             |   0
 lib/{librte_efd => efd}/rte_efd.h             |   0
 lib/{librte_efd => efd}/rte_efd_arm64.h       |   0
 lib/{librte_efd => efd}/rte_efd_x86.h         |   0
 lib/{librte_efd => efd}/version.map           |   0
 lib/{librte_ethdev => ethdev}/ethdev_driver.h |   0
 lib/{librte_ethdev => ethdev}/ethdev_pci.h    |   0
 .../ethdev_private.c                          |   0
 .../ethdev_private.h                          |   0
 .../ethdev_profile.c                          |   0
 .../ethdev_profile.h                          |   0
 .../ethdev_trace_points.c                     |   0
 lib/{librte_ethdev => ethdev}/ethdev_vdev.h   |   0
 lib/{librte_ethdev => ethdev}/meson.build     |   0
 lib/{librte_ethdev => ethdev}/rte_class_eth.c |   0
 lib/{librte_ethdev => ethdev}/rte_dev_info.h  |   0
 lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h  |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.c    |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.h    |   0
 .../rte_ethdev_core.h                         |   0
 .../rte_ethdev_trace.h                        |   0
 .../rte_ethdev_trace_fp.h                     |   0
 lib/{librte_ethdev => ethdev}/rte_flow.c      |   0
 lib/{librte_ethdev => ethdev}/rte_flow.h      |   0
 .../rte_flow_driver.h                         |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.c       |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.h       |   0
 .../rte_mtr_driver.h                          |   0
 lib/{librte_ethdev => ethdev}/rte_tm.c        |   0
 lib/{librte_ethdev => ethdev}/rte_tm.h        |   0
 lib/{librte_ethdev => ethdev}/rte_tm_driver.h |   0
 lib/{librte_ethdev => ethdev}/version.map     |   0
 .../eventdev_pmd.h                            |   0
 .../eventdev_pmd_pci.h                        |   0
 .../eventdev_pmd_vdev.h                       |   0
 .../eventdev_trace_points.c                   |   0
 lib/{librte_eventdev => eventdev}/meson.build |   0
 .../rte_event_crypto_adapter.c                |   0
 .../rte_event_crypto_adapter.h                |   0
 .../rte_event_eth_rx_adapter.c                |   0
 .../rte_event_eth_rx_adapter.h                |   0
 .../rte_event_eth_tx_adapter.c                |   0
 .../rte_event_eth_tx_adapter.h                |   0
 .../rte_event_ring.c                          |   0
 .../rte_event_ring.h                          |   0
 .../rte_event_timer_adapter.c                 |   0
 .../rte_event_timer_adapter.h                 |   0
 .../rte_event_timer_adapter_pmd.h             |   0
 .../rte_eventdev.c                            |   0
 .../rte_eventdev.h                            |   0
 .../rte_eventdev_trace.h                      |   0
 .../rte_eventdev_trace_fp.h                   |   0
 lib/{librte_eventdev => eventdev}/version.map |   0
 lib/{librte_fib => fib}/dir24_8.c             |   0
 lib/{librte_fib => fib}/dir24_8.h             |   0
 lib/{librte_fib => fib}/dir24_8_avx512.c      |   0
 lib/{librte_fib => fib}/dir24_8_avx512.h      |   0
 lib/{librte_fib => fib}/meson.build           |   0
 lib/{librte_fib => fib}/rte_fib.c             |   0
 lib/{librte_fib => fib}/rte_fib.h             |   0
 lib/{librte_fib => fib}/rte_fib6.c            |   0
 lib/{librte_fib => fib}/rte_fib6.h            |   0
 lib/{librte_fib => fib}/trie.c                |   0
 lib/{librte_fib => fib}/trie.h                |   0
 lib/{librte_fib => fib}/trie_avx512.c         |   0
 lib/{librte_fib => fib}/trie_avx512.h         |   0
 lib/{librte_fib => fib}/version.map           |   0
 .../meson.build                               |   0
 .../rte_flow_classify.c                       |   0
 .../rte_flow_classify.h                       |   0
 .../rte_flow_classify_parse.c                 |   0
 .../rte_flow_classify_parse.h                 |   0
 .../version.map                               |   0
 lib/{librte_graph => graph}/graph.c           |   0
 lib/{librte_graph => graph}/graph_debug.c     |   0
 lib/{librte_graph => graph}/graph_ops.c       |   0
 lib/{librte_graph => graph}/graph_populate.c  |   0
 lib/{librte_graph => graph}/graph_private.h   |   0
 lib/{librte_graph => graph}/graph_stats.c     |   0
 lib/{librte_graph => graph}/meson.build       |   0
 lib/{librte_graph => graph}/node.c            |   0
 lib/{librte_graph => graph}/rte_graph.h       |   0
 .../rte_graph_worker.h                        |   0
 lib/{librte_graph => graph}/version.map       |   0
 lib/{librte_gro => gro}/gro_tcp4.c            |   0
 lib/{librte_gro => gro}/gro_tcp4.h            |   0
 lib/{librte_gro => gro}/gro_udp4.c            |   0
 lib/{librte_gro => gro}/gro_udp4.h            |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.h      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.h      |   0
 lib/{librte_gro => gro}/meson.build           |   0
 lib/{librte_gro => gro}/rte_gro.c             |   0
 lib/{librte_gro => gro}/rte_gro.h             |   0
 lib/{librte_gro => gro}/version.map           |   0
 lib/{librte_gso => gso}/gso_common.c          |   0
 lib/{librte_gso => gso}/gso_common.h          |   0
 lib/{librte_gso => gso}/gso_tcp4.c            |   0
 lib/{librte_gso => gso}/gso_tcp4.h            |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.h     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.h     |   0
 lib/{librte_gso => gso}/gso_udp4.c            |   0
 lib/{librte_gso => gso}/gso_udp4.h            |   0
 lib/{librte_gso => gso}/meson.build           |   0
 lib/{librte_gso => gso}/rte_gso.c             |   0
 lib/{librte_gso => gso}/rte_gso.h             |   0
 lib/{librte_gso => gso}/version.map           |   0
 lib/{librte_hash => hash}/meson.build         |   0
 lib/{librte_hash => hash}/rte_cmp_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cmp_x86.h       |   0
 lib/{librte_hash => hash}/rte_crc_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.c   |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.h   |   0
 lib/{librte_hash => hash}/rte_fbk_hash.c      |   0
 lib/{librte_hash => hash}/rte_fbk_hash.h      |   0
 lib/{librte_hash => hash}/rte_hash.h          |   0
 lib/{librte_hash => hash}/rte_hash_crc.h      |   0
 lib/{librte_hash => hash}/rte_jhash.h         |   0
 lib/{librte_hash => hash}/rte_thash.h         |   0
 lib/{librte_hash => hash}/version.map         |   0
 .../ip_frag_common.h                          |   0
 .../ip_frag_internal.c                        |   0
 lib/{librte_ip_frag => ip_frag}/meson.build   |   0
 lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h |   0
 .../rte_ip_frag_common.c                      |   0
 .../rte_ipv4_fragmentation.c                  |   0
 .../rte_ipv4_reassembly.c                     |   0
 .../rte_ipv6_fragmentation.c                  |   0
 .../rte_ipv6_reassembly.c                     |   0
 lib/{librte_ip_frag => ip_frag}/version.map   |   0
 lib/{librte_ipsec => ipsec}/crypto.h          |   0
 lib/{librte_ipsec => ipsec}/esp_inb.c         |   0
 lib/{librte_ipsec => ipsec}/esp_outb.c        |   0
 lib/{librte_ipsec => ipsec}/iph.h             |   0
 lib/{librte_ipsec => ipsec}/ipsec_sad.c       |   0
 lib/{librte_ipsec => ipsec}/ipsec_sqn.h       |   0
 lib/{librte_ipsec => ipsec}/meson.build       |   0
 lib/{librte_ipsec => ipsec}/misc.h            |   0
 lib/{librte_ipsec => ipsec}/pad.h             |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec.h       |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_group.h |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h    |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h   |   0
 lib/{librte_ipsec => ipsec}/sa.c              |   0
 lib/{librte_ipsec => ipsec}/sa.h              |   0
 lib/{librte_ipsec => ipsec}/ses.c             |   0
 lib/{librte_ipsec => ipsec}/version.map       |   0
 lib/{librte_jobstats => jobstats}/meson.build |   0
 .../rte_jobstats.c                            |   0
 .../rte_jobstats.h                            |   0
 lib/{librte_jobstats => jobstats}/version.map |   0
 lib/{librte_kni => kni}/meson.build           |   0
 lib/{librte_kni => kni}/rte_kni.c             |   0
 lib/{librte_kni => kni}/rte_kni.h             |   0
 lib/{librte_kni => kni}/rte_kni_common.h      |   0
 lib/{librte_kni => kni}/rte_kni_fifo.h        |   0
 lib/{librte_kni => kni}/version.map           |   0
 lib/{librte_kvargs => kvargs}/meson.build     |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.c    |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.h    |   0
 lib/{librte_kvargs => kvargs}/version.map     |   0
 .../meson.build                               |   0
 .../rte_latencystats.c                        |   0
 .../rte_latencystats.h                        |   0
 .../version.map                               |   0
 lib/{librte_lpm => lpm}/meson.build           |   0
 lib/{librte_lpm => lpm}/rte_lpm.c             |   0
 lib/{librte_lpm => lpm}/rte_lpm.h             |   0
 lib/{librte_lpm => lpm}/rte_lpm6.c            |   0
 lib/{librte_lpm => lpm}/rte_lpm6.h            |   0
 lib/{librte_lpm => lpm}/rte_lpm_altivec.h     |   0
 lib/{librte_lpm => lpm}/rte_lpm_neon.h        |   0
 lib/{librte_lpm => lpm}/rte_lpm_sse.h         |   0
 lib/{librte_lpm => lpm}/rte_lpm_sve.h         |   0
 lib/{librte_lpm => lpm}/version.map           |   0
 lib/{librte_mbuf => mbuf}/meson.build         |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.c          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.h          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_core.h     |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c    |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h    |   0
 lib/{librte_mbuf => mbuf}/version.map         |   0
 lib/{librte_member => member}/meson.build     |   0
 lib/{librte_member => member}/rte_member.c    |   0
 lib/{librte_member => member}/rte_member.h    |   0
 lib/{librte_member => member}/rte_member_ht.c |   0
 lib/{librte_member => member}/rte_member_ht.h |   0
 .../rte_member_vbf.c                          |   0
 .../rte_member_vbf.h                          |   0
 .../rte_member_x86.h                          |   0
 lib/{librte_member => member}/version.map     |   0
 .../mempool_trace_points.c                    |   0
 lib/{librte_mempool => mempool}/meson.build   |   0
 lib/{librte_mempool => mempool}/rte_mempool.c |   0
 lib/{librte_mempool => mempool}/rte_mempool.h |   0
 .../rte_mempool_ops.c                         |   0
 .../rte_mempool_ops_default.c                 |   0
 .../rte_mempool_trace.h                       |   0
 .../rte_mempool_trace_fp.h                    |   0
 lib/{librte_mempool => mempool}/version.map   |   0
 lib/meson.build                               |  16 +-
 lib/{librte_meter => meter}/meson.build       |   0
 lib/{librte_meter => meter}/rte_meter.c       |   0
 lib/{librte_meter => meter}/rte_meter.h       |   0
 lib/{librte_meter => meter}/version.map       |   0
 lib/{librte_metrics => metrics}/meson.build   |   0
 lib/{librte_metrics => metrics}/rte_metrics.c |   0
 lib/{librte_metrics => metrics}/rte_metrics.h |   0
 .../rte_metrics_telemetry.c                   |   0
 .../rte_metrics_telemetry.h                   |   0
 lib/{librte_metrics => metrics}/version.map   |   0
 lib/{librte_net => net}/meson.build           |   0
 lib/{librte_net => net}/net_crc.h             |   0
 lib/{librte_net => net}/net_crc_avx512.c      |   0
 lib/{librte_net => net}/net_crc_neon.c        |   0
 lib/{librte_net => net}/net_crc_sse.c         |   0
 lib/{librte_net => net}/rte_arp.c             |   0
 lib/{librte_net => net}/rte_arp.h             |   0
 lib/{librte_net => net}/rte_ecpri.h           |   0
 lib/{librte_net => net}/rte_esp.h             |   0
 lib/{librte_net => net}/rte_ether.c           |   0
 lib/{librte_net => net}/rte_ether.h           |   0
 lib/{librte_net => net}/rte_geneve.h          |   0
 lib/{librte_net => net}/rte_gre.h             |   0
 lib/{librte_net => net}/rte_gtp.h             |   0
 lib/{librte_net => net}/rte_higig.h           |   0
 lib/{librte_net => net}/rte_icmp.h            |   0
 lib/{librte_net => net}/rte_ip.h              |   0
 lib/{librte_net => net}/rte_mpls.h            |   0
 lib/{librte_net => net}/rte_net.c             |   0
 lib/{librte_net => net}/rte_net.h             |   0
 lib/{librte_net => net}/rte_net_crc.c         |   0
 lib/{librte_net => net}/rte_net_crc.h         |   0
 lib/{librte_net => net}/rte_sctp.h            |   0
 lib/{librte_net => net}/rte_tcp.h             |   0
 lib/{librte_net => net}/rte_udp.h             |   0
 lib/{librte_net => net}/rte_vxlan.h           |   0
 lib/{librte_net => net}/version.map           |   0
 lib/{librte_node => node}/ethdev_ctrl.c       |   0
 lib/{librte_node => node}/ethdev_rx.c         |   0
 lib/{librte_node => node}/ethdev_rx_priv.h    |   0
 lib/{librte_node => node}/ethdev_tx.c         |   0
 lib/{librte_node => node}/ethdev_tx_priv.h    |   0
 lib/{librte_node => node}/ip4_lookup.c        |   0
 lib/{librte_node => node}/ip4_lookup_neon.h   |   0
 lib/{librte_node => node}/ip4_lookup_sse.h    |   0
 lib/{librte_node => node}/ip4_rewrite.c       |   0
 lib/{librte_node => node}/ip4_rewrite_priv.h  |   0
 lib/{librte_node => node}/log.c               |   0
 lib/{librte_node => node}/meson.build         |   0
 lib/{librte_node => node}/node_private.h      |   0
 lib/{librte_node => node}/null.c              |   0
 lib/{librte_node => node}/pkt_cls.c           |   0
 lib/{librte_node => node}/pkt_cls_priv.h      |   0
 lib/{librte_node => node}/pkt_drop.c          |   0
 lib/{librte_node => node}/rte_node_eth_api.h  |   0
 lib/{librte_node => node}/rte_node_ip4_api.h  |   0
 lib/{librte_node => node}/version.map         |   0
 lib/{librte_pci => pci}/meson.build           |   0
 lib/{librte_pci => pci}/rte_pci.c             |   0
 lib/{librte_pci => pci}/rte_pci.h             |   0
 lib/{librte_pci => pci}/version.map           |   0
 lib/{librte_pdump => pdump}/meson.build       |   0
 lib/{librte_pdump => pdump}/rte_pdump.c       |   0
 lib/{librte_pdump => pdump}/rte_pdump.h       |   0
 lib/{librte_pdump => pdump}/version.map       |   0
 lib/{librte_pipeline => pipeline}/meson.build |   0
 .../rte_pipeline.c                            |   0
 .../rte_pipeline.h                            |   0
 .../rte_port_in_action.c                      |   0
 .../rte_port_in_action.h                      |   0
 .../rte_swx_ctl.c                             |   0
 .../rte_swx_ctl.h                             |   0
 .../rte_swx_extern.h                          |   0
 .../rte_swx_pipeline.c                        |   0
 .../rte_swx_pipeline.h                        |   0
 .../rte_swx_pipeline_spec.c                   |   0
 .../rte_table_action.c                        |   0
 .../rte_table_action.h                        |   0
 lib/{librte_pipeline => pipeline}/version.map |   0
 lib/{librte_port => port}/meson.build         |   0
 lib/{librte_port => port}/rte_port.h          |   0
 lib/{librte_port => port}/rte_port_ethdev.c   |   0
 lib/{librte_port => port}/rte_port_ethdev.h   |   0
 lib/{librte_port => port}/rte_port_eventdev.c |   0
 lib/{librte_port => port}/rte_port_eventdev.h |   0
 lib/{librte_port => port}/rte_port_fd.c       |   0
 lib/{librte_port => port}/rte_port_fd.h       |   0
 lib/{librte_port => port}/rte_port_frag.c     |   0
 lib/{librte_port => port}/rte_port_frag.h     |   0
 lib/{librte_port => port}/rte_port_kni.c      |   0
 lib/{librte_port => port}/rte_port_kni.h      |   0
 lib/{librte_port => port}/rte_port_ras.c      |   0
 lib/{librte_port => port}/rte_port_ras.h      |   0
 lib/{librte_port => port}/rte_port_ring.c     |   0
 lib/{librte_port => port}/rte_port_ring.h     |   0
 lib/{librte_port => port}/rte_port_sched.c    |   0
 lib/{librte_port => port}/rte_port_sched.h    |   0
 .../rte_port_source_sink.c                    |   0
 .../rte_port_source_sink.h                    |   0
 .../rte_port_sym_crypto.c                     |   0
 .../rte_port_sym_crypto.h                     |   0
 lib/{librte_port => port}/rte_swx_port.h      |   0
 .../rte_swx_port_ethdev.c                     |   0
 .../rte_swx_port_ethdev.h                     |   0
 lib/{librte_port => port}/rte_swx_port_fd.c   |   0
 lib/{librte_port => port}/rte_swx_port_fd.h   |   0
 lib/{librte_port => port}/rte_swx_port_ring.c |   0
 lib/{librte_port => port}/rte_swx_port_ring.h |   0
 .../rte_swx_port_source_sink.c                |   0
 .../rte_swx_port_source_sink.h                |   0
 lib/{librte_port => port}/version.map         |   0
 lib/{librte_power => power}/guest_channel.c   |   0
 lib/{librte_power => power}/guest_channel.h   |   0
 lib/{librte_power => power}/meson.build       |   0
 .../power_acpi_cpufreq.c                      |   0
 .../power_acpi_cpufreq.h                      |   0
 lib/{librte_power => power}/power_common.c    |   0
 lib/{librte_power => power}/power_common.h    |   0
 lib/{librte_power => power}/power_kvm_vm.c    |   0
 lib/{librte_power => power}/power_kvm_vm.h    |   0
 .../power_pstate_cpufreq.c                    |   0
 .../power_pstate_cpufreq.h                    |   0
 lib/{librte_power => power}/rte_power.c       |   0
 lib/{librte_power => power}/rte_power.h       |   0
 .../rte_power_empty_poll.c                    |   0
 .../rte_power_empty_poll.h                    |   0
 .../rte_power_guest_channel.h                 |   0
 .../rte_power_pmd_mgmt.c                      |   0
 .../rte_power_pmd_mgmt.h                      |   0
 lib/{librte_power => power}/version.map       |   0
 lib/{librte_rawdev => rawdev}/meson.build     |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.c    |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.h    |   0
 .../rte_rawdev_pmd.h                          |   0
 lib/{librte_rawdev => rawdev}/version.map     |   0
 lib/{librte_rcu => rcu}/meson.build           |   0
 lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.c        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.h        |   0
 lib/{librte_rcu => rcu}/version.map           |   0
 lib/{librte_regexdev => regexdev}/meson.build |   0
 .../rte_regexdev.c                            |   0
 .../rte_regexdev.h                            |   0
 .../rte_regexdev_core.h                       |   0
 .../rte_regexdev_driver.h                     |   0
 lib/{librte_regexdev => regexdev}/version.map |   0
 lib/{librte_reorder => reorder}/meson.build   |   0
 lib/{librte_reorder => reorder}/rte_reorder.c |   0
 lib/{librte_reorder => reorder}/rte_reorder.h |   0
 lib/{librte_reorder => reorder}/version.map   |   0
 lib/{librte_rib => rib}/meson.build           |   0
 lib/{librte_rib => rib}/rte_rib.c             |   0
 lib/{librte_rib => rib}/rte_rib.h             |   0
 lib/{librte_rib => rib}/rte_rib6.c            |   0
 lib/{librte_rib => rib}/rte_rib6.h            |   0
 lib/{librte_rib => rib}/version.map           |   0
 lib/{librte_ring => ring}/meson.build         |   0
 lib/{librte_ring => ring}/rte_ring.c          |   0
 lib/{librte_ring => ring}/rte_ring.h          |   0
 lib/{librte_ring => ring}/rte_ring_c11_pvt.h  |   0
 lib/{librte_ring => ring}/rte_ring_core.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem_pvt.h |   0
 .../rte_ring_generic_pvt.h                    |   0
 lib/{librte_ring => ring}/rte_ring_hts.h      |   0
 .../rte_ring_hts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/rte_ring_peek.h     |   0
 .../rte_ring_peek_elem_pvt.h                  |   0
 lib/{librte_ring => ring}/rte_ring_peek_zc.h  |   0
 lib/{librte_ring => ring}/rte_ring_rts.h      |   0
 .../rte_ring_rts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/version.map         |   0
 lib/{librte_sched => sched}/meson.build       |   0
 lib/{librte_sched => sched}/rte_approx.c      |   0
 lib/{librte_sched => sched}/rte_approx.h      |   0
 lib/{librte_sched => sched}/rte_red.c         |   0
 lib/{librte_sched => sched}/rte_red.h         |   0
 lib/{librte_sched => sched}/rte_sched.c       |   0
 lib/{librte_sched => sched}/rte_sched.h       |   0
 .../rte_sched_common.h                        |   0
 lib/{librte_sched => sched}/version.map       |   0
 lib/{librte_security => security}/meson.build |   0
 .../rte_security.c                            |   0
 .../rte_security.h                            |   0
 .../rte_security_driver.h                     |   0
 lib/{librte_security => security}/version.map |   0
 lib/{librte_stack => stack}/meson.build       |   0
 lib/{librte_stack => stack}/rte_stack.c       |   0
 lib/{librte_stack => stack}/rte_stack.h       |   0
 lib/{librte_stack => stack}/rte_stack_lf.c    |   0
 lib/{librte_stack => stack}/rte_stack_lf.h    |   0
 .../rte_stack_lf_c11.h                        |   0
 .../rte_stack_lf_generic.h                    |   0
 .../rte_stack_lf_stubs.h                      |   0
 lib/{librte_stack => stack}/rte_stack_std.c   |   0
 lib/{librte_stack => stack}/rte_stack_std.h   |   0
 lib/{librte_stack => stack}/stack_pvt.h       |   0
 lib/{librte_stack => stack}/version.map       |   0
 lib/{librte_table => table}/meson.build       |   0
 lib/{librte_table => table}/rte_lru.h         |   0
 lib/{librte_table => table}/rte_lru_arm64.h   |   0
 lib/{librte_table => table}/rte_lru_x86.h     |   0
 lib/{librte_table => table}/rte_swx_table.h   |   0
 .../rte_swx_table_em.c                        |   0
 .../rte_swx_table_em.h                        |   0
 .../rte_swx_table_wm.c                        |   0
 .../rte_swx_table_wm.h                        |   0
 lib/{librte_table => table}/rte_table.h       |   0
 lib/{librte_table => table}/rte_table_acl.c   |   0
 lib/{librte_table => table}/rte_table_acl.h   |   0
 lib/{librte_table => table}/rte_table_array.c |   0
 lib/{librte_table => table}/rte_table_array.h |   0
 lib/{librte_table => table}/rte_table_hash.h  |   0
 .../rte_table_hash_cuckoo.c                   |   0
 .../rte_table_hash_cuckoo.h                   |   0
 .../rte_table_hash_ext.c                      |   0
 .../rte_table_hash_func.h                     |   0
 .../rte_table_hash_func_arm64.h               |   0
 .../rte_table_hash_key16.c                    |   0
 .../rte_table_hash_key32.c                    |   0
 .../rte_table_hash_key8.c                     |   0
 .../rte_table_hash_lru.c                      |   0
 lib/{librte_table => table}/rte_table_lpm.c   |   0
 lib/{librte_table => table}/rte_table_lpm.h   |   0
 .../rte_table_lpm_ipv6.c                      |   0
 .../rte_table_lpm_ipv6.h                      |   0
 lib/{librte_table => table}/rte_table_stub.c  |   0
 lib/{librte_table => table}/rte_table_stub.h  |   0
 lib/{librte_table => table}/version.map       |   0
 .../meson.build                               |   2 +-
 .../rte_telemetry.h                           |   0
 .../telemetry.c                               |   0
 .../telemetry_data.c                          |   0
 .../telemetry_data.h                          |   0
 .../telemetry_internal.h                      |   0
 .../telemetry_json.h                          |   0
 .../telemetry_legacy.c                        |   0
 .../version.map                               |   0
 lib/{librte_timer => timer}/meson.build       |   0
 lib/{librte_timer => timer}/rte_timer.c       |   0
 lib/{librte_timer => timer}/rte_timer.h       |   0
 lib/{librte_timer => timer}/version.map       |   0
 lib/{librte_vhost => vhost}/fd_man.c          |   0
 lib/{librte_vhost => vhost}/fd_man.h          |   0
 lib/{librte_vhost => vhost}/iotlb.c           |   0
 lib/{librte_vhost => vhost}/iotlb.h           |   0
 lib/{librte_vhost => vhost}/meson.build       |   0
 lib/{librte_vhost => vhost}/rte_vdpa.h        |   0
 lib/{librte_vhost => vhost}/rte_vdpa_dev.h    |   0
 lib/{librte_vhost => vhost}/rte_vhost.h       |   0
 lib/{librte_vhost => vhost}/rte_vhost_async.h |   0
 .../rte_vhost_crypto.h                        |   0
 lib/{librte_vhost => vhost}/socket.c          |   0
 lib/{librte_vhost => vhost}/vdpa.c            |   0
 lib/{librte_vhost => vhost}/version.map       |   0
 lib/{librte_vhost => vhost}/vhost.c           |   0
 lib/{librte_vhost => vhost}/vhost.h           |   0
 lib/{librte_vhost => vhost}/vhost_crypto.c    |   0
 lib/{librte_vhost => vhost}/vhost_user.c      |   0
 lib/{librte_vhost => vhost}/vhost_user.h      |   0
 lib/{librte_vhost => vhost}/virtio_crypto.h   |   0
 lib/{librte_vhost => vhost}/virtio_net.c      |   0
 license/exceptions.txt                        |   6 +-
 meson.build                                   |   6 +-
 877 files changed, 206 insertions(+), 204 deletions(-)
 rename lib/{librte_acl => acl}/acl.h (100%)
 rename lib/{librte_acl => acl}/acl_bld.c (100%)
 rename lib/{librte_acl => acl}/acl_gen.c (100%)
 rename lib/{librte_acl => acl}/acl_run.h (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.c (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512_common.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x16.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x8.h (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.c (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.h (100%)
 rename lib/{librte_acl => acl}/acl_run_scalar.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.h (100%)
 rename lib/{librte_acl => acl}/acl_vect.h (100%)
 rename lib/{librte_acl => acl}/meson.build (100%)
 rename lib/{librte_acl => acl}/rte_acl.c (100%)
 rename lib/{librte_acl => acl}/rte_acl.h (100%)
 rename lib/{librte_acl => acl}/rte_acl_osdep.h (100%)
 rename lib/{librte_acl => acl}/tb_mem.c (100%)
 rename lib/{librte_acl => acl}/tb_mem.h (100%)
 rename lib/{librte_acl => acl}/version.map (100%)
 rename lib/{librte_bbdev => bbdev}/meson.build (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.c (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_op.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h (100%)
 rename lib/{librte_bbdev => bbdev}/version.map (100%)
 rename lib/{librte_bitratestats => bitratestats}/meson.build (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.c (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.h (100%)
 rename lib/{librte_bitratestats => bitratestats}/version.map (100%)
 rename lib/{librte_bpf => bpf}/bpf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_def.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_exec.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_impl.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_arm64.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_x86.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load_elf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_pkt.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_validate.c (100%)
 rename lib/{librte_bpf => bpf}/meson.build (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf.h (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf_ethdev.h (100%)
 rename lib/{librte_bpf => bpf}/version.map (100%)
 rename lib/{librte_cfgfile => cfgfile}/meson.build (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h (100%)
 rename lib/{librte_cfgfile => cfgfile}/version.map (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_unix.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_windows.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_private.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.h (100%)
 rename lib/{librte_cmdline => cmdline}/meson.build (100%)
 rename lib/{librte_cmdline => cmdline}/version.map (100%)
 rename lib/{librte_compressdev => compressdev}/meson.build (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_internal.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.h (100%)
 rename lib/{librte_compressdev => compressdev}/version.map (100%)
 rename lib/{librte_cryptodev => cryptodev}/cryptodev_trace_points.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/meson.build (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_asym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_sym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace_fp.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/version.map (100%)
 rename lib/{librte_distributor => distributor}/distributor_private.h (100%)
 rename lib/{librte_distributor => distributor}/meson.build (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.h (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_generic.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_sse.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.h (100%)
 rename lib/{librte_distributor => distributor}/version.map (100%)
 rename lib/{librte_eal => eal}/arm/include/meson.build (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/arm/meson.build (100%)
 rename lib/{librte_eal => eal}/arm/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_bus.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_class.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_config.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_debug.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dev.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_devargs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dynmem.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_errno.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_fbarray.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hexdump.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_launch.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_lcore.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_log.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_mcfg.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memalloc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memory.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memzone.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_options.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_proc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_string_fns.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_tailqs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_thread.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_timer.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_ctf.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_points.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_utils.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_uuid.c (100%)
 rename lib/{librte_eal => eal}/common/eal_filesystem.h (100%)
 rename lib/{librte_eal => eal}/common/eal_hugepages.h (100%)
 rename lib/{librte_eal => eal}/common/eal_internal_cfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_log.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memalloc.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memcfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_options.h (100%)
 rename lib/{librte_eal => eal}/common/eal_private.h (100%)
 rename lib/{librte_eal => eal}/common/eal_thread.h (100%)
 rename lib/{librte_eal => eal}/common/eal_trace.h (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.c (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.h (100%)
 rename lib/{librte_eal => eal}/common/meson.build (100%)
 rename lib/{librte_eal => eal}/common/rte_keepalive.c (100%)
 rename lib/{librte_eal => eal}/common/rte_malloc.c (100%)
 rename lib/{librte_eal => eal}/common/rte_random.c (100%)
 rename lib/{librte_eal => eal}/common/rte_reciprocal.c (100%)
 rename lib/{librte_eal => eal}/common/rte_service.c (100%)
 rename lib/{librte_eal => eal}/common/rte_version.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm_private.h (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/freebsd/include/meson.build (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/freebsd/meson.build (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_io.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/include/meson.build (100%)
 rename lib/{librte_eal => eal}/include/rte_alarm.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitmap.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitops.h (100%)
 rename lib/{librte_eal => eal}/include/rte_branch_prediction.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bus.h (100%)
 rename lib/{librte_eal => eal}/include/rte_class.h (100%)
 rename lib/{librte_eal => eal}/include/rte_common.h (100%)
 rename lib/{librte_eal => eal}/include/rte_compat.h (100%)
 rename lib/{librte_eal => eal}/include/rte_debug.h (100%)
 rename lib/{librte_eal => eal}/include/rte_dev.h (100%)
 rename lib/{librte_eal => eal}/include/rte_devargs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_memconfig.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_paging.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_errno.h (100%)
 rename lib/{librte_eal => eal}/include/rte_fbarray.h (100%)
 rename lib/{librte_eal => eal}/include/rte_function_versioning.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hexdump.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hypervisor.h (100%)
 rename lib/{librte_eal => eal}/include/rte_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_keepalive.h (100%)
 rename lib/{librte_eal => eal}/include/rte_launch.h (100%)
 rename lib/{librte_eal => eal}/include/rte_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_log.h (100%)
 rename lib/{librte_eal => eal}/include/rte_malloc.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memory.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memzone.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_feature_defs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_features.h (100%)
 rename lib/{librte_eal => eal}/include/rte_per_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_random.h (100%)
 rename lib/{librte_eal => eal}/include/rte_reciprocal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service_component.h (100%)
 rename lib/{librte_eal => eal}/include/rte_string_fns.h (100%)
 rename lib/{librte_eal => eal}/include/rte_tailq.h (100%)
 rename lib/{librte_eal => eal}/include/rte_test.h (100%)
 rename lib/{librte_eal => eal}/include/rte_thread.h (100%)
 rename lib/{librte_eal => eal}/include/rte_time.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point_register.h (100%)
 rename lib/{librte_eal => eal}/include/rte_uuid.h (100%)
 rename lib/{librte_eal => eal}/include/rte_version.h (100%)
 rename lib/{librte_eal => eal}/include/rte_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_log.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio_mp_sync.c (100%)
 rename lib/{librte_eal => eal}/linux/include/meson.build (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/linux/meson.build (100%)
 rename lib/{librte_eal => eal}/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/include/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_altivec.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/ppc/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_file.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_memory.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_timer.c (100%)
 rename lib/{librte_eal => eal}/unix/meson.build (100%)
 rename lib/{librte_eal => eal}/unix/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/version.map (100%)
 rename lib/{librte_eal => eal}/windows/eal.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_file.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_hugepages.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_log.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_mp.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/fnmatch.c (100%)
 rename lib/{librte_eal => eal}/windows/getopt.c (100%)
 rename lib/{librte_eal => eal}/windows/include/dirent.h (100%)
 rename lib/{librte_eal => eal}/windows/include/fnmatch.h (100%)
 rename lib/{librte_eal => eal}/windows/include/getopt.h (100%)
 rename lib/{librte_eal => eal}/windows/include/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/include/pthread.h (100%)
 rename lib/{librte_eal => eal}/windows/include/regex.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_virt2phys.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sched.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/queue.h (100%)
 rename lib/{librte_eal => eal}/windows/include/unistd.h (100%)
 rename lib/{librte_eal => eal}/windows/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/x86/include/meson.build (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rtm.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/x86/meson.build (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuid.h (100%)
 rename lib/{librte_eal => eal}/x86/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_spinlock.c (100%)
 rename lib/{librte_efd => efd}/meson.build (100%)
 rename lib/{librte_efd => efd}/rte_efd.c (100%)
 rename lib/{librte_efd => efd}/rte_efd.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_arm64.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_x86.h (100%)
 rename lib/{librte_efd => efd}/version.map (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_pci.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_trace_points.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_vdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/meson.build (100%)
 rename lib/{librte_ethdev => ethdev}/rte_class_eth.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_dev_info.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_core.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace_fp.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/version.map (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_pci.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_vdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_trace_points.c (100%)
 rename lib/{librte_eventdev => eventdev}/meson.build (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace_fp.h (100%)
 rename lib/{librte_eventdev => eventdev}/version.map (100%)
 rename lib/{librte_fib => fib}/dir24_8.c (100%)
 rename lib/{librte_fib => fib}/dir24_8.h (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.c (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.h (100%)
 rename lib/{librte_fib => fib}/meson.build (100%)
 rename lib/{librte_fib => fib}/rte_fib.c (100%)
 rename lib/{librte_fib => fib}/rte_fib.h (100%)
 rename lib/{librte_fib => fib}/rte_fib6.c (100%)
 rename lib/{librte_fib => fib}/rte_fib6.h (100%)
 rename lib/{librte_fib => fib}/trie.c (100%)
 rename lib/{librte_fib => fib}/trie.h (100%)
 rename lib/{librte_fib => fib}/trie_avx512.c (100%)
 rename lib/{librte_fib => fib}/trie_avx512.h (100%)
 rename lib/{librte_fib => fib}/version.map (100%)
 rename lib/{librte_flow_classify => flow_classify}/meson.build (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/version.map (100%)
 rename lib/{librte_graph => graph}/graph.c (100%)
 rename lib/{librte_graph => graph}/graph_debug.c (100%)
 rename lib/{librte_graph => graph}/graph_ops.c (100%)
 rename lib/{librte_graph => graph}/graph_populate.c (100%)
 rename lib/{librte_graph => graph}/graph_private.h (100%)
 rename lib/{librte_graph => graph}/graph_stats.c (100%)
 rename lib/{librte_graph => graph}/meson.build (100%)
 rename lib/{librte_graph => graph}/node.c (100%)
 rename lib/{librte_graph => graph}/rte_graph.h (100%)
 rename lib/{librte_graph => graph}/rte_graph_worker.h (100%)
 rename lib/{librte_graph => graph}/version.map (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_udp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.h (100%)
 rename lib/{librte_gro => gro}/meson.build (100%)
 rename lib/{librte_gro => gro}/rte_gro.c (100%)
 rename lib/{librte_gro => gro}/rte_gro.h (100%)
 rename lib/{librte_gro => gro}/version.map (100%)
 rename lib/{librte_gso => gso}/gso_common.c (100%)
 rename lib/{librte_gso => gso}/gso_common.h (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.h (100%)
 rename lib/{librte_gso => gso}/gso_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_udp4.h (100%)
 rename lib/{librte_gso => gso}/meson.build (100%)
 rename lib/{librte_gso => gso}/rte_gso.c (100%)
 rename lib/{librte_gso => gso}/rte_gso.h (100%)
 rename lib/{librte_gso => gso}/version.map (100%)
 rename lib/{librte_hash => hash}/meson.build (100%)
 rename lib/{librte_hash => hash}/rte_cmp_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cmp_x86.h (100%)
 rename lib/{librte_hash => hash}/rte_crc_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash_crc.h (100%)
 rename lib/{librte_hash => hash}/rte_jhash.h (100%)
 rename lib/{librte_hash => hash}/rte_thash.h (100%)
 rename lib/{librte_hash => hash}/version.map (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_common.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_internal.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/meson.build (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag_common.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/version.map (100%)
 rename lib/{librte_ipsec => ipsec}/crypto.h (100%)
 rename lib/{librte_ipsec => ipsec}/esp_inb.c (100%)
 rename lib/{librte_ipsec => ipsec}/esp_outb.c (100%)
 rename lib/{librte_ipsec => ipsec}/iph.h (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sad.c (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sqn.h (100%)
 rename lib/{librte_ipsec => ipsec}/meson.build (100%)
 rename lib/{librte_ipsec => ipsec}/misc.h (100%)
 rename lib/{librte_ipsec => ipsec}/pad.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_group.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h (100%)
 rename lib/{librte_ipsec => ipsec}/sa.c (100%)
 rename lib/{librte_ipsec => ipsec}/sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/ses.c (100%)
 rename lib/{librte_ipsec => ipsec}/version.map (100%)
 rename lib/{librte_jobstats => jobstats}/meson.build (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.c (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.h (100%)
 rename lib/{librte_jobstats => jobstats}/version.map (100%)
 rename lib/{librte_kni => kni}/meson.build (100%)
 rename lib/{librte_kni => kni}/rte_kni.c (100%)
 rename lib/{librte_kni => kni}/rte_kni.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_common.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_fifo.h (100%)
 rename lib/{librte_kni => kni}/version.map (100%)
 rename lib/{librte_kvargs => kvargs}/meson.build (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.c (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.h (100%)
 rename lib/{librte_kvargs => kvargs}/version.map (100%)
 rename lib/{librte_latencystats => latencystats}/meson.build (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.c (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.h (100%)
 rename lib/{librte_latencystats => latencystats}/version.map (100%)
 rename lib/{librte_lpm => lpm}/meson.build (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_altivec.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_neon.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sse.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sve.h (100%)
 rename lib/{librte_lpm => lpm}/version.map (100%)
 rename lib/{librte_mbuf => mbuf}/meson.build (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_core.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h (100%)
 rename lib/{librte_mbuf => mbuf}/version.map (100%)
 rename lib/{librte_member => member}/meson.build (100%)
 rename lib/{librte_member => member}/rte_member.c (100%)
 rename lib/{librte_member => member}/rte_member.h (100%)
 rename lib/{librte_member => member}/rte_member_ht.c (100%)
 rename lib/{librte_member => member}/rte_member_ht.h (100%)
 rename lib/{librte_member => member}/rte_member_vbf.c (100%)
 rename lib/{librte_member => member}/rte_member_vbf.h (100%)
 rename lib/{librte_member => member}/rte_member_x86.h (100%)
 rename lib/{librte_member => member}/version.map (100%)
 rename lib/{librte_mempool => mempool}/mempool_trace_points.c (100%)
 rename lib/{librte_mempool => mempool}/meson.build (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops_default.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace_fp.h (100%)
 rename lib/{librte_mempool => mempool}/version.map (100%)
 rename lib/{librte_meter => meter}/meson.build (100%)
 rename lib/{librte_meter => meter}/rte_meter.c (100%)
 rename lib/{librte_meter => meter}/rte_meter.h (100%)
 rename lib/{librte_meter => meter}/version.map (100%)
 rename lib/{librte_metrics => metrics}/meson.build (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.h (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.h (100%)
 rename lib/{librte_metrics => metrics}/version.map (100%)
 rename lib/{librte_net => net}/meson.build (100%)
 rename lib/{librte_net => net}/net_crc.h (100%)
 rename lib/{librte_net => net}/net_crc_avx512.c (100%)
 rename lib/{librte_net => net}/net_crc_neon.c (100%)
 rename lib/{librte_net => net}/net_crc_sse.c (100%)
 rename lib/{librte_net => net}/rte_arp.c (100%)
 rename lib/{librte_net => net}/rte_arp.h (100%)
 rename lib/{librte_net => net}/rte_ecpri.h (100%)
 rename lib/{librte_net => net}/rte_esp.h (100%)
 rename lib/{librte_net => net}/rte_ether.c (100%)
 rename lib/{librte_net => net}/rte_ether.h (100%)
 rename lib/{librte_net => net}/rte_geneve.h (100%)
 rename lib/{librte_net => net}/rte_gre.h (100%)
 rename lib/{librte_net => net}/rte_gtp.h (100%)
 rename lib/{librte_net => net}/rte_higig.h (100%)
 rename lib/{librte_net => net}/rte_icmp.h (100%)
 rename lib/{librte_net => net}/rte_ip.h (100%)
 rename lib/{librte_net => net}/rte_mpls.h (100%)
 rename lib/{librte_net => net}/rte_net.c (100%)
 rename lib/{librte_net => net}/rte_net.h (100%)
 rename lib/{librte_net => net}/rte_net_crc.c (100%)
 rename lib/{librte_net => net}/rte_net_crc.h (100%)
 rename lib/{librte_net => net}/rte_sctp.h (100%)
 rename lib/{librte_net => net}/rte_tcp.h (100%)
 rename lib/{librte_net => net}/rte_udp.h (100%)
 rename lib/{librte_net => net}/rte_vxlan.h (100%)
 rename lib/{librte_net => net}/version.map (100%)
 rename lib/{librte_node => node}/ethdev_ctrl.c (100%)
 rename lib/{librte_node => node}/ethdev_rx.c (100%)
 rename lib/{librte_node => node}/ethdev_rx_priv.h (100%)
 rename lib/{librte_node => node}/ethdev_tx.c (100%)
 rename lib/{librte_node => node}/ethdev_tx_priv.h (100%)
 rename lib/{librte_node => node}/ip4_lookup.c (100%)
 rename lib/{librte_node => node}/ip4_lookup_neon.h (100%)
 rename lib/{librte_node => node}/ip4_lookup_sse.h (100%)
 rename lib/{librte_node => node}/ip4_rewrite.c (100%)
 rename lib/{librte_node => node}/ip4_rewrite_priv.h (100%)
 rename lib/{librte_node => node}/log.c (100%)
 rename lib/{librte_node => node}/meson.build (100%)
 rename lib/{librte_node => node}/node_private.h (100%)
 rename lib/{librte_node => node}/null.c (100%)
 rename lib/{librte_node => node}/pkt_cls.c (100%)
 rename lib/{librte_node => node}/pkt_cls_priv.h (100%)
 rename lib/{librte_node => node}/pkt_drop.c (100%)
 rename lib/{librte_node => node}/rte_node_eth_api.h (100%)
 rename lib/{librte_node => node}/rte_node_ip4_api.h (100%)
 rename lib/{librte_node => node}/version.map (100%)
 rename lib/{librte_pci => pci}/meson.build (100%)
 rename lib/{librte_pci => pci}/rte_pci.c (100%)
 rename lib/{librte_pci => pci}/rte_pci.h (100%)
 rename lib/{librte_pci => pci}/version.map (100%)
 rename lib/{librte_pdump => pdump}/meson.build (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.c (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.h (100%)
 rename lib/{librte_pdump => pdump}/version.map (100%)
 rename lib/{librte_pipeline => pipeline}/meson.build (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_extern.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline_spec.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/version.map (100%)
 rename lib/{librte_port => port}/meson.build (100%)
 rename lib/{librte_port => port}/rte_port.h (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.c (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.h (100%)
 rename lib/{librte_port => port}/rte_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_port_frag.c (100%)
 rename lib/{librte_port => port}/rte_port_frag.h (100%)
 rename lib/{librte_port => port}/rte_port_kni.c (100%)
 rename lib/{librte_port => port}/rte_port_kni.h (100%)
 rename lib/{librte_port => port}/rte_port_ras.c (100%)
 rename lib/{librte_port => port}/rte_port_ras.h (100%)
 rename lib/{librte_port => port}/rte_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_port_sched.c (100%)
 rename lib/{librte_port => port}/rte_port_sched.h (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.h (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.c (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.h (100%)
 rename lib/{librte_port => port}/rte_swx_port.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.h (100%)
 rename lib/{librte_port => port}/version.map (100%)
 rename lib/{librte_power => power}/guest_channel.c (100%)
 rename lib/{librte_power => power}/guest_channel.h (100%)
 rename lib/{librte_power => power}/meson.build (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.h (100%)
 rename lib/{librte_power => power}/power_common.c (100%)
 rename lib/{librte_power => power}/power_common.h (100%)
 rename lib/{librte_power => power}/power_kvm_vm.c (100%)
 rename lib/{librte_power => power}/power_kvm_vm.h (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.h (100%)
 rename lib/{librte_power => power}/rte_power.c (100%)
 rename lib/{librte_power => power}/rte_power.h (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.c (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.h (100%)
 rename lib/{librte_power => power}/rte_power_guest_channel.h (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.c (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.h (100%)
 rename lib/{librte_power => power}/version.map (100%)
 rename lib/{librte_rawdev => rawdev}/meson.build (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.c (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.h (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev_pmd.h (100%)
 rename lib/{librte_rawdev => rawdev}/version.map (100%)
 rename lib/{librte_rcu => rcu}/meson.build (100%)
 rename lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.c (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.h (100%)
 rename lib/{librte_rcu => rcu}/version.map (100%)
 rename lib/{librte_regexdev => regexdev}/meson.build (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.c (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_core.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_driver.h (100%)
 rename lib/{librte_regexdev => regexdev}/version.map (100%)
 rename lib/{librte_reorder => reorder}/meson.build (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.c (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.h (100%)
 rename lib/{librte_reorder => reorder}/version.map (100%)
 rename lib/{librte_rib => rib}/meson.build (100%)
 rename lib/{librte_rib => rib}/rte_rib.c (100%)
 rename lib/{librte_rib => rib}/rte_rib.h (100%)
 rename lib/{librte_rib => rib}/rte_rib6.c (100%)
 rename lib/{librte_rib => rib}/rte_rib6.h (100%)
 rename lib/{librte_rib => rib}/version.map (100%)
 rename lib/{librte_ring => ring}/meson.build (100%)
 rename lib/{librte_ring => ring}/rte_ring.c (100%)
 rename lib/{librte_ring => ring}/rte_ring.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_c11_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_core.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_generic_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_zc.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/version.map (100%)
 rename lib/{librte_sched => sched}/meson.build (100%)
 rename lib/{librte_sched => sched}/rte_approx.c (100%)
 rename lib/{librte_sched => sched}/rte_approx.h (100%)
 rename lib/{librte_sched => sched}/rte_red.c (100%)
 rename lib/{librte_sched => sched}/rte_red.h (100%)
 rename lib/{librte_sched => sched}/rte_sched.c (100%)
 rename lib/{librte_sched => sched}/rte_sched.h (100%)
 rename lib/{librte_sched => sched}/rte_sched_common.h (100%)
 rename lib/{librte_sched => sched}/version.map (100%)
 rename lib/{librte_security => security}/meson.build (100%)
 rename lib/{librte_security => security}/rte_security.c (100%)
 rename lib/{librte_security => security}/rte_security.h (100%)
 rename lib/{librte_security => security}/rte_security_driver.h (100%)
 rename lib/{librte_security => security}/version.map (100%)
 rename lib/{librte_stack => stack}/meson.build (100%)
 rename lib/{librte_stack => stack}/rte_stack.c (100%)
 rename lib/{librte_stack => stack}/rte_stack.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_c11.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_generic.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_stubs.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.h (100%)
 rename lib/{librte_stack => stack}/stack_pvt.h (100%)
 rename lib/{librte_stack => stack}/version.map (100%)
 rename lib/{librte_table => table}/meson.build (100%)
 rename lib/{librte_table => table}/rte_lru.h (100%)
 rename lib/{librte_table => table}/rte_lru_arm64.h (100%)
 rename lib/{librte_table => table}/rte_lru_x86.h (100%)
 rename lib/{librte_table => table}/rte_swx_table.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.h (100%)
 rename lib/{librte_table => table}/rte_table.h (100%)
 rename lib/{librte_table => table}/rte_table_acl.c (100%)
 rename lib/{librte_table => table}/rte_table_acl.h (100%)
 rename lib/{librte_table => table}/rte_table_array.c (100%)
 rename lib/{librte_table => table}/rte_table_array.h (100%)
 rename lib/{librte_table => table}/rte_table_hash.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_ext.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_func.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_func_arm64.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_key16.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key32.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key8.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_lru.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.h (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.h (100%)
 rename lib/{librte_table => table}/rte_table_stub.c (100%)
 rename lib/{librte_table => table}/rte_table_stub.h (100%)
 rename lib/{librte_table => table}/version.map (100%)
 rename lib/{librte_telemetry => telemetry}/meson.build (80%)
 rename lib/{librte_telemetry => telemetry}/rte_telemetry.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_internal.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_json.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_legacy.c (100%)
 rename lib/{librte_telemetry => telemetry}/version.map (100%)
 rename lib/{librte_timer => timer}/meson.build (100%)
 rename lib/{librte_timer => timer}/rte_timer.c (100%)
 rename lib/{librte_timer => timer}/rte_timer.h (100%)
 rename lib/{librte_timer => timer}/version.map (100%)
 rename lib/{librte_vhost => vhost}/fd_man.c (100%)
 rename lib/{librte_vhost => vhost}/fd_man.h (100%)
 rename lib/{librte_vhost => vhost}/iotlb.c (100%)
 rename lib/{librte_vhost => vhost}/iotlb.h (100%)
 rename lib/{librte_vhost => vhost}/meson.build (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa_dev.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_async.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/socket.c (100%)
 rename lib/{librte_vhost => vhost}/vdpa.c (100%)
 rename lib/{librte_vhost => vhost}/version.map (100%)
 rename lib/{librte_vhost => vhost}/vhost.c (100%)
 rename lib/{librte_vhost => vhost}/vhost.h (100%)
 rename lib/{librte_vhost => vhost}/vhost_crypto.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_net.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2550d950d..6a80ef7fa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -114,8 +114,8 @@ F: .ci/
 ABI Policy & Versioning
 M: Ray Kinsella <mdr@ashroe.eu>
 M: Neil Horman <nhorman@tuxdriver.com>
-F: lib/librte_eal/include/rte_compat.h
-F: lib/librte_eal/include/rte_function_versioning.h
+F: lib/eal/include/rte_compat.h
+F: lib/eal/include/rte_function_versioning.h
 F: doc/guides/contributing/abi_*.rst
 F: doc/guides/rel_notes/deprecation.rst
 F: devtools/check-abi.sh
@@ -145,10 +145,10 @@ Environment Abstraction Layer
 T: git://dpdk.org/dpdk
 
 EAL API and common code
-F: lib/librte_eal/common/
-F: lib/librte_eal/unix/
-F: lib/librte_eal/include/
-F: lib/librte_eal/version.map
+F: lib/eal/common/
+F: lib/eal/unix/
+F: lib/eal/include/
+F: lib/eal/version.map
 F: doc/guides/prog_guide/env_abstraction_layer.rst
 F: app/test/test_alarm.c
 F: app/test/test_atomic.c
@@ -176,24 +176,24 @@ F: app/test/test_version.c
 Trace - EXPERIMENTAL
 M: Jerin Jacob <jerinj@marvell.com>
 M: Sunil Kumar Kori <skori@marvell.com>
-F: lib/librte_eal/include/rte_trace*.h
-F: lib/librte_eal/common/eal_common_trace*.c
-F: lib/librte_eal/common/eal_trace.h
+F: lib/eal/include/rte_trace*.h
+F: lib/eal/common/eal_common_trace*.c
+F: lib/eal/common/eal_trace.h
 F: doc/guides/prog_guide/trace_lib.rst
 F: app/test/test_trace*
 
 Memory Allocation
 M: Anatoly Burakov <anatoly.burakov@intel.com>
-F: lib/librte_eal/include/rte_fbarray.h
-F: lib/librte_eal/include/rte_mem*
-F: lib/librte_eal/include/rte_malloc.h
-F: lib/librte_eal/common/*malloc*
-F: lib/librte_eal/common/eal_common_dynmem.c
-F: lib/librte_eal/common/eal_common_fbarray.c
-F: lib/librte_eal/common/eal_common_mem*
-F: lib/librte_eal/common/eal_hugepages.h
-F: lib/librte_eal/linux/eal_mem*
-F: lib/librte_eal/freebsd/eal_mem*
+F: lib/eal/include/rte_fbarray.h
+F: lib/eal/include/rte_mem*
+F: lib/eal/include/rte_malloc.h
+F: lib/eal/common/*malloc*
+F: lib/eal/common/eal_common_dynmem.c
+F: lib/eal/common/eal_common_fbarray.c
+F: lib/eal/common/eal_common_mem*
+F: lib/eal/common/eal_hugepages.h
+F: lib/eal/linux/eal_mem*
+F: lib/eal/freebsd/eal_mem*
 F: doc/guides/prog_guide/env_abstraction_layer.rst
 F: app/test/test_external_mem.c
 F: app/test/test_func_reentrancy.c
@@ -204,19 +204,19 @@ F: app/test/test_memzone.c
 
 Interrupt Subsystem
 M: Harman Kalra <hkalra@marvell.com>
-F: lib/librte_eal/*/*interrupts.*
+F: lib/eal/*/*interrupts.*
 F: app/test/test_interrupts.c
 
 Keep alive
-F: lib/librte_eal/include/rte_keepalive.h
-F: lib/librte_eal/common/rte_keepalive.c
+F: lib/eal/include/rte_keepalive.h
+F: lib/eal/common/rte_keepalive.c
 F: examples/l2fwd-keepalive/
 F: doc/guides/sample_app_ug/keep_alive.rst
 
 Secondary process
 M: Anatoly Burakov <anatoly.burakov@intel.com>
 K: RTE_PROC_
-F: lib/librte_eal/common/eal_common_proc.c
+F: lib/eal/common/eal_common_proc.c
 F: doc/guides/prog_guide/multi_proc_support.rst
 F: app/test/test_mp_secondary.c
 F: examples/multi_process/
@@ -224,52 +224,52 @@ F: doc/guides/sample_app_ug/multi_process.rst
 
 Service Cores
 M: Harry van Haaren <harry.van.haaren@intel.com>
-F: lib/librte_eal/include/rte_service.h
-F: lib/librte_eal/include/rte_service_component.h
-F: lib/librte_eal/common/rte_service.c
+F: lib/eal/include/rte_service.h
+F: lib/eal/include/rte_service_component.h
+F: lib/eal/common/rte_service.c
 F: doc/guides/prog_guide/service_cores.rst
 F: app/test/test_service_cores.c
 
 Bitops
 M: Joyce Kong <joyce.kong@arm.com>
-F: lib/librte_eal/include/rte_bitops.h
+F: lib/eal/include/rte_bitops.h
 F: app/test/test_bitops.c
 
 Bitmap
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_eal/include/rte_bitmap.h
+F: lib/eal/include/rte_bitmap.h
 F: app/test/test_bitmap.c
 
 MCSlock
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/librte_eal/include/generic/rte_mcslock.h
+F: lib/eal/include/generic/rte_mcslock.h
 F: app/test/test_mcslock.c
 
 Ticketlock
 M: Joyce Kong <joyce.kong@arm.com>
-F: lib/librte_eal/include/generic/rte_ticketlock.h
+F: lib/eal/include/generic/rte_ticketlock.h
 F: app/test/test_ticketlock.c
 
 Pseudo-random Number Generation
 M: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
-F: lib/librte_eal/include/rte_random.h
-F: lib/librte_eal/common/rte_random.c
+F: lib/eal/include/rte_random.h
+F: lib/eal/common/rte_random.c
 F: app/test/test_rand_perf.c
 
 ARM v7
 M: Jan Viktorin <viktorin@rehivetech.com>
 M: Ruifeng Wang <ruifeng.wang@arm.com>
 F: config/arm/
-F: lib/librte_eal/arm/
-X: lib/librte_eal/arm/include/*_64.h
+F: lib/eal/arm/
+X: lib/eal/arm/include/*_64.h
 
 ARM v8
 M: Jerin Jacob <jerinj@marvell.com>
 M: Ruifeng Wang <ruifeng.wang@arm.com>
 F: config/arm/
 F: doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
-F: lib/librte_eal/arm/
-X: lib/librte_eal/arm/include/*_32.h
+F: lib/eal/arm/
+X: lib/eal/arm/include/*_32.h
 F: lib/*/*_arm64.*
 F: lib/*/*_neon.*
 F: drivers/*/*/*_neon.*
@@ -279,7 +279,7 @@ F: examples/*/*_neon.*
 IBM POWER (alpha)
 M: David Christensen <drc@linux.vnet.ibm.com>
 F: config/ppc/
-F: lib/librte_eal/ppc/
+F: lib/eal/ppc/
 F: lib/*/*_altivec*
 F: drivers/*/*/*_altivec.*
 F: app/*/*_altivec.*
@@ -292,7 +292,7 @@ F: config/x86/
 F: doc/guides/linux_gsg/nic_perf_intel_platform.rst
 F: buildtools/binutils-avx512-check.sh
 F: doc/guides/howto/avx512.rst
-F: lib/librte_eal/x86/
+F: lib/eal/x86/
 F: lib/*/*_sse*
 F: lib/*/*_avx*
 F: drivers/*/*/*_sse*
@@ -303,7 +303,7 @@ F: examples/*/*_sse*
 F: examples/*/*_avx*
 
 Linux EAL (with overlaps)
-F: lib/librte_eal/linux/
+F: lib/eal/linux/
 F: doc/guides/linux_gsg/
 
 Linux UIO
@@ -312,12 +312,12 @@ F: drivers/bus/pci/linux/*uio*
 
 Linux VFIO
 M: Anatoly Burakov <anatoly.burakov@intel.com>
-F: lib/librte_eal/linux/*vfio*
+F: lib/eal/linux/*vfio*
 F: drivers/bus/pci/linux/*vfio*
 
 FreeBSD EAL (with overlaps)
 M: Bruce Richardson <bruce.richardson@intel.com>
-F: lib/librte_eal/freebsd/
+F: lib/eal/freebsd/
 F: doc/guides/freebsd_gsg/
 
 FreeBSD contigmem
@@ -333,14 +333,14 @@ M: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
 M: Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>
 M: Dmitry Malloy <dmitrym@microsoft.com>
 M: Pallavi Kadam <pallavi.kadam@intel.com>
-F: lib/librte_eal/windows/
+F: lib/eal/windows/
 F: buildtools/map_to_win.py
 F: doc/guides/windows_gsg/
 
 Windows memory allocation
 M: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
-F: lib/librte_eal/windows/eal_hugepages.c
-F: lib/librte_eal/windows/eal_mem*
+F: lib/eal/windows/eal_hugepages.c
+F: lib/eal/windows/eal_mem*
 
 
 Core Libraries
@@ -350,7 +350,7 @@ T: git://dpdk.org/dpdk
 Memory pool
 M: Olivier Matz <olivier.matz@6wind.com>
 M: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
-F: lib/librte_mempool/
+F: lib/mempool/
 F: drivers/mempool/ring/
 F: doc/guides/prog_guide/mempool_lib.rst
 F: app/test/test_mempool*
@@ -359,21 +359,21 @@ F: app/test/test_func_reentrancy.c
 Ring queue
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_ring/
+F: lib/ring/
 F: doc/guides/prog_guide/ring_lib.rst
 F: app/test/test_ring*
 F: app/test/test_func_reentrancy.c
 
 Stack
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_stack/
+F: lib/stack/
 F: drivers/mempool/stack/
 F: app/test/test_stack*
 F: doc/guides/prog_guide/stack_lib.rst
 
 Packet buffer
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_mbuf/
+F: lib/mbuf/
 F: doc/guides/prog_guide/mbuf_lib.rst
 F: app/test/test_mbuf.c
 
@@ -382,7 +382,7 @@ M: Thomas Monjalon <thomas@monjalon.net>
 M: Ferruh Yigit <ferruh.yigit@intel.com>
 M: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/
+F: lib/ethdev/
 F: app/test/test_ethdev*
 F: devtools/test-null.sh
 F: doc/guides/prog_guide/switch_representation.rst
@@ -392,22 +392,22 @@ M: Ori Kam <orika@nvidia.com>
 T: git://dpdk.org/next/dpdk-next-net
 F: app/test-pmd/cmdline_flow.c
 F: doc/guides/prog_guide/rte_flow.rst
-F: lib/librte_ethdev/rte_flow*
+F: lib/ethdev/rte_flow*
 
 Traffic Management API - EXPERIMENTAL
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/rte_tm*
+F: lib/ethdev/rte_tm*
 
 Traffic Metering and Policing API - EXPERIMENTAL
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/rte_mtr*
+F: lib/ethdev/rte_mtr*
 
 Baseband API - EXPERIMENTAL
 M: Nicolas Chautru <nicolas.chautru@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_bbdev/
+F: lib/bbdev/
 F: doc/guides/prog_guide/bbdev.rst
 F: drivers/baseband/
 F: doc/guides/bbdevs/
@@ -419,7 +419,7 @@ F: doc/guides/sample_app_ug/bbdev_app.rst
 Crypto API
 M: Declan Doherty <declan.doherty@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_cryptodev/
+F: lib/cryptodev/
 F: app/test/test_cryptodev*
 F: examples/l2fwd-crypto/
 
@@ -427,7 +427,7 @@ Security API
 M: Akhil Goyal <gakhil@marvell.com>
 M: Declan Doherty <declan.doherty@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_security/
+F: lib/security/
 F: doc/guides/prog_guide/rte_security.rst
 F: app/test/test_security.c
 
@@ -435,7 +435,7 @@ Compression API - EXPERIMENTAL
 M: Fiona Trahe <fiona.trahe@intel.com>
 M: Ashish Gupta <ashish.gupta@marvell.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_compressdev/
+F: lib/compressdev/
 F: drivers/compress/
 F: app/test/test_compressdev*
 F: doc/guides/prog_guide/compressdev.rst
@@ -443,7 +443,7 @@ F: doc/guides/compressdevs/features/default.ini
 
 RegEx API - EXPERIMENTAL
 M: Ori Kam <orika@nvidia.com>
-F: lib/librte_regexdev/
+F: lib/regexdev/
 F: app/test-regex/
 F: doc/guides/prog_guide/regexdev.rst
 F: doc/guides/regexdevs/features/default.ini
@@ -451,7 +451,7 @@ F: doc/guides/regexdevs/features/default.ini
 Eventdev API
 M: Jerin Jacob <jerinj@marvell.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/
+F: lib/eventdev/
 F: drivers/event/skeleton/
 F: app/test/test_eventdev.c
 F: examples/l3fwd/l3fwd_event*
@@ -459,35 +459,35 @@ F: examples/l3fwd/l3fwd_event*
 Eventdev Ethdev Rx Adapter API
 M: Jay Jayatheerthan <jay.jayatheerthan@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*eth_rx_adapter*
+F: lib/eventdev/*eth_rx_adapter*
 F: app/test/test_event_eth_rx_adapter.c
 F: doc/guides/prog_guide/event_ethernet_rx_adapter.rst
 
 Eventdev Ethdev Tx Adapter API
 M: Jay Jayatheerthan <jay.jayatheerthan@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*eth_tx_adapter*
+F: lib/eventdev/*eth_tx_adapter*
 F: app/test/test_event_eth_tx_adapter.c
 F: doc/guides/prog_guide/event_ethernet_tx_adapter.rst
 
 Eventdev Timer Adapter API
 M: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*timer_adapter*
+F: lib/eventdev/*timer_adapter*
 F: app/test/test_event_timer_adapter.c
 F: doc/guides/prog_guide/event_timer_adapter.rst
 
 Eventdev Crypto Adapter API
 M: Abhinandan Gujjar <abhinandan.gujjar@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*crypto_adapter*
+F: lib/eventdev/*crypto_adapter*
 F: app/test/test_event_crypto_adapter.c
 F: doc/guides/prog_guide/event_crypto_adapter.rst
 
 Raw device API
 M: Nipun Gupta <nipun.gupta@nxp.com>
 M: Hemant Agrawal <hemant.agrawal@nxp.com>
-F: lib/librte_rawdev/
+F: lib/rawdev/
 F: drivers/raw/skeleton/
 F: app/test/test_rawdev.c
 F: doc/guides/prog_guide/rawdev.rst
@@ -561,7 +561,7 @@ F: examples/bond/
 Linux KNI
 M: Ferruh Yigit <ferruh.yigit@intel.com>
 F: kernel/linux/kni/
-F: lib/librte_kni/
+F: lib/kni/
 F: doc/guides/prog_guide/kernel_nic_interface.rst
 F: app/test/test_kni.c
 F: examples/kni/
@@ -913,7 +913,7 @@ Vhost-user
 M: Maxime Coquelin <maxime.coquelin@redhat.com>
 M: Chenbo Xia <chenbo.xia@intel.com>
 T: git://dpdk.org/next/dpdk-next-virtio
-F: lib/librte_vhost/
+F: lib/vhost/
 F: doc/guides/prog_guide/vhost_lib.rst
 F: examples/vhost/
 F: doc/guides/sample_app_ug/vhost.rst
@@ -1307,19 +1307,19 @@ Packet processing
 
 Network headers
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_net/
+F: lib/net/
 
 Packet CRC
 M: Jasvinder Singh <jasvinder.singh@intel.com>
-F: lib/librte_net/net_crc.h
-F: lib/librte_net/rte_net_crc*
-F: lib/librte_net/net_crc_avx512.c
-F: lib/librte_net/net_crc_sse.c
+F: lib/net/net_crc.h
+F: lib/net/rte_net_crc*
+F: lib/net/net_crc_avx512.c
+F: lib/net/net_crc_sse.c
 F: app/test/test_crc.c
 
 IP fragmentation & reassembly
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_ip_frag/
+F: lib/ip_frag/
 F: doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
 F: app/test/test_ipfrag.c
 F: examples/ip_fragmentation/
@@ -1329,18 +1329,18 @@ F: doc/guides/sample_app_ug/ip_reassembly.rst
 
 Generic Receive Offload - EXPERIMENTAL
 M: Jiayu Hu <jiayu.hu@intel.com>
-F: lib/librte_gro/
+F: lib/gro/
 F: doc/guides/prog_guide/generic_receive_offload_lib.rst
 
 Generic Segmentation Offload
 M: Jiayu Hu <jiayu.hu@intel.com>
-F: lib/librte_gso/
+F: lib/gso/
 F: doc/guides/prog_guide/generic_segmentation_offload_lib.rst
 
 IPsec
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_ipsec/
+F: lib/ipsec/
 M: Bernard Iremonger <bernard.iremonger@intel.com>
 F: app/test/test_ipsec*
 F: doc/guides/prog_guide/ipsec_lib.rst
@@ -1349,7 +1349,7 @@ F: app/test-sad/
 
 Flow Classify - EXPERIMENTAL
 M: Bernard Iremonger <bernard.iremonger@intel.com>
-F: lib/librte_flow_classify/
+F: lib/flow_classify/
 F: app/test/test_flow_classify*
 F: doc/guides/prog_guide/flow_classify_lib.rst
 F: examples/flow_classify/
@@ -1357,7 +1357,7 @@ F: doc/guides/sample_app_ug/flow_classify.rst
 
 Distributor
 M: David Hunt <david.hunt@intel.com>
-F: lib/librte_distributor/
+F: lib/distributor/
 F: doc/guides/prog_guide/packet_distrib_lib.rst
 F: app/test/test_distributor*
 F: examples/distributor/
@@ -1365,7 +1365,7 @@ F: doc/guides/sample_app_ug/dist_app.rst
 
 Reorder
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_reorder/
+F: lib/reorder/
 F: doc/guides/prog_guide/reorder_lib.rst
 F: app/test/test_reorder*
 F: examples/packet_ordering/
@@ -1374,7 +1374,7 @@ F: doc/guides/sample_app_ug/packet_ordering.rst
 Hierarchical scheduler
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 M: Jasvinder Singh <jasvinder.singh@intel.com>
-F: lib/librte_sched/
+F: lib/sched/
 F: doc/guides/prog_guide/qos_framework.rst
 F: app/test/test_red.c
 F: app/test/test_sched.c
@@ -1383,7 +1383,7 @@ F: doc/guides/sample_app_ug/qos_scheduler.rst
 
 Packet capture
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_pdump/
+F: lib/pdump/
 F: doc/guides/prog_guide/pdump_lib.rst
 F: app/test/test_pdump.*
 F: app/pdump/
@@ -1393,9 +1393,9 @@ F: doc/guides/tools/pdump.rst
 Packet Framework
 ----------------
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_pipeline/
-F: lib/librte_port/
-F: lib/librte_table/
+F: lib/pipeline/
+F: lib/port/
+F: lib/table/
 F: doc/guides/prog_guide/packet_framework.rst
 F: app/test/test_table*
 F: app/test-pipeline/
@@ -1410,7 +1410,7 @@ Algorithms
 
 ACL
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_acl/
+F: lib/acl/
 F: doc/guides/prog_guide/packet_classif_access_ctrl.rst
 F: app/test-acl/
 F: app/test/test_acl.*
@@ -1420,7 +1420,7 @@ F: doc/guides/sample_app_ug/l3_forward_access_ctrl.rst
 EFD
 M: Byron Marohn <byron.marohn@intel.com>
 M: Yipeng Wang <yipeng1.wang@intel.com>
-F: lib/librte_efd/
+F: lib/efd/
 F: doc/guides/prog_guide/efd_lib.rst
 F: app/test/test_efd*
 F: examples/server_node_efd/
@@ -1430,7 +1430,7 @@ Hashes
 M: Yipeng Wang <yipeng1.wang@intel.com>
 M: Sameh Gobriel <sameh.gobriel@intel.com>
 M: Bruce Richardson <bruce.richardson@intel.com>
-F: lib/librte_hash/
+F: lib/hash/
 F: doc/guides/prog_guide/hash_lib.rst
 F: app/test/test_*hash*
 F: app/test/test_func_reentrancy.c
@@ -1438,7 +1438,7 @@ F: app/test/test_func_reentrancy.c
 LPM
 M: Bruce Richardson <bruce.richardson@intel.com>
 M: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
-F: lib/librte_lpm/
+F: lib/lpm/
 F: doc/guides/prog_guide/lpm*
 F: app/test/test_lpm*
 F: app/test/test_func_reentrancy.c
@@ -1447,21 +1447,21 @@ F: app/test/test_xmmt_ops.h
 Membership - EXPERIMENTAL
 M: Yipeng Wang <yipeng1.wang@intel.com>
 M: Sameh Gobriel <sameh.gobriel@intel.com>
-F: lib/librte_member/
+F: lib/member/
 F: doc/guides/prog_guide/member_lib.rst
 F: app/test/test_member*
 
 RIB/FIB - EXPERIMENTAL
 M: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
-F: lib/librte_rib/
+F: lib/rib/
 F: app/test/test_rib*
-F: lib/librte_fib/
+F: lib/fib/
 F: app/test/test_fib*
 F: app/test-fib/
 
 Traffic metering
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_meter/
+F: lib/meter/
 F: doc/guides/sample_app_ug/qos_scheduler.rst
 F: app/test/test_meter.c
 F: examples/qos_meter/
@@ -1473,13 +1473,13 @@ Other libraries
 
 Configuration file
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_cfgfile/
+F: lib/cfgfile/
 F: app/test/test_cfgfile.c
 F: app/test/test_cfgfiles/
 
 Interactive command line
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_cmdline/
+F: lib/cmdline/
 F: app/test-cmdline/
 F: app/test/test_cmdline*
 F: examples/cmdline/
@@ -1487,22 +1487,22 @@ F: doc/guides/sample_app_ug/cmd_line.rst
 
 Key/Value parsing
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_kvargs/
+F: lib/kvargs/
 F: app/test/test_kvargs.c
 
 RCU
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/librte_rcu/
+F: lib/rcu/
 F: app/test/test_rcu*
 F: doc/guides/prog_guide/rcu_lib.rst
 
 PCI
 M: Gaetan Rivet <grive@u256.net>
-F: lib/librte_pci/
+F: lib/pci/
 
 Power management
 M: David Hunt <david.hunt@intel.com>
-F: lib/librte_power/
+F: lib/power/
 F: doc/guides/prog_guide/power_man.rst
 F: app/test/test_power*
 F: examples/l3fwd-power/
@@ -1513,40 +1513,40 @@ F: doc/guides/sample_app_ug/vm_power_management.rst
 Timers
 M: Robert Sanford <rsanford@akamai.com>
 M: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
-F: lib/librte_timer/
+F: lib/timer/
 F: doc/guides/prog_guide/timer_lib.rst
 F: app/test/test_timer*
 F: examples/timer/
 F: doc/guides/sample_app_ug/timer.rst
 
 Job statistics
-F: lib/librte_jobstats/
+F: lib/jobstats/
 F: examples/l2fwd-jobstats/
 F: doc/guides/sample_app_ug/l2_forward_job_stats.rst
 
 Metrics
-F: lib/librte_metrics/
+F: lib/metrics/
 F: app/test/test_metrics.c
 
 Bit-rate statistics
-F: lib/librte_bitratestats/
+F: lib/bitratestats/
 F: app/test/test_bitratestats.c
 
 Latency statistics
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_latencystats/
+F: lib/latencystats/
 F: app/test/test_latencystats.c
 
 Telemetry - EXPERIMENTAL
 M: Ciara Power <ciara.power@intel.com>
-F: lib/librte_telemetry/
+F: lib/telemetry/
 F: app/test/test_telemetry*
 F: usertools/dpdk-telemetry*
 F: doc/guides/howto/telemetry.rst
 
 BPF
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_bpf/
+F: lib/bpf/
 F: examples/bpf/
 F: app/test/test_bpf.c
 F: doc/guides/prog_guide/bpf_lib.rst
@@ -1554,7 +1554,7 @@ F: doc/guides/prog_guide/bpf_lib.rst
 Graph - EXPERIMENTAL
 M: Jerin Jacob <jerinj@marvell.com>
 M: Kiran Kumar K <kirankumark@marvell.com>
-F: lib/librte_graph/
+F: lib/graph/
 F: doc/guides/prog_guide/graph_lib.rst
 F: app/test/test_graph*
 M: Nithin Dabilpuram <ndabilpuram@marvell.com>
@@ -1564,7 +1564,7 @@ F: doc/guides/sample_app_ug/l3_forward_graph.rst
 Nodes - EXPERIMENTAL
 M: Nithin Dabilpuram <ndabilpuram@marvell.com>
 M: Pavan Nikhilesh <pbhagavatula@marvell.com>
-F: lib/librte_node/
+F: lib/node/
 
 
 Test Applications
diff --git a/app/test/test_eal_fs.c b/app/test/test_eal_fs.c
index cae624f82..bb93b82a4 100644
--- a/app/test/test_eal_fs.c
+++ b/app/test/test_eal_fs.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 /* eal_filesystem.h is not a public header file, so use relative path */
-#include "../../lib/librte_eal/common/eal_filesystem.h"
+#include "../../lib/eal/common/eal_filesystem.h"
 
 static int
 test_parse_sysfs_value(void)
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 0343b0326..03a9d1d3b 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -18,7 +18,7 @@
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
-#include "../../lib/librte_eal/common/malloc_elem.h"
+#include "../../lib/eal/common/malloc_elem.h"
 
 #include "test.h"
 
diff --git a/app/test/test_telemetry_json.c b/app/test/test_telemetry_json.c
index 7a91490f4..3171ab12e 100644
--- a/app/test/test_telemetry_json.c
+++ b/app/test/test_telemetry_json.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include "../../lib/librte_telemetry/telemetry_json.h"
+#include "../../lib/telemetry/telemetry_json.h"
 #include "test.h"
 
 static int
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 3a1c1a598..e6e07aaf9 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -7,7 +7,7 @@
 flags_common = [
         # Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
         # to determine the best threshold in code. Refer to notes in source file
-        # (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
+        # (lib/eal/arm/include/rte_memcpy_64.h) for more info.
         ['RTE_ARCH_ARM64_MEMCPY', false],
         #    ['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
         #    ['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
index 8fa01ad17..0361135d6 100755
--- a/devtools/build-tags.sh
+++ b/devtools/build-tags.sh
@@ -67,13 +67,13 @@ common_sources()
 
 linux_sources()
 {
-	find_sources "lib/librte_eal/linux" '*.[chS]'
+	find_sources "lib/eal/linux" '*.[chS]'
 	find_sources "kernel/linux" '*.[chS]'
 }
 
 bsd_sources()
 {
-	find_sources "lib/librte_eal/freebsd" '*.[chS]'
+	find_sources "lib/eal/freebsd" '*.[chS]'
 	find_sources "kernel/freebsd" '*.[chS]'
 }
 
@@ -85,14 +85,14 @@ arm_common()
 arm_32_sources()
 {
 	arm_common
-	find_sources "lib/librte_eal/arm" '*.[chS]' \
+	find_sources "lib/eal/arm" '*.[chS]' \
 					"$skip_64b_files"
 }
 
 arm_64_sources()
 {
 	arm_common
-	find_sources "lib/librte_eal/arm" '*.[chS]' \
+	find_sources "lib/eal/arm" '*.[chS]' \
 					 "$skip_32b_files"
 	find_sources "$source_dirs" '*arm64.[chS]'
 }
@@ -108,20 +108,20 @@ x86_common()
 x86_32_sources()
 {
 	x86_common
-	find_sources "lib/librte_eal/x86" '*.[chS]' \
+	find_sources "lib/eal/x86" '*.[chS]' \
 					"$skip_64b_files"
 }
 
 x86_64_sources()
 {
 	x86_common
-	find_sources "lib/librte_eal/x86" '*.[chS]' \
+	find_sources "lib/eal/x86" '*.[chS]' \
 					"$skip_32b_files"
 }
 
 ppc_64_sources()
 {
-	find_sources "lib/librte_eal/ppc" '*.[chS]'
+	find_sources "lib/eal/ppc" '*.[chS]'
 	find_sources "$source_dirs" '*altivec*.[chS]'
 }
 
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 3c7ee4608..325a0195c 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -24,58 +24,58 @@ INPUT                   = @TOPDIR@/doc/api/doxy-api-index.md \
                           @TOPDIR@/drivers/raw/dpaa2_qdma \
                           @TOPDIR@/drivers/raw/ifpga \
                           @TOPDIR@/drivers/raw/ioat \
-                          @TOPDIR@/lib/librte_eal/include \
-                          @TOPDIR@/lib/librte_eal/include/generic \
-                          @TOPDIR@/lib/librte_acl \
-                          @TOPDIR@/lib/librte_bbdev \
-                          @TOPDIR@/lib/librte_bitratestats \
-                          @TOPDIR@/lib/librte_bpf \
-                          @TOPDIR@/lib/librte_cfgfile \
-                          @TOPDIR@/lib/librte_cmdline \
-                          @TOPDIR@/lib/librte_compressdev \
-                          @TOPDIR@/lib/librte_cryptodev \
-                          @TOPDIR@/lib/librte_distributor \
-                          @TOPDIR@/lib/librte_efd \
-                          @TOPDIR@/lib/librte_ethdev \
-                          @TOPDIR@/lib/librte_eventdev \
-                          @TOPDIR@/lib/librte_fib \
-                          @TOPDIR@/lib/librte_flow_classify \
-                          @TOPDIR@/lib/librte_graph \
-                          @TOPDIR@/lib/librte_gro \
-                          @TOPDIR@/lib/librte_gso \
-                          @TOPDIR@/lib/librte_hash \
-                          @TOPDIR@/lib/librte_ip_frag \
-                          @TOPDIR@/lib/librte_ipsec \
-                          @TOPDIR@/lib/librte_jobstats \
-                          @TOPDIR@/lib/librte_kni \
-                          @TOPDIR@/lib/librte_kvargs \
-                          @TOPDIR@/lib/librte_latencystats \
-                          @TOPDIR@/lib/librte_lpm \
-                          @TOPDIR@/lib/librte_mbuf \
-                          @TOPDIR@/lib/librte_member \
-                          @TOPDIR@/lib/librte_mempool \
-                          @TOPDIR@/lib/librte_meter \
-                          @TOPDIR@/lib/librte_metrics \
-                          @TOPDIR@/lib/librte_node \
-                          @TOPDIR@/lib/librte_net \
-                          @TOPDIR@/lib/librte_pci \
-                          @TOPDIR@/lib/librte_pdump \
-                          @TOPDIR@/lib/librte_pipeline \
-                          @TOPDIR@/lib/librte_port \
-                          @TOPDIR@/lib/librte_power \
-                          @TOPDIR@/lib/librte_rawdev \
-                          @TOPDIR@/lib/librte_rcu \
-                          @TOPDIR@/lib/librte_regexdev \
-                          @TOPDIR@/lib/librte_reorder \
-                          @TOPDIR@/lib/librte_rib \
-                          @TOPDIR@/lib/librte_ring \
-                          @TOPDIR@/lib/librte_sched \
-                          @TOPDIR@/lib/librte_security \
-                          @TOPDIR@/lib/librte_stack \
-                          @TOPDIR@/lib/librte_table \
-                          @TOPDIR@/lib/librte_telemetry \
-                          @TOPDIR@/lib/librte_timer \
-                          @TOPDIR@/lib/librte_vhost
+                          @TOPDIR@/lib/eal/include \
+                          @TOPDIR@/lib/eal/include/generic \
+                          @TOPDIR@/lib/acl \
+                          @TOPDIR@/lib/bbdev \
+                          @TOPDIR@/lib/bitratestats \
+                          @TOPDIR@/lib/bpf \
+                          @TOPDIR@/lib/cfgfile \
+                          @TOPDIR@/lib/cmdline \
+                          @TOPDIR@/lib/compressdev \
+                          @TOPDIR@/lib/cryptodev \
+                          @TOPDIR@/lib/distributor \
+                          @TOPDIR@/lib/efd \
+                          @TOPDIR@/lib/ethdev \
+                          @TOPDIR@/lib/eventdev \
+                          @TOPDIR@/lib/fib \
+                          @TOPDIR@/lib/flow_classify \
+                          @TOPDIR@/lib/graph \
+                          @TOPDIR@/lib/gro \
+                          @TOPDIR@/lib/gso \
+                          @TOPDIR@/lib/hash \
+                          @TOPDIR@/lib/ip_frag \
+                          @TOPDIR@/lib/ipsec \
+                          @TOPDIR@/lib/jobstats \
+                          @TOPDIR@/lib/kni \
+                          @TOPDIR@/lib/kvargs \
+                          @TOPDIR@/lib/latencystats \
+                          @TOPDIR@/lib/lpm \
+                          @TOPDIR@/lib/mbuf \
+                          @TOPDIR@/lib/member \
+                          @TOPDIR@/lib/mempool \
+                          @TOPDIR@/lib/meter \
+                          @TOPDIR@/lib/metrics \
+                          @TOPDIR@/lib/node \
+                          @TOPDIR@/lib/net \
+                          @TOPDIR@/lib/pci \
+                          @TOPDIR@/lib/pdump \
+                          @TOPDIR@/lib/pipeline \
+                          @TOPDIR@/lib/port \
+                          @TOPDIR@/lib/power \
+                          @TOPDIR@/lib/rawdev \
+                          @TOPDIR@/lib/rcu \
+                          @TOPDIR@/lib/regexdev \
+                          @TOPDIR@/lib/reorder \
+                          @TOPDIR@/lib/rib \
+                          @TOPDIR@/lib/ring \
+                          @TOPDIR@/lib/sched \
+                          @TOPDIR@/lib/security \
+                          @TOPDIR@/lib/stack \
+                          @TOPDIR@/lib/table \
+                          @TOPDIR@/lib/telemetry \
+                          @TOPDIR@/lib/timer \
+                          @TOPDIR@/lib/vhost
 INPUT                   += @API_EXAMPLES@
 FILE_PATTERNS           = rte_*.h \
                           cmdline.h
diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
index 91ada18dd..7ff18f4f7 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -58,12 +58,12 @@ persists over multiple releases.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_21 {
         global:
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_21 {
         global:
  ...
@@ -77,7 +77,7 @@ that library.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_21 {
         global:
  ...
@@ -88,7 +88,7 @@ that library.
  } DPDK_21;
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_21 {
         global:
  ...
@@ -100,12 +100,12 @@ how this may be done.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_22 {
         global:
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_22 {
         global:
  ...
diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index fdcd21861..ba69c82fb 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -759,7 +759,7 @@ Examples:
  * The virtio network PMD in ``drivers/net/virtio`` uses ``pmd.net.virtio``
  * The eventdev software poll mode driver in ``drivers/event/sw`` uses ``pmd.event.sw``
  * The octeontx mempool driver in ``drivers/mempool/octeontx`` uses ``pmd.mempool.octeontx``
- * The DPDK hash library in ``lib/librte_hash`` uses ``lib.hash``
+ * The DPDK hash library in ``lib/hash`` uses ``lib.hash``
 
 Specializations
 ~~~~~~~~~~~~~~~
@@ -926,7 +926,7 @@ name
 	If a library's .so or .a file differs from that given in the directory
 	name, the name should be specified using this variable. In practice,
 	since the convention is that for a library called ``librte_xyz.so``, the
-	sources are stored in a directory ``lib/librte_xyz``, this value should
+	sources are stored in a directory ``lib/xyz``, this value should
 	never be needed for new libraries.
 
 .. note::
diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index a4e6be6ac..842549a4c 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -19,10 +19,10 @@ The DPDK source code repository contains input files to build the API documentat
 The main directories that contain files related to documentation are shown below::
 
    lib
-   |-- librte_acl
-   |-- librte_cfgfile
-   |-- librte_cmdline
-   |-- librte_eal
+   |-- acl
+   |-- cfgfile
+   |-- cmdline
+   |-- eal
    |   |-- ...
    ...
    doc
@@ -40,7 +40,7 @@ The main directories that contain files related to documentation are shown below
 
 
 The API documentation is built from `Doxygen <http://www.doxygen.nl>`_ comments in the header files.
-These files are mainly in the ``lib/librte_*`` directories although some of the Poll Mode Drivers in ``drivers/net``
+These files are mainly in the ``lib/*`` directories although some of the Poll Mode Drivers in ``drivers/net``
 are also documented with Doxygen.
 
 The configuration files that are used to control the Doxygen output are in the ``doc/api`` directory.
diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst
index 8b18cd169..7547059a0 100644
--- a/doc/guides/prog_guide/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/event_timer_adapter.rst
@@ -35,7 +35,7 @@ device upon timer expiration.
 
 The Event Timer Adapter API represents each event timer with a generic struct,
 which contains an event and user metadata.  The ``rte_event_timer`` struct is
-defined in ``lib/librte_event/librte_event_timer_adapter.h``.
+defined in ``lib/event/librte_event_timer_adapter.h``.
 
 .. _timer_expiry_event:
 
diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst
index 4e4ea33cc..7d410d3cc 100644
--- a/doc/guides/prog_guide/qos_framework.rst
+++ b/doc/guides/prog_guide/qos_framework.rst
@@ -1517,9 +1517,9 @@ Source Files Location
 
 The source files for the DPDK dropper are located at:
 
-*   DPDK/lib/librte_sched/rte_red.h
+*   DPDK/lib/sched/rte_red.h
 
-*   DPDK/lib/librte_sched/rte_red.c
+*   DPDK/lib/sched/rte_red.c
 
 Integration with the DPDK QoS Scheduler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/guides/prog_guide/rawdev.rst b/doc/guides/prog_guide/rawdev.rst
index a712c7fa9..488e0a7ef 100644
--- a/doc/guides/prog_guide/rawdev.rst
+++ b/doc/guides/prog_guide/rawdev.rst
@@ -13,7 +13,7 @@ In terms of device flavor (type) support, DPDK currently has ethernet
 
 For a new type of device, for example an accelerator, there are not many
 options except:
-1. create another lib/librte_MySpecialDev, driver/MySpecialDrv and use it
+1. create another lib/MySpecialDev, driver/MySpecialDrv and use it
 through Bus/PMD model.
 2. Or, create a vdev and implement necessary custom APIs which are directly
 exposed from driver layer. However this may still require changes in bus code
diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst
index ee3ed1e65..43323e1a4 100644
--- a/doc/guides/rel_notes/known_issues.rst
+++ b/doc/guides/rel_notes/known_issues.rst
@@ -127,7 +127,7 @@ HPET timers do not work on the Osage customer reference platform
    work correctly, provided the BIOS supports HPET.
 
 **Driver/Module**:
-   ``lib/librte_eal/include/rte_cycles.h``
+   ``lib/eal/include/rte_cycles.h``
 
 
 Not all variants of supported NIC types have been used in testing
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 36ceab30e..5d1fe80f1 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -206,7 +206,7 @@ if dlopen_ibverbs
     dlopen_sources = files('mlx5_glue.c')
     dlopen_install_dir = [ eal_pmd_path + '-glue' ]
     dlopen_includes = [global_inc]
-    dlopen_includes += include_directories('../../../../lib/librte_eal/include/generic')
+    dlopen_includes += include_directories('../../../../lib/eal/include/generic')
     shared_lib = shared_library(
             dlopen_lib_name,
             dlopen_sources,
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 950f41132..7ecf3aa33 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
 
-includes += include_directories('../../../lib/librte_vhost')
+includes += include_directories('../../../lib/vhost')
 deps += 'bus_pci'
 sources = files('virtio_cryptodev.c', 'virtio_pci.c',
         'virtio_rxtx.c', 'virtqueue.c')
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index f43860bcb..c15c78b0b 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -18,8 +18,8 @@ custom_target('rte_kni',
             'M=' + meson.current_build_dir(),
             'src=' + meson.current_source_dir(),
             'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
-            ' -I' + meson.source_root() + '/lib/librte_eal/include' +
-            ' -I' + meson.source_root() + '/lib/librte_kni' +
+            ' -I' + meson.source_root() + '/lib/eal/include' +
+            ' -I' + meson.source_root() + '/lib/kni' +
             ' -I' + meson.build_root() +
             ' -I' + meson.current_source_dir(),
             'modules'] + cross_args,
diff --git a/lib/librte_acl/acl.h b/lib/acl/acl.h
similarity index 100%
rename from lib/librte_acl/acl.h
rename to lib/acl/acl.h
diff --git a/lib/librte_acl/acl_bld.c b/lib/acl/acl_bld.c
similarity index 100%
rename from lib/librte_acl/acl_bld.c
rename to lib/acl/acl_bld.c
diff --git a/lib/librte_acl/acl_gen.c b/lib/acl/acl_gen.c
similarity index 100%
rename from lib/librte_acl/acl_gen.c
rename to lib/acl/acl_gen.c
diff --git a/lib/librte_acl/acl_run.h b/lib/acl/acl_run.h
similarity index 100%
rename from lib/librte_acl/acl_run.h
rename to lib/acl/acl_run.h
diff --git a/lib/librte_acl/acl_run_altivec.c b/lib/acl/acl_run_altivec.c
similarity index 100%
rename from lib/librte_acl/acl_run_altivec.c
rename to lib/acl/acl_run_altivec.c
diff --git a/lib/librte_acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h
similarity index 100%
rename from lib/librte_acl/acl_run_altivec.h
rename to lib/acl/acl_run_altivec.h
diff --git a/lib/librte_acl/acl_run_avx2.c b/lib/acl/acl_run_avx2.c
similarity index 100%
rename from lib/librte_acl/acl_run_avx2.c
rename to lib/acl/acl_run_avx2.c
diff --git a/lib/librte_acl/acl_run_avx2.h b/lib/acl/acl_run_avx2.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx2.h
rename to lib/acl/acl_run_avx2.h
diff --git a/lib/librte_acl/acl_run_avx512.c b/lib/acl/acl_run_avx512.c
similarity index 100%
rename from lib/librte_acl/acl_run_avx512.c
rename to lib/acl/acl_run_avx512.c
diff --git a/lib/librte_acl/acl_run_avx512_common.h b/lib/acl/acl_run_avx512_common.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512_common.h
rename to lib/acl/acl_run_avx512_common.h
diff --git a/lib/librte_acl/acl_run_avx512x16.h b/lib/acl/acl_run_avx512x16.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512x16.h
rename to lib/acl/acl_run_avx512x16.h
diff --git a/lib/librte_acl/acl_run_avx512x8.h b/lib/acl/acl_run_avx512x8.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512x8.h
rename to lib/acl/acl_run_avx512x8.h
diff --git a/lib/librte_acl/acl_run_neon.c b/lib/acl/acl_run_neon.c
similarity index 100%
rename from lib/librte_acl/acl_run_neon.c
rename to lib/acl/acl_run_neon.c
diff --git a/lib/librte_acl/acl_run_neon.h b/lib/acl/acl_run_neon.h
similarity index 100%
rename from lib/librte_acl/acl_run_neon.h
rename to lib/acl/acl_run_neon.h
diff --git a/lib/librte_acl/acl_run_scalar.c b/lib/acl/acl_run_scalar.c
similarity index 100%
rename from lib/librte_acl/acl_run_scalar.c
rename to lib/acl/acl_run_scalar.c
diff --git a/lib/librte_acl/acl_run_sse.c b/lib/acl/acl_run_sse.c
similarity index 100%
rename from lib/librte_acl/acl_run_sse.c
rename to lib/acl/acl_run_sse.c
diff --git a/lib/librte_acl/acl_run_sse.h b/lib/acl/acl_run_sse.h
similarity index 100%
rename from lib/librte_acl/acl_run_sse.h
rename to lib/acl/acl_run_sse.h
diff --git a/lib/librte_acl/acl_vect.h b/lib/acl/acl_vect.h
similarity index 100%
rename from lib/librte_acl/acl_vect.h
rename to lib/acl/acl_vect.h
diff --git a/lib/librte_acl/meson.build b/lib/acl/meson.build
similarity index 100%
rename from lib/librte_acl/meson.build
rename to lib/acl/meson.build
diff --git a/lib/librte_acl/rte_acl.c b/lib/acl/rte_acl.c
similarity index 100%
rename from lib/librte_acl/rte_acl.c
rename to lib/acl/rte_acl.c
diff --git a/lib/librte_acl/rte_acl.h b/lib/acl/rte_acl.h
similarity index 100%
rename from lib/librte_acl/rte_acl.h
rename to lib/acl/rte_acl.h
diff --git a/lib/librte_acl/rte_acl_osdep.h b/lib/acl/rte_acl_osdep.h
similarity index 100%
rename from lib/librte_acl/rte_acl_osdep.h
rename to lib/acl/rte_acl_osdep.h
diff --git a/lib/librte_acl/tb_mem.c b/lib/acl/tb_mem.c
similarity index 100%
rename from lib/librte_acl/tb_mem.c
rename to lib/acl/tb_mem.c
diff --git a/lib/librte_acl/tb_mem.h b/lib/acl/tb_mem.h
similarity index 100%
rename from lib/librte_acl/tb_mem.h
rename to lib/acl/tb_mem.h
diff --git a/lib/librte_acl/version.map b/lib/acl/version.map
similarity index 100%
rename from lib/librte_acl/version.map
rename to lib/acl/version.map
diff --git a/lib/librte_bbdev/meson.build b/lib/bbdev/meson.build
similarity index 100%
rename from lib/librte_bbdev/meson.build
rename to lib/bbdev/meson.build
diff --git a/lib/librte_bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev.c
rename to lib/bbdev/rte_bbdev.c
diff --git a/lib/librte_bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev.h
rename to lib/bbdev/rte_bbdev.h
diff --git a/lib/librte_bbdev/rte_bbdev_op.h b/lib/bbdev/rte_bbdev_op.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev_op.h
rename to lib/bbdev/rte_bbdev_op.h
diff --git a/lib/librte_bbdev/rte_bbdev_pmd.h b/lib/bbdev/rte_bbdev_pmd.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev_pmd.h
rename to lib/bbdev/rte_bbdev_pmd.h
diff --git a/lib/librte_bbdev/version.map b/lib/bbdev/version.map
similarity index 100%
rename from lib/librte_bbdev/version.map
rename to lib/bbdev/version.map
diff --git a/lib/librte_bitratestats/meson.build b/lib/bitratestats/meson.build
similarity index 100%
rename from lib/librte_bitratestats/meson.build
rename to lib/bitratestats/meson.build
diff --git a/lib/librte_bitratestats/rte_bitrate.c b/lib/bitratestats/rte_bitrate.c
similarity index 100%
rename from lib/librte_bitratestats/rte_bitrate.c
rename to lib/bitratestats/rte_bitrate.c
diff --git a/lib/librte_bitratestats/rte_bitrate.h b/lib/bitratestats/rte_bitrate.h
similarity index 100%
rename from lib/librte_bitratestats/rte_bitrate.h
rename to lib/bitratestats/rte_bitrate.h
diff --git a/lib/librte_bitratestats/version.map b/lib/bitratestats/version.map
similarity index 100%
rename from lib/librte_bitratestats/version.map
rename to lib/bitratestats/version.map
diff --git a/lib/librte_bpf/bpf.c b/lib/bpf/bpf.c
similarity index 100%
rename from lib/librte_bpf/bpf.c
rename to lib/bpf/bpf.c
diff --git a/lib/librte_bpf/bpf_def.h b/lib/bpf/bpf_def.h
similarity index 100%
rename from lib/librte_bpf/bpf_def.h
rename to lib/bpf/bpf_def.h
diff --git a/lib/librte_bpf/bpf_exec.c b/lib/bpf/bpf_exec.c
similarity index 100%
rename from lib/librte_bpf/bpf_exec.c
rename to lib/bpf/bpf_exec.c
diff --git a/lib/librte_bpf/bpf_impl.h b/lib/bpf/bpf_impl.h
similarity index 100%
rename from lib/librte_bpf/bpf_impl.h
rename to lib/bpf/bpf_impl.h
diff --git a/lib/librte_bpf/bpf_jit_arm64.c b/lib/bpf/bpf_jit_arm64.c
similarity index 100%
rename from lib/librte_bpf/bpf_jit_arm64.c
rename to lib/bpf/bpf_jit_arm64.c
diff --git a/lib/librte_bpf/bpf_jit_x86.c b/lib/bpf/bpf_jit_x86.c
similarity index 100%
rename from lib/librte_bpf/bpf_jit_x86.c
rename to lib/bpf/bpf_jit_x86.c
diff --git a/lib/librte_bpf/bpf_load.c b/lib/bpf/bpf_load.c
similarity index 100%
rename from lib/librte_bpf/bpf_load.c
rename to lib/bpf/bpf_load.c
diff --git a/lib/librte_bpf/bpf_load_elf.c b/lib/bpf/bpf_load_elf.c
similarity index 100%
rename from lib/librte_bpf/bpf_load_elf.c
rename to lib/bpf/bpf_load_elf.c
diff --git a/lib/librte_bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c
similarity index 100%
rename from lib/librte_bpf/bpf_pkt.c
rename to lib/bpf/bpf_pkt.c
diff --git a/lib/librte_bpf/bpf_validate.c b/lib/bpf/bpf_validate.c
similarity index 100%
rename from lib/librte_bpf/bpf_validate.c
rename to lib/bpf/bpf_validate.c
diff --git a/lib/librte_bpf/meson.build b/lib/bpf/meson.build
similarity index 100%
rename from lib/librte_bpf/meson.build
rename to lib/bpf/meson.build
diff --git a/lib/librte_bpf/rte_bpf.h b/lib/bpf/rte_bpf.h
similarity index 100%
rename from lib/librte_bpf/rte_bpf.h
rename to lib/bpf/rte_bpf.h
diff --git a/lib/librte_bpf/rte_bpf_ethdev.h b/lib/bpf/rte_bpf_ethdev.h
similarity index 100%
rename from lib/librte_bpf/rte_bpf_ethdev.h
rename to lib/bpf/rte_bpf_ethdev.h
diff --git a/lib/librte_bpf/version.map b/lib/bpf/version.map
similarity index 100%
rename from lib/librte_bpf/version.map
rename to lib/bpf/version.map
diff --git a/lib/librte_cfgfile/meson.build b/lib/cfgfile/meson.build
similarity index 100%
rename from lib/librte_cfgfile/meson.build
rename to lib/cfgfile/meson.build
diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
similarity index 100%
rename from lib/librte_cfgfile/rte_cfgfile.c
rename to lib/cfgfile/rte_cfgfile.c
diff --git a/lib/librte_cfgfile/rte_cfgfile.h b/lib/cfgfile/rte_cfgfile.h
similarity index 100%
rename from lib/librte_cfgfile/rte_cfgfile.h
rename to lib/cfgfile/rte_cfgfile.h
diff --git a/lib/librte_cfgfile/version.map b/lib/cfgfile/version.map
similarity index 100%
rename from lib/librte_cfgfile/version.map
rename to lib/cfgfile/version.map
diff --git a/lib/librte_cmdline/cmdline.c b/lib/cmdline/cmdline.c
similarity index 100%
rename from lib/librte_cmdline/cmdline.c
rename to lib/cmdline/cmdline.c
diff --git a/lib/librte_cmdline/cmdline.h b/lib/cmdline/cmdline.h
similarity index 100%
rename from lib/librte_cmdline/cmdline.h
rename to lib/cmdline/cmdline.h
diff --git a/lib/librte_cmdline/cmdline_cirbuf.c b/lib/cmdline/cmdline_cirbuf.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_cirbuf.c
rename to lib/cmdline/cmdline_cirbuf.c
diff --git a/lib/librte_cmdline/cmdline_cirbuf.h b/lib/cmdline/cmdline_cirbuf.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_cirbuf.h
rename to lib/cmdline/cmdline_cirbuf.h
diff --git a/lib/librte_cmdline/cmdline_os_unix.c b/lib/cmdline/cmdline_os_unix.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_os_unix.c
rename to lib/cmdline/cmdline_os_unix.c
diff --git a/lib/librte_cmdline/cmdline_os_windows.c b/lib/cmdline/cmdline_os_windows.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_os_windows.c
rename to lib/cmdline/cmdline_os_windows.c
diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/cmdline/cmdline_parse.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse.c
rename to lib/cmdline/cmdline_parse.c
diff --git a/lib/librte_cmdline/cmdline_parse.h b/lib/cmdline/cmdline_parse.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse.h
rename to lib/cmdline/cmdline_parse.h
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/cmdline/cmdline_parse_etheraddr.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_etheraddr.c
rename to lib/cmdline/cmdline_parse_etheraddr.c
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.h b/lib/cmdline/cmdline_parse_etheraddr.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_etheraddr.h
rename to lib/cmdline/cmdline_parse_etheraddr.h
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/cmdline/cmdline_parse_ipaddr.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_ipaddr.c
rename to lib/cmdline/cmdline_parse_ipaddr.c
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.h b/lib/cmdline/cmdline_parse_ipaddr.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_ipaddr.h
rename to lib/cmdline/cmdline_parse_ipaddr.h
diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/cmdline/cmdline_parse_num.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_num.c
rename to lib/cmdline/cmdline_parse_num.c
diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/cmdline/cmdline_parse_num.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_num.h
rename to lib/cmdline/cmdline_parse_num.h
diff --git a/lib/librte_cmdline/cmdline_parse_portlist.c b/lib/cmdline/cmdline_parse_portlist.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_portlist.c
rename to lib/cmdline/cmdline_parse_portlist.c
diff --git a/lib/librte_cmdline/cmdline_parse_portlist.h b/lib/cmdline/cmdline_parse_portlist.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_portlist.h
rename to lib/cmdline/cmdline_parse_portlist.h
diff --git a/lib/librte_cmdline/cmdline_parse_string.c b/lib/cmdline/cmdline_parse_string.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_string.c
rename to lib/cmdline/cmdline_parse_string.c
diff --git a/lib/librte_cmdline/cmdline_parse_string.h b/lib/cmdline/cmdline_parse_string.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_string.h
rename to lib/cmdline/cmdline_parse_string.h
diff --git a/lib/librte_cmdline/cmdline_private.h b/lib/cmdline/cmdline_private.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_private.h
rename to lib/cmdline/cmdline_private.h
diff --git a/lib/librte_cmdline/cmdline_rdline.c b/lib/cmdline/cmdline_rdline.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_rdline.c
rename to lib/cmdline/cmdline_rdline.c
diff --git a/lib/librte_cmdline/cmdline_rdline.h b/lib/cmdline/cmdline_rdline.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_rdline.h
rename to lib/cmdline/cmdline_rdline.h
diff --git a/lib/librte_cmdline/cmdline_socket.c b/lib/cmdline/cmdline_socket.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_socket.c
rename to lib/cmdline/cmdline_socket.c
diff --git a/lib/librte_cmdline/cmdline_socket.h b/lib/cmdline/cmdline_socket.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_socket.h
rename to lib/cmdline/cmdline_socket.h
diff --git a/lib/librte_cmdline/cmdline_vt100.c b/lib/cmdline/cmdline_vt100.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_vt100.c
rename to lib/cmdline/cmdline_vt100.c
diff --git a/lib/librte_cmdline/cmdline_vt100.h b/lib/cmdline/cmdline_vt100.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_vt100.h
rename to lib/cmdline/cmdline_vt100.h
diff --git a/lib/librte_cmdline/meson.build b/lib/cmdline/meson.build
similarity index 100%
rename from lib/librte_cmdline/meson.build
rename to lib/cmdline/meson.build
diff --git a/lib/librte_cmdline/version.map b/lib/cmdline/version.map
similarity index 100%
rename from lib/librte_cmdline/version.map
rename to lib/cmdline/version.map
diff --git a/lib/librte_compressdev/meson.build b/lib/compressdev/meson.build
similarity index 100%
rename from lib/librte_compressdev/meson.build
rename to lib/compressdev/meson.build
diff --git a/lib/librte_compressdev/rte_comp.c b/lib/compressdev/rte_comp.c
similarity index 100%
rename from lib/librte_compressdev/rte_comp.c
rename to lib/compressdev/rte_comp.c
diff --git a/lib/librte_compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
similarity index 100%
rename from lib/librte_compressdev/rte_comp.h
rename to lib/compressdev/rte_comp.h
diff --git a/lib/librte_compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev.c
rename to lib/compressdev/rte_compressdev.c
diff --git a/lib/librte_compressdev/rte_compressdev.h b/lib/compressdev/rte_compressdev.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev.h
rename to lib/compressdev/rte_compressdev.h
diff --git a/lib/librte_compressdev/rte_compressdev_internal.h b/lib/compressdev/rte_compressdev_internal.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_internal.h
rename to lib/compressdev/rte_compressdev_internal.h
diff --git a/lib/librte_compressdev/rte_compressdev_pmd.c b/lib/compressdev/rte_compressdev_pmd.c
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_pmd.c
rename to lib/compressdev/rte_compressdev_pmd.c
diff --git a/lib/librte_compressdev/rte_compressdev_pmd.h b/lib/compressdev/rte_compressdev_pmd.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_pmd.h
rename to lib/compressdev/rte_compressdev_pmd.h
diff --git a/lib/librte_compressdev/version.map b/lib/compressdev/version.map
similarity index 100%
rename from lib/librte_compressdev/version.map
rename to lib/compressdev/version.map
diff --git a/lib/librte_cryptodev/cryptodev_trace_points.c b/lib/cryptodev/cryptodev_trace_points.c
similarity index 100%
rename from lib/librte_cryptodev/cryptodev_trace_points.c
rename to lib/cryptodev/cryptodev_trace_points.c
diff --git a/lib/librte_cryptodev/meson.build b/lib/cryptodev/meson.build
similarity index 100%
rename from lib/librte_cryptodev/meson.build
rename to lib/cryptodev/meson.build
diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/cryptodev/rte_crypto.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto.h
rename to lib/cryptodev/rte_crypto.h
diff --git a/lib/librte_cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto_asym.h
rename to lib/cryptodev/rte_crypto_asym.h
diff --git a/lib/librte_cryptodev/rte_crypto_sym.h b/lib/cryptodev/rte_crypto_sym.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto_sym.h
rename to lib/cryptodev/rte_crypto_sym.h
diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev.c
rename to lib/cryptodev/rte_cryptodev.c
diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev.h
rename to lib/cryptodev/rte_cryptodev.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/cryptodev/rte_cryptodev_pmd.c
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_pmd.c
rename to lib/cryptodev/rte_cryptodev_pmd.c
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/cryptodev/rte_cryptodev_pmd.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_pmd.h
rename to lib/cryptodev/rte_cryptodev_pmd.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_trace.h b/lib/cryptodev/rte_cryptodev_trace.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_trace.h
rename to lib/cryptodev/rte_cryptodev_trace.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_trace_fp.h b/lib/cryptodev/rte_cryptodev_trace_fp.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_trace_fp.h
rename to lib/cryptodev/rte_cryptodev_trace_fp.h
diff --git a/lib/librte_cryptodev/version.map b/lib/cryptodev/version.map
similarity index 100%
rename from lib/librte_cryptodev/version.map
rename to lib/cryptodev/version.map
diff --git a/lib/librte_distributor/distributor_private.h b/lib/distributor/distributor_private.h
similarity index 100%
rename from lib/librte_distributor/distributor_private.h
rename to lib/distributor/distributor_private.h
diff --git a/lib/librte_distributor/meson.build b/lib/distributor/meson.build
similarity index 100%
rename from lib/librte_distributor/meson.build
rename to lib/distributor/meson.build
diff --git a/lib/librte_distributor/rte_distributor.c b/lib/distributor/rte_distributor.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor.c
rename to lib/distributor/rte_distributor.c
diff --git a/lib/librte_distributor/rte_distributor.h b/lib/distributor/rte_distributor.h
similarity index 100%
rename from lib/librte_distributor/rte_distributor.h
rename to lib/distributor/rte_distributor.h
diff --git a/lib/librte_distributor/rte_distributor_match_generic.c b/lib/distributor/rte_distributor_match_generic.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_match_generic.c
rename to lib/distributor/rte_distributor_match_generic.c
diff --git a/lib/librte_distributor/rte_distributor_match_sse.c b/lib/distributor/rte_distributor_match_sse.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_match_sse.c
rename to lib/distributor/rte_distributor_match_sse.c
diff --git a/lib/librte_distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_single.c
rename to lib/distributor/rte_distributor_single.c
diff --git a/lib/librte_distributor/rte_distributor_single.h b/lib/distributor/rte_distributor_single.h
similarity index 100%
rename from lib/librte_distributor/rte_distributor_single.h
rename to lib/distributor/rte_distributor_single.h
diff --git a/lib/librte_distributor/version.map b/lib/distributor/version.map
similarity index 100%
rename from lib/librte_distributor/version.map
rename to lib/distributor/version.map
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/eal/arm/include/meson.build
similarity index 100%
rename from lib/librte_eal/arm/include/meson.build
rename to lib/eal/arm/include/meson.build
diff --git a/lib/librte_eal/arm/include/rte_atomic.h b/lib/eal/arm/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic.h
rename to lib/eal/arm/include/rte_atomic.h
diff --git a/lib/librte_eal/arm/include/rte_atomic_32.h b/lib/eal/arm/include/rte_atomic_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic_32.h
rename to lib/eal/arm/include/rte_atomic_32.h
diff --git a/lib/librte_eal/arm/include/rte_atomic_64.h b/lib/eal/arm/include/rte_atomic_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic_64.h
rename to lib/eal/arm/include/rte_atomic_64.h
diff --git a/lib/librte_eal/arm/include/rte_byteorder.h b/lib/eal/arm/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_byteorder.h
rename to lib/eal/arm/include/rte_byteorder.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags.h b/lib/eal/arm/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags.h
rename to lib/eal/arm/include/rte_cpuflags.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags_32.h b/lib/eal/arm/include/rte_cpuflags_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags_32.h
rename to lib/eal/arm/include/rte_cpuflags_32.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags_64.h b/lib/eal/arm/include/rte_cpuflags_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags_64.h
rename to lib/eal/arm/include/rte_cpuflags_64.h
diff --git a/lib/librte_eal/arm/include/rte_cycles.h b/lib/eal/arm/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles.h
rename to lib/eal/arm/include/rte_cycles.h
diff --git a/lib/librte_eal/arm/include/rte_cycles_32.h b/lib/eal/arm/include/rte_cycles_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles_32.h
rename to lib/eal/arm/include/rte_cycles_32.h
diff --git a/lib/librte_eal/arm/include/rte_cycles_64.h b/lib/eal/arm/include/rte_cycles_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles_64.h
rename to lib/eal/arm/include/rte_cycles_64.h
diff --git a/lib/librte_eal/arm/include/rte_io.h b/lib/eal/arm/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_io.h
rename to lib/eal/arm/include/rte_io.h
diff --git a/lib/librte_eal/arm/include/rte_io_64.h b/lib/eal/arm/include/rte_io_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_io_64.h
rename to lib/eal/arm/include/rte_io_64.h
diff --git a/lib/librte_eal/arm/include/rte_mcslock.h b/lib/eal/arm/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_mcslock.h
rename to lib/eal/arm/include/rte_mcslock.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy.h b/lib/eal/arm/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy.h
rename to lib/eal/arm/include/rte_memcpy.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy_32.h b/lib/eal/arm/include/rte_memcpy_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy_32.h
rename to lib/eal/arm/include/rte_memcpy_32.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy_64.h b/lib/eal/arm/include/rte_memcpy_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy_64.h
rename to lib/eal/arm/include/rte_memcpy_64.h
diff --git a/lib/librte_eal/arm/include/rte_pause.h b/lib/eal/arm/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause.h
rename to lib/eal/arm/include/rte_pause.h
diff --git a/lib/librte_eal/arm/include/rte_pause_32.h b/lib/eal/arm/include/rte_pause_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause_32.h
rename to lib/eal/arm/include/rte_pause_32.h
diff --git a/lib/librte_eal/arm/include/rte_pause_64.h b/lib/eal/arm/include/rte_pause_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause_64.h
rename to lib/eal/arm/include/rte_pause_64.h
diff --git a/lib/librte_eal/arm/include/rte_pflock.h b/lib/eal/arm/include/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pflock.h
rename to lib/eal/arm/include/rte_pflock.h
diff --git a/lib/librte_eal/arm/include/rte_power_intrinsics.h b/lib/eal/arm/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_power_intrinsics.h
rename to lib/eal/arm/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch.h b/lib/eal/arm/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch.h
rename to lib/eal/arm/include/rte_prefetch.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch_32.h b/lib/eal/arm/include/rte_prefetch_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch_32.h
rename to lib/eal/arm/include/rte_prefetch_32.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch_64.h b/lib/eal/arm/include/rte_prefetch_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch_64.h
rename to lib/eal/arm/include/rte_prefetch_64.h
diff --git a/lib/librte_eal/arm/include/rte_rwlock.h b/lib/eal/arm/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_rwlock.h
rename to lib/eal/arm/include/rte_rwlock.h
diff --git a/lib/librte_eal/arm/include/rte_spinlock.h b/lib/eal/arm/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_spinlock.h
rename to lib/eal/arm/include/rte_spinlock.h
diff --git a/lib/librte_eal/arm/include/rte_ticketlock.h b/lib/eal/arm/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_ticketlock.h
rename to lib/eal/arm/include/rte_ticketlock.h
diff --git a/lib/librte_eal/arm/include/rte_vect.h b/lib/eal/arm/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_vect.h
rename to lib/eal/arm/include/rte_vect.h
diff --git a/lib/librte_eal/arm/meson.build b/lib/eal/arm/meson.build
similarity index 100%
rename from lib/librte_eal/arm/meson.build
rename to lib/eal/arm/meson.build
diff --git a/lib/librte_eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/arm/rte_cpuflags.c
rename to lib/eal/arm/rte_cpuflags.c
diff --git a/lib/librte_eal/arm/rte_cycles.c b/lib/eal/arm/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/arm/rte_cycles.c
rename to lib/eal/arm/rte_cycles.c
diff --git a/lib/librte_eal/arm/rte_hypervisor.c b/lib/eal/arm/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/arm/rte_hypervisor.c
rename to lib/eal/arm/rte_hypervisor.c
diff --git a/lib/librte_eal/arm/rte_power_intrinsics.c b/lib/eal/arm/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/arm/rte_power_intrinsics.c
rename to lib/eal/arm/rte_power_intrinsics.c
diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/eal/common/eal_common_bus.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_bus.c
rename to lib/eal/common/eal_common_bus.c
diff --git a/lib/librte_eal/common/eal_common_class.c b/lib/eal/common/eal_common_class.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_class.c
rename to lib/eal/common/eal_common_class.c
diff --git a/lib/librte_eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_config.c
rename to lib/eal/common/eal_common_config.c
diff --git a/lib/librte_eal/common/eal_common_cpuflags.c b/lib/eal/common/eal_common_cpuflags.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_cpuflags.c
rename to lib/eal/common/eal_common_cpuflags.c
diff --git a/lib/librte_eal/common/eal_common_debug.c b/lib/eal/common/eal_common_debug.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_debug.c
rename to lib/eal/common/eal_common_debug.c
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_dev.c
rename to lib/eal/common/eal_common_dev.c
diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_devargs.c
rename to lib/eal/common/eal_common_devargs.c
diff --git a/lib/librte_eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_dynmem.c
rename to lib/eal/common/eal_common_dynmem.c
diff --git a/lib/librte_eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_errno.c
rename to lib/eal/common/eal_common_errno.c
diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_fbarray.c
rename to lib/eal/common/eal_common_fbarray.c
diff --git a/lib/librte_eal/common/eal_common_hexdump.c b/lib/eal/common/eal_common_hexdump.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_hexdump.c
rename to lib/eal/common/eal_common_hexdump.c
diff --git a/lib/librte_eal/common/eal_common_hypervisor.c b/lib/eal/common/eal_common_hypervisor.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_hypervisor.c
rename to lib/eal/common/eal_common_hypervisor.c
diff --git a/lib/librte_eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_launch.c
rename to lib/eal/common/eal_common_launch.c
diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_lcore.c
rename to lib/eal/common/eal_common_lcore.c
diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_log.c
rename to lib/eal/common/eal_common_log.c
diff --git a/lib/librte_eal/common/eal_common_mcfg.c b/lib/eal/common/eal_common_mcfg.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_mcfg.c
rename to lib/eal/common/eal_common_mcfg.c
diff --git a/lib/librte_eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memalloc.c
rename to lib/eal/common/eal_common_memalloc.c
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memory.c
rename to lib/eal/common/eal_common_memory.c
diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memzone.c
rename to lib/eal/common/eal_common_memzone.c
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_options.c
rename to lib/eal/common/eal_common_options.c
diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_proc.c
rename to lib/eal/common/eal_common_proc.c
diff --git a/lib/librte_eal/common/eal_common_string_fns.c b/lib/eal/common/eal_common_string_fns.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_string_fns.c
rename to lib/eal/common/eal_common_string_fns.c
diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/eal/common/eal_common_tailqs.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_tailqs.c
rename to lib/eal/common/eal_common_tailqs.c
diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_thread.c
rename to lib/eal/common/eal_common_thread.c
diff --git a/lib/librte_eal/common/eal_common_timer.c b/lib/eal/common/eal_common_timer.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_timer.c
rename to lib/eal/common/eal_common_timer.c
diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace.c
rename to lib/eal/common/eal_common_trace.c
diff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/eal/common/eal_common_trace_ctf.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_ctf.c
rename to lib/eal/common/eal_common_trace_ctf.c
diff --git a/lib/librte_eal/common/eal_common_trace_points.c b/lib/eal/common/eal_common_trace_points.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_points.c
rename to lib/eal/common/eal_common_trace_points.c
diff --git a/lib/librte_eal/common/eal_common_trace_utils.c b/lib/eal/common/eal_common_trace_utils.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_utils.c
rename to lib/eal/common/eal_common_trace_utils.c
diff --git a/lib/librte_eal/common/eal_common_uuid.c b/lib/eal/common/eal_common_uuid.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_uuid.c
rename to lib/eal/common/eal_common_uuid.c
diff --git a/lib/librte_eal/common/eal_filesystem.h b/lib/eal/common/eal_filesystem.h
similarity index 100%
rename from lib/librte_eal/common/eal_filesystem.h
rename to lib/eal/common/eal_filesystem.h
diff --git a/lib/librte_eal/common/eal_hugepages.h b/lib/eal/common/eal_hugepages.h
similarity index 100%
rename from lib/librte_eal/common/eal_hugepages.h
rename to lib/eal/common/eal_hugepages.h
diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h
similarity index 100%
rename from lib/librte_eal/common/eal_internal_cfg.h
rename to lib/eal/common/eal_internal_cfg.h
diff --git a/lib/librte_eal/common/eal_log.h b/lib/eal/common/eal_log.h
similarity index 100%
rename from lib/librte_eal/common/eal_log.h
rename to lib/eal/common/eal_log.h
diff --git a/lib/librte_eal/common/eal_memalloc.h b/lib/eal/common/eal_memalloc.h
similarity index 100%
rename from lib/librte_eal/common/eal_memalloc.h
rename to lib/eal/common/eal_memalloc.h
diff --git a/lib/librte_eal/common/eal_memcfg.h b/lib/eal/common/eal_memcfg.h
similarity index 100%
rename from lib/librte_eal/common/eal_memcfg.h
rename to lib/eal/common/eal_memcfg.h
diff --git a/lib/librte_eal/common/eal_options.h b/lib/eal/common/eal_options.h
similarity index 100%
rename from lib/librte_eal/common/eal_options.h
rename to lib/eal/common/eal_options.h
diff --git a/lib/librte_eal/common/eal_private.h b/lib/eal/common/eal_private.h
similarity index 100%
rename from lib/librte_eal/common/eal_private.h
rename to lib/eal/common/eal_private.h
diff --git a/lib/librte_eal/common/eal_thread.h b/lib/eal/common/eal_thread.h
similarity index 100%
rename from lib/librte_eal/common/eal_thread.h
rename to lib/eal/common/eal_thread.h
diff --git a/lib/librte_eal/common/eal_trace.h b/lib/eal/common/eal_trace.h
similarity index 100%
rename from lib/librte_eal/common/eal_trace.h
rename to lib/eal/common/eal_trace.h
diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/eal/common/hotplug_mp.c
similarity index 100%
rename from lib/librte_eal/common/hotplug_mp.c
rename to lib/eal/common/hotplug_mp.c
diff --git a/lib/librte_eal/common/hotplug_mp.h b/lib/eal/common/hotplug_mp.h
similarity index 100%
rename from lib/librte_eal/common/hotplug_mp.h
rename to lib/eal/common/hotplug_mp.h
diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c
similarity index 100%
rename from lib/librte_eal/common/malloc_elem.c
rename to lib/eal/common/malloc_elem.c
diff --git a/lib/librte_eal/common/malloc_elem.h b/lib/eal/common/malloc_elem.h
similarity index 100%
rename from lib/librte_eal/common/malloc_elem.h
rename to lib/eal/common/malloc_elem.h
diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
similarity index 100%
rename from lib/librte_eal/common/malloc_heap.c
rename to lib/eal/common/malloc_heap.c
diff --git a/lib/librte_eal/common/malloc_heap.h b/lib/eal/common/malloc_heap.h
similarity index 100%
rename from lib/librte_eal/common/malloc_heap.h
rename to lib/eal/common/malloc_heap.h
diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
similarity index 100%
rename from lib/librte_eal/common/malloc_mp.c
rename to lib/eal/common/malloc_mp.c
diff --git a/lib/librte_eal/common/malloc_mp.h b/lib/eal/common/malloc_mp.h
similarity index 100%
rename from lib/librte_eal/common/malloc_mp.h
rename to lib/eal/common/malloc_mp.h
diff --git a/lib/librte_eal/common/meson.build b/lib/eal/common/meson.build
similarity index 100%
rename from lib/librte_eal/common/meson.build
rename to lib/eal/common/meson.build
diff --git a/lib/librte_eal/common/rte_keepalive.c b/lib/eal/common/rte_keepalive.c
similarity index 100%
rename from lib/librte_eal/common/rte_keepalive.c
rename to lib/eal/common/rte_keepalive.c
diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
similarity index 100%
rename from lib/librte_eal/common/rte_malloc.c
rename to lib/eal/common/rte_malloc.c
diff --git a/lib/librte_eal/common/rte_random.c b/lib/eal/common/rte_random.c
similarity index 100%
rename from lib/librte_eal/common/rte_random.c
rename to lib/eal/common/rte_random.c
diff --git a/lib/librte_eal/common/rte_reciprocal.c b/lib/eal/common/rte_reciprocal.c
similarity index 100%
rename from lib/librte_eal/common/rte_reciprocal.c
rename to lib/eal/common/rte_reciprocal.c
diff --git a/lib/librte_eal/common/rte_service.c b/lib/eal/common/rte_service.c
similarity index 100%
rename from lib/librte_eal/common/rte_service.c
rename to lib/eal/common/rte_service.c
diff --git a/lib/librte_eal/common/rte_version.c b/lib/eal/common/rte_version.c
similarity index 100%
rename from lib/librte_eal/common/rte_version.c
rename to lib/eal/common/rte_version.c
diff --git a/lib/librte_eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal.c
rename to lib/eal/freebsd/eal.c
diff --git a/lib/librte_eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_alarm.c
rename to lib/eal/freebsd/eal_alarm.c
diff --git a/lib/librte_eal/freebsd/eal_alarm_private.h b/lib/eal/freebsd/eal_alarm_private.h
similarity index 100%
rename from lib/librte_eal/freebsd/eal_alarm_private.h
rename to lib/eal/freebsd/eal_alarm_private.h
diff --git a/lib/librte_eal/freebsd/eal_cpuflags.c b/lib/eal/freebsd/eal_cpuflags.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_cpuflags.c
rename to lib/eal/freebsd/eal_cpuflags.c
diff --git a/lib/librte_eal/freebsd/eal_debug.c b/lib/eal/freebsd/eal_debug.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_debug.c
rename to lib/eal/freebsd/eal_debug.c
diff --git a/lib/librte_eal/freebsd/eal_dev.c b/lib/eal/freebsd/eal_dev.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_dev.c
rename to lib/eal/freebsd/eal_dev.c
diff --git a/lib/librte_eal/freebsd/eal_hugepage_info.c b/lib/eal/freebsd/eal_hugepage_info.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_hugepage_info.c
rename to lib/eal/freebsd/eal_hugepage_info.c
diff --git a/lib/librte_eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_interrupts.c
rename to lib/eal/freebsd/eal_interrupts.c
diff --git a/lib/librte_eal/freebsd/eal_lcore.c b/lib/eal/freebsd/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_lcore.c
rename to lib/eal/freebsd/eal_lcore.c
diff --git a/lib/librte_eal/freebsd/eal_memalloc.c b/lib/eal/freebsd/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_memalloc.c
rename to lib/eal/freebsd/eal_memalloc.c
diff --git a/lib/librte_eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_memory.c
rename to lib/eal/freebsd/eal_memory.c
diff --git a/lib/librte_eal/freebsd/eal_thread.c b/lib/eal/freebsd/eal_thread.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_thread.c
rename to lib/eal/freebsd/eal_thread.c
diff --git a/lib/librte_eal/freebsd/eal_timer.c b/lib/eal/freebsd/eal_timer.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_timer.c
rename to lib/eal/freebsd/eal_timer.c
diff --git a/lib/librte_eal/freebsd/include/meson.build b/lib/eal/freebsd/include/meson.build
similarity index 100%
rename from lib/librte_eal/freebsd/include/meson.build
rename to lib/eal/freebsd/include/meson.build
diff --git a/lib/librte_eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/freebsd/include/rte_os.h
rename to lib/eal/freebsd/include/rte_os.h
diff --git a/lib/librte_eal/freebsd/include/rte_os_shim.h b/lib/eal/freebsd/include/rte_os_shim.h
similarity index 100%
rename from lib/librte_eal/freebsd/include/rte_os_shim.h
rename to lib/eal/freebsd/include/rte_os_shim.h
diff --git a/lib/librte_eal/freebsd/meson.build b/lib/eal/freebsd/meson.build
similarity index 100%
rename from lib/librte_eal/freebsd/meson.build
rename to lib/eal/freebsd/meson.build
diff --git a/lib/librte_eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_atomic.h
rename to lib/eal/include/generic/rte_atomic.h
diff --git a/lib/librte_eal/include/generic/rte_byteorder.h b/lib/eal/include/generic/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_byteorder.h
rename to lib/eal/include/generic/rte_byteorder.h
diff --git a/lib/librte_eal/include/generic/rte_cpuflags.h b/lib/eal/include/generic/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_cpuflags.h
rename to lib/eal/include/generic/rte_cpuflags.h
diff --git a/lib/librte_eal/include/generic/rte_cycles.h b/lib/eal/include/generic/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_cycles.h
rename to lib/eal/include/generic/rte_cycles.h
diff --git a/lib/librte_eal/include/generic/rte_io.h b/lib/eal/include/generic/rte_io.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_io.h
rename to lib/eal/include/generic/rte_io.h
diff --git a/lib/librte_eal/include/generic/rte_mcslock.h b/lib/eal/include/generic/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_mcslock.h
rename to lib/eal/include/generic/rte_mcslock.h
diff --git a/lib/librte_eal/include/generic/rte_memcpy.h b/lib/eal/include/generic/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_memcpy.h
rename to lib/eal/include/generic/rte_memcpy.h
diff --git a/lib/librte_eal/include/generic/rte_pause.h b/lib/eal/include/generic/rte_pause.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_pause.h
rename to lib/eal/include/generic/rte_pause.h
diff --git a/lib/librte_eal/include/generic/rte_pflock.h b/lib/eal/include/generic/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_pflock.h
rename to lib/eal/include/generic/rte_pflock.h
diff --git a/lib/librte_eal/include/generic/rte_power_intrinsics.h b/lib/eal/include/generic/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_power_intrinsics.h
rename to lib/eal/include/generic/rte_power_intrinsics.h
diff --git a/lib/librte_eal/include/generic/rte_prefetch.h b/lib/eal/include/generic/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_prefetch.h
rename to lib/eal/include/generic/rte_prefetch.h
diff --git a/lib/librte_eal/include/generic/rte_rwlock.h b/lib/eal/include/generic/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_rwlock.h
rename to lib/eal/include/generic/rte_rwlock.h
diff --git a/lib/librte_eal/include/generic/rte_spinlock.h b/lib/eal/include/generic/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_spinlock.h
rename to lib/eal/include/generic/rte_spinlock.h
diff --git a/lib/librte_eal/include/generic/rte_ticketlock.h b/lib/eal/include/generic/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_ticketlock.h
rename to lib/eal/include/generic/rte_ticketlock.h
diff --git a/lib/librte_eal/include/generic/rte_vect.h b/lib/eal/include/generic/rte_vect.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_vect.h
rename to lib/eal/include/generic/rte_vect.h
diff --git a/lib/librte_eal/include/meson.build b/lib/eal/include/meson.build
similarity index 100%
rename from lib/librte_eal/include/meson.build
rename to lib/eal/include/meson.build
diff --git a/lib/librte_eal/include/rte_alarm.h b/lib/eal/include/rte_alarm.h
similarity index 100%
rename from lib/librte_eal/include/rte_alarm.h
rename to lib/eal/include/rte_alarm.h
diff --git a/lib/librte_eal/include/rte_bitmap.h b/lib/eal/include/rte_bitmap.h
similarity index 100%
rename from lib/librte_eal/include/rte_bitmap.h
rename to lib/eal/include/rte_bitmap.h
diff --git a/lib/librte_eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
similarity index 100%
rename from lib/librte_eal/include/rte_bitops.h
rename to lib/eal/include/rte_bitops.h
diff --git a/lib/librte_eal/include/rte_branch_prediction.h b/lib/eal/include/rte_branch_prediction.h
similarity index 100%
rename from lib/librte_eal/include/rte_branch_prediction.h
rename to lib/eal/include/rte_branch_prediction.h
diff --git a/lib/librte_eal/include/rte_bus.h b/lib/eal/include/rte_bus.h
similarity index 100%
rename from lib/librte_eal/include/rte_bus.h
rename to lib/eal/include/rte_bus.h
diff --git a/lib/librte_eal/include/rte_class.h b/lib/eal/include/rte_class.h
similarity index 100%
rename from lib/librte_eal/include/rte_class.h
rename to lib/eal/include/rte_class.h
diff --git a/lib/librte_eal/include/rte_common.h b/lib/eal/include/rte_common.h
similarity index 100%
rename from lib/librte_eal/include/rte_common.h
rename to lib/eal/include/rte_common.h
diff --git a/lib/librte_eal/include/rte_compat.h b/lib/eal/include/rte_compat.h
similarity index 100%
rename from lib/librte_eal/include/rte_compat.h
rename to lib/eal/include/rte_compat.h
diff --git a/lib/librte_eal/include/rte_debug.h b/lib/eal/include/rte_debug.h
similarity index 100%
rename from lib/librte_eal/include/rte_debug.h
rename to lib/eal/include/rte_debug.h
diff --git a/lib/librte_eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
similarity index 100%
rename from lib/librte_eal/include/rte_dev.h
rename to lib/eal/include/rte_dev.h
diff --git a/lib/librte_eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h
similarity index 100%
rename from lib/librte_eal/include/rte_devargs.h
rename to lib/eal/include/rte_devargs.h
diff --git a/lib/librte_eal/include/rte_eal.h b/lib/eal/include/rte_eal.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal.h
rename to lib/eal/include/rte_eal.h
diff --git a/lib/librte_eal/include/rte_eal_interrupts.h b/lib/eal/include/rte_eal_interrupts.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_interrupts.h
rename to lib/eal/include/rte_eal_interrupts.h
diff --git a/lib/librte_eal/include/rte_eal_memconfig.h b/lib/eal/include/rte_eal_memconfig.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_memconfig.h
rename to lib/eal/include/rte_eal_memconfig.h
diff --git a/lib/librte_eal/include/rte_eal_paging.h b/lib/eal/include/rte_eal_paging.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_paging.h
rename to lib/eal/include/rte_eal_paging.h
diff --git a/lib/librte_eal/include/rte_eal_trace.h b/lib/eal/include/rte_eal_trace.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_trace.h
rename to lib/eal/include/rte_eal_trace.h
diff --git a/lib/librte_eal/include/rte_errno.h b/lib/eal/include/rte_errno.h
similarity index 100%
rename from lib/librte_eal/include/rte_errno.h
rename to lib/eal/include/rte_errno.h
diff --git a/lib/librte_eal/include/rte_fbarray.h b/lib/eal/include/rte_fbarray.h
similarity index 100%
rename from lib/librte_eal/include/rte_fbarray.h
rename to lib/eal/include/rte_fbarray.h
diff --git a/lib/librte_eal/include/rte_function_versioning.h b/lib/eal/include/rte_function_versioning.h
similarity index 100%
rename from lib/librte_eal/include/rte_function_versioning.h
rename to lib/eal/include/rte_function_versioning.h
diff --git a/lib/librte_eal/include/rte_hexdump.h b/lib/eal/include/rte_hexdump.h
similarity index 100%
rename from lib/librte_eal/include/rte_hexdump.h
rename to lib/eal/include/rte_hexdump.h
diff --git a/lib/librte_eal/include/rte_hypervisor.h b/lib/eal/include/rte_hypervisor.h
similarity index 100%
rename from lib/librte_eal/include/rte_hypervisor.h
rename to lib/eal/include/rte_hypervisor.h
diff --git a/lib/librte_eal/include/rte_interrupts.h b/lib/eal/include/rte_interrupts.h
similarity index 100%
rename from lib/librte_eal/include/rte_interrupts.h
rename to lib/eal/include/rte_interrupts.h
diff --git a/lib/librte_eal/include/rte_keepalive.h b/lib/eal/include/rte_keepalive.h
similarity index 100%
rename from lib/librte_eal/include/rte_keepalive.h
rename to lib/eal/include/rte_keepalive.h
diff --git a/lib/librte_eal/include/rte_launch.h b/lib/eal/include/rte_launch.h
similarity index 100%
rename from lib/librte_eal/include/rte_launch.h
rename to lib/eal/include/rte_launch.h
diff --git a/lib/librte_eal/include/rte_lcore.h b/lib/eal/include/rte_lcore.h
similarity index 100%
rename from lib/librte_eal/include/rte_lcore.h
rename to lib/eal/include/rte_lcore.h
diff --git a/lib/librte_eal/include/rte_log.h b/lib/eal/include/rte_log.h
similarity index 100%
rename from lib/librte_eal/include/rte_log.h
rename to lib/eal/include/rte_log.h
diff --git a/lib/librte_eal/include/rte_malloc.h b/lib/eal/include/rte_malloc.h
similarity index 100%
rename from lib/librte_eal/include/rte_malloc.h
rename to lib/eal/include/rte_malloc.h
diff --git a/lib/librte_eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
similarity index 100%
rename from lib/librte_eal/include/rte_memory.h
rename to lib/eal/include/rte_memory.h
diff --git a/lib/librte_eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
similarity index 100%
rename from lib/librte_eal/include/rte_memzone.h
rename to lib/eal/include/rte_memzone.h
diff --git a/lib/librte_eal/include/rte_pci_dev_feature_defs.h b/lib/eal/include/rte_pci_dev_feature_defs.h
similarity index 100%
rename from lib/librte_eal/include/rte_pci_dev_feature_defs.h
rename to lib/eal/include/rte_pci_dev_feature_defs.h
diff --git a/lib/librte_eal/include/rte_pci_dev_features.h b/lib/eal/include/rte_pci_dev_features.h
similarity index 100%
rename from lib/librte_eal/include/rte_pci_dev_features.h
rename to lib/eal/include/rte_pci_dev_features.h
diff --git a/lib/librte_eal/include/rte_per_lcore.h b/lib/eal/include/rte_per_lcore.h
similarity index 100%
rename from lib/librte_eal/include/rte_per_lcore.h
rename to lib/eal/include/rte_per_lcore.h
diff --git a/lib/librte_eal/include/rte_random.h b/lib/eal/include/rte_random.h
similarity index 100%
rename from lib/librte_eal/include/rte_random.h
rename to lib/eal/include/rte_random.h
diff --git a/lib/librte_eal/include/rte_reciprocal.h b/lib/eal/include/rte_reciprocal.h
similarity index 100%
rename from lib/librte_eal/include/rte_reciprocal.h
rename to lib/eal/include/rte_reciprocal.h
diff --git a/lib/librte_eal/include/rte_service.h b/lib/eal/include/rte_service.h
similarity index 100%
rename from lib/librte_eal/include/rte_service.h
rename to lib/eal/include/rte_service.h
diff --git a/lib/librte_eal/include/rte_service_component.h b/lib/eal/include/rte_service_component.h
similarity index 100%
rename from lib/librte_eal/include/rte_service_component.h
rename to lib/eal/include/rte_service_component.h
diff --git a/lib/librte_eal/include/rte_string_fns.h b/lib/eal/include/rte_string_fns.h
similarity index 100%
rename from lib/librte_eal/include/rte_string_fns.h
rename to lib/eal/include/rte_string_fns.h
diff --git a/lib/librte_eal/include/rte_tailq.h b/lib/eal/include/rte_tailq.h
similarity index 100%
rename from lib/librte_eal/include/rte_tailq.h
rename to lib/eal/include/rte_tailq.h
diff --git a/lib/librte_eal/include/rte_test.h b/lib/eal/include/rte_test.h
similarity index 100%
rename from lib/librte_eal/include/rte_test.h
rename to lib/eal/include/rte_test.h
diff --git a/lib/librte_eal/include/rte_thread.h b/lib/eal/include/rte_thread.h
similarity index 100%
rename from lib/librte_eal/include/rte_thread.h
rename to lib/eal/include/rte_thread.h
diff --git a/lib/librte_eal/include/rte_time.h b/lib/eal/include/rte_time.h
similarity index 100%
rename from lib/librte_eal/include/rte_time.h
rename to lib/eal/include/rte_time.h
diff --git a/lib/librte_eal/include/rte_trace.h b/lib/eal/include/rte_trace.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace.h
rename to lib/eal/include/rte_trace.h
diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/eal/include/rte_trace_point.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace_point.h
rename to lib/eal/include/rte_trace_point.h
diff --git a/lib/librte_eal/include/rte_trace_point_register.h b/lib/eal/include/rte_trace_point_register.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace_point_register.h
rename to lib/eal/include/rte_trace_point_register.h
diff --git a/lib/librte_eal/include/rte_uuid.h b/lib/eal/include/rte_uuid.h
similarity index 100%
rename from lib/librte_eal/include/rte_uuid.h
rename to lib/eal/include/rte_uuid.h
diff --git a/lib/librte_eal/include/rte_version.h b/lib/eal/include/rte_version.h
similarity index 100%
rename from lib/librte_eal/include/rte_version.h
rename to lib/eal/include/rte_version.h
diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
similarity index 100%
rename from lib/librte_eal/include/rte_vfio.h
rename to lib/eal/include/rte_vfio.h
diff --git a/lib/librte_eal/linux/eal.c b/lib/eal/linux/eal.c
similarity index 100%
rename from lib/librte_eal/linux/eal.c
rename to lib/eal/linux/eal.c
diff --git a/lib/librte_eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/linux/eal_alarm.c
rename to lib/eal/linux/eal_alarm.c
diff --git a/lib/librte_eal/linux/eal_cpuflags.c b/lib/eal/linux/eal_cpuflags.c
similarity index 100%
rename from lib/librte_eal/linux/eal_cpuflags.c
rename to lib/eal/linux/eal_cpuflags.c
diff --git a/lib/librte_eal/linux/eal_debug.c b/lib/eal/linux/eal_debug.c
similarity index 100%
rename from lib/librte_eal/linux/eal_debug.c
rename to lib/eal/linux/eal_debug.c
diff --git a/lib/librte_eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c
similarity index 100%
rename from lib/librte_eal/linux/eal_dev.c
rename to lib/eal/linux/eal_dev.c
diff --git a/lib/librte_eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c
similarity index 100%
rename from lib/librte_eal/linux/eal_hugepage_info.c
rename to lib/eal/linux/eal_hugepage_info.c
diff --git a/lib/librte_eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/linux/eal_interrupts.c
rename to lib/eal/linux/eal_interrupts.c
diff --git a/lib/librte_eal/linux/eal_lcore.c b/lib/eal/linux/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/linux/eal_lcore.c
rename to lib/eal/linux/eal_lcore.c
diff --git a/lib/librte_eal/linux/eal_log.c b/lib/eal/linux/eal_log.c
similarity index 100%
rename from lib/librte_eal/linux/eal_log.c
rename to lib/eal/linux/eal_log.c
diff --git a/lib/librte_eal/linux/eal_memalloc.c b/lib/eal/linux/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/linux/eal_memalloc.c
rename to lib/eal/linux/eal_memalloc.c
diff --git a/lib/librte_eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
similarity index 100%
rename from lib/librte_eal/linux/eal_memory.c
rename to lib/eal/linux/eal_memory.c
diff --git a/lib/librte_eal/linux/eal_thread.c b/lib/eal/linux/eal_thread.c
similarity index 100%
rename from lib/librte_eal/linux/eal_thread.c
rename to lib/eal/linux/eal_thread.c
diff --git a/lib/librte_eal/linux/eal_timer.c b/lib/eal/linux/eal_timer.c
similarity index 100%
rename from lib/librte_eal/linux/eal_timer.c
rename to lib/eal/linux/eal_timer.c
diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio.c
rename to lib/eal/linux/eal_vfio.c
diff --git a/lib/librte_eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio.h
rename to lib/eal/linux/eal_vfio.h
diff --git a/lib/librte_eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio_mp_sync.c
rename to lib/eal/linux/eal_vfio_mp_sync.c
diff --git a/lib/librte_eal/linux/include/meson.build b/lib/eal/linux/include/meson.build
similarity index 100%
rename from lib/librte_eal/linux/include/meson.build
rename to lib/eal/linux/include/meson.build
diff --git a/lib/librte_eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/linux/include/rte_os.h
rename to lib/eal/linux/include/rte_os.h
diff --git a/lib/librte_eal/linux/include/rte_os_shim.h b/lib/eal/linux/include/rte_os_shim.h
similarity index 100%
rename from lib/librte_eal/linux/include/rte_os_shim.h
rename to lib/eal/linux/include/rte_os_shim.h
diff --git a/lib/librte_eal/linux/meson.build b/lib/eal/linux/meson.build
similarity index 100%
rename from lib/librte_eal/linux/meson.build
rename to lib/eal/linux/meson.build
diff --git a/lib/librte_eal/meson.build b/lib/eal/meson.build
similarity index 100%
rename from lib/librte_eal/meson.build
rename to lib/eal/meson.build
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/eal/ppc/include/meson.build
similarity index 100%
rename from lib/librte_eal/ppc/include/meson.build
rename to lib/eal/ppc/include/meson.build
diff --git a/lib/librte_eal/ppc/include/rte_altivec.h b/lib/eal/ppc/include/rte_altivec.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_altivec.h
rename to lib/eal/ppc/include/rte_altivec.h
diff --git a/lib/librte_eal/ppc/include/rte_atomic.h b/lib/eal/ppc/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_atomic.h
rename to lib/eal/ppc/include/rte_atomic.h
diff --git a/lib/librte_eal/ppc/include/rte_byteorder.h b/lib/eal/ppc/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_byteorder.h
rename to lib/eal/ppc/include/rte_byteorder.h
diff --git a/lib/librte_eal/ppc/include/rte_cpuflags.h b/lib/eal/ppc/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_cpuflags.h
rename to lib/eal/ppc/include/rte_cpuflags.h
diff --git a/lib/librte_eal/ppc/include/rte_cycles.h b/lib/eal/ppc/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_cycles.h
rename to lib/eal/ppc/include/rte_cycles.h
diff --git a/lib/librte_eal/ppc/include/rte_io.h b/lib/eal/ppc/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_io.h
rename to lib/eal/ppc/include/rte_io.h
diff --git a/lib/librte_eal/ppc/include/rte_mcslock.h b/lib/eal/ppc/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_mcslock.h
rename to lib/eal/ppc/include/rte_mcslock.h
diff --git a/lib/librte_eal/ppc/include/rte_memcpy.h b/lib/eal/ppc/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_memcpy.h
rename to lib/eal/ppc/include/rte_memcpy.h
diff --git a/lib/librte_eal/ppc/include/rte_pause.h b/lib/eal/ppc/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_pause.h
rename to lib/eal/ppc/include/rte_pause.h
diff --git a/lib/librte_eal/ppc/include/rte_pflock.h b/lib/eal/ppc/include/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_pflock.h
rename to lib/eal/ppc/include/rte_pflock.h
diff --git a/lib/librte_eal/ppc/include/rte_power_intrinsics.h b/lib/eal/ppc/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_power_intrinsics.h
rename to lib/eal/ppc/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/ppc/include/rte_prefetch.h b/lib/eal/ppc/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_prefetch.h
rename to lib/eal/ppc/include/rte_prefetch.h
diff --git a/lib/librte_eal/ppc/include/rte_rwlock.h b/lib/eal/ppc/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_rwlock.h
rename to lib/eal/ppc/include/rte_rwlock.h
diff --git a/lib/librte_eal/ppc/include/rte_spinlock.h b/lib/eal/ppc/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_spinlock.h
rename to lib/eal/ppc/include/rte_spinlock.h
diff --git a/lib/librte_eal/ppc/include/rte_ticketlock.h b/lib/eal/ppc/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_ticketlock.h
rename to lib/eal/ppc/include/rte_ticketlock.h
diff --git a/lib/librte_eal/ppc/include/rte_vect.h b/lib/eal/ppc/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_vect.h
rename to lib/eal/ppc/include/rte_vect.h
diff --git a/lib/librte_eal/ppc/meson.build b/lib/eal/ppc/meson.build
similarity index 100%
rename from lib/librte_eal/ppc/meson.build
rename to lib/eal/ppc/meson.build
diff --git a/lib/librte_eal/ppc/rte_cpuflags.c b/lib/eal/ppc/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_cpuflags.c
rename to lib/eal/ppc/rte_cpuflags.c
diff --git a/lib/librte_eal/ppc/rte_cycles.c b/lib/eal/ppc/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_cycles.c
rename to lib/eal/ppc/rte_cycles.c
diff --git a/lib/librte_eal/ppc/rte_hypervisor.c b/lib/eal/ppc/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_hypervisor.c
rename to lib/eal/ppc/rte_hypervisor.c
diff --git a/lib/librte_eal/ppc/rte_power_intrinsics.c b/lib/eal/ppc/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_power_intrinsics.c
rename to lib/eal/ppc/rte_power_intrinsics.c
diff --git a/lib/librte_eal/unix/eal_file.c b/lib/eal/unix/eal_file.c
similarity index 100%
rename from lib/librte_eal/unix/eal_file.c
rename to lib/eal/unix/eal_file.c
diff --git a/lib/librte_eal/unix/eal_unix_memory.c b/lib/eal/unix/eal_unix_memory.c
similarity index 100%
rename from lib/librte_eal/unix/eal_unix_memory.c
rename to lib/eal/unix/eal_unix_memory.c
diff --git a/lib/librte_eal/unix/eal_unix_timer.c b/lib/eal/unix/eal_unix_timer.c
similarity index 100%
rename from lib/librte_eal/unix/eal_unix_timer.c
rename to lib/eal/unix/eal_unix_timer.c
diff --git a/lib/librte_eal/unix/meson.build b/lib/eal/unix/meson.build
similarity index 100%
rename from lib/librte_eal/unix/meson.build
rename to lib/eal/unix/meson.build
diff --git a/lib/librte_eal/unix/rte_thread.c b/lib/eal/unix/rte_thread.c
similarity index 100%
rename from lib/librte_eal/unix/rte_thread.c
rename to lib/eal/unix/rte_thread.c
diff --git a/lib/librte_eal/version.map b/lib/eal/version.map
similarity index 100%
rename from lib/librte_eal/version.map
rename to lib/eal/version.map
diff --git a/lib/librte_eal/windows/eal.c b/lib/eal/windows/eal.c
similarity index 100%
rename from lib/librte_eal/windows/eal.c
rename to lib/eal/windows/eal.c
diff --git a/lib/librte_eal/windows/eal_alarm.c b/lib/eal/windows/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/windows/eal_alarm.c
rename to lib/eal/windows/eal_alarm.c
diff --git a/lib/librte_eal/windows/eal_debug.c b/lib/eal/windows/eal_debug.c
similarity index 100%
rename from lib/librte_eal/windows/eal_debug.c
rename to lib/eal/windows/eal_debug.c
diff --git a/lib/librte_eal/windows/eal_file.c b/lib/eal/windows/eal_file.c
similarity index 100%
rename from lib/librte_eal/windows/eal_file.c
rename to lib/eal/windows/eal_file.c
diff --git a/lib/librte_eal/windows/eal_hugepages.c b/lib/eal/windows/eal_hugepages.c
similarity index 100%
rename from lib/librte_eal/windows/eal_hugepages.c
rename to lib/eal/windows/eal_hugepages.c
diff --git a/lib/librte_eal/windows/eal_interrupts.c b/lib/eal/windows/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/windows/eal_interrupts.c
rename to lib/eal/windows/eal_interrupts.c
diff --git a/lib/librte_eal/windows/eal_lcore.c b/lib/eal/windows/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/windows/eal_lcore.c
rename to lib/eal/windows/eal_lcore.c
diff --git a/lib/librte_eal/windows/eal_log.c b/lib/eal/windows/eal_log.c
similarity index 100%
rename from lib/librte_eal/windows/eal_log.c
rename to lib/eal/windows/eal_log.c
diff --git a/lib/librte_eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/windows/eal_memalloc.c
rename to lib/eal/windows/eal_memalloc.c
diff --git a/lib/librte_eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c
similarity index 100%
rename from lib/librte_eal/windows/eal_memory.c
rename to lib/eal/windows/eal_memory.c
diff --git a/lib/librte_eal/windows/eal_mp.c b/lib/eal/windows/eal_mp.c
similarity index 100%
rename from lib/librte_eal/windows/eal_mp.c
rename to lib/eal/windows/eal_mp.c
diff --git a/lib/librte_eal/windows/eal_thread.c b/lib/eal/windows/eal_thread.c
similarity index 100%
rename from lib/librte_eal/windows/eal_thread.c
rename to lib/eal/windows/eal_thread.c
diff --git a/lib/librte_eal/windows/eal_timer.c b/lib/eal/windows/eal_timer.c
similarity index 100%
rename from lib/librte_eal/windows/eal_timer.c
rename to lib/eal/windows/eal_timer.c
diff --git a/lib/librte_eal/windows/eal_windows.h b/lib/eal/windows/eal_windows.h
similarity index 100%
rename from lib/librte_eal/windows/eal_windows.h
rename to lib/eal/windows/eal_windows.h
diff --git a/lib/librte_eal/windows/fnmatch.c b/lib/eal/windows/fnmatch.c
similarity index 100%
rename from lib/librte_eal/windows/fnmatch.c
rename to lib/eal/windows/fnmatch.c
diff --git a/lib/librte_eal/windows/getopt.c b/lib/eal/windows/getopt.c
similarity index 100%
rename from lib/librte_eal/windows/getopt.c
rename to lib/eal/windows/getopt.c
diff --git a/lib/librte_eal/windows/include/dirent.h b/lib/eal/windows/include/dirent.h
similarity index 100%
rename from lib/librte_eal/windows/include/dirent.h
rename to lib/eal/windows/include/dirent.h
diff --git a/lib/librte_eal/windows/include/fnmatch.h b/lib/eal/windows/include/fnmatch.h
similarity index 100%
rename from lib/librte_eal/windows/include/fnmatch.h
rename to lib/eal/windows/include/fnmatch.h
diff --git a/lib/librte_eal/windows/include/getopt.h b/lib/eal/windows/include/getopt.h
similarity index 100%
rename from lib/librte_eal/windows/include/getopt.h
rename to lib/eal/windows/include/getopt.h
diff --git a/lib/librte_eal/windows/include/meson.build b/lib/eal/windows/include/meson.build
similarity index 100%
rename from lib/librte_eal/windows/include/meson.build
rename to lib/eal/windows/include/meson.build
diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/eal/windows/include/pthread.h
similarity index 100%
rename from lib/librte_eal/windows/include/pthread.h
rename to lib/eal/windows/include/pthread.h
diff --git a/lib/librte_eal/windows/include/regex.h b/lib/eal/windows/include/regex.h
similarity index 100%
rename from lib/librte_eal/windows/include/regex.h
rename to lib/eal/windows/include/regex.h
diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_os.h
rename to lib/eal/windows/include/rte_os.h
diff --git a/lib/librte_eal/windows/include/rte_os_shim.h b/lib/eal/windows/include/rte_os_shim.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_os_shim.h
rename to lib/eal/windows/include/rte_os_shim.h
diff --git a/lib/librte_eal/windows/include/rte_virt2phys.h b/lib/eal/windows/include/rte_virt2phys.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_virt2phys.h
rename to lib/eal/windows/include/rte_virt2phys.h
diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/eal/windows/include/rte_windows.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_windows.h
rename to lib/eal/windows/include/rte_windows.h
diff --git a/lib/librte_eal/windows/include/sched.h b/lib/eal/windows/include/sched.h
similarity index 100%
rename from lib/librte_eal/windows/include/sched.h
rename to lib/eal/windows/include/sched.h
diff --git a/lib/librte_eal/windows/include/sys/queue.h b/lib/eal/windows/include/sys/queue.h
similarity index 100%
rename from lib/librte_eal/windows/include/sys/queue.h
rename to lib/eal/windows/include/sys/queue.h
diff --git a/lib/librte_eal/windows/include/unistd.h b/lib/eal/windows/include/unistd.h
similarity index 100%
rename from lib/librte_eal/windows/include/unistd.h
rename to lib/eal/windows/include/unistd.h
diff --git a/lib/librte_eal/windows/meson.build b/lib/eal/windows/meson.build
similarity index 100%
rename from lib/librte_eal/windows/meson.build
rename to lib/eal/windows/meson.build
diff --git a/lib/librte_eal/windows/rte_thread.c b/lib/eal/windows/rte_thread.c
similarity index 100%
rename from lib/librte_eal/windows/rte_thread.c
rename to lib/eal/windows/rte_thread.c
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/eal/x86/include/meson.build
similarity index 100%
rename from lib/librte_eal/x86/include/meson.build
rename to lib/eal/x86/include/meson.build
diff --git a/lib/librte_eal/x86/include/rte_atomic.h b/lib/eal/x86/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic.h
rename to lib/eal/x86/include/rte_atomic.h
diff --git a/lib/librte_eal/x86/include/rte_atomic_32.h b/lib/eal/x86/include/rte_atomic_32.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic_32.h
rename to lib/eal/x86/include/rte_atomic_32.h
diff --git a/lib/librte_eal/x86/include/rte_atomic_64.h b/lib/eal/x86/include/rte_atomic_64.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic_64.h
rename to lib/eal/x86/include/rte_atomic_64.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder.h b/lib/eal/x86/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder.h
rename to lib/eal/x86/include/rte_byteorder.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder_32.h b/lib/eal/x86/include/rte_byteorder_32.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder_32.h
rename to lib/eal/x86/include/rte_byteorder_32.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder_64.h b/lib/eal/x86/include/rte_byteorder_64.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder_64.h
rename to lib/eal/x86/include/rte_byteorder_64.h
diff --git a/lib/librte_eal/x86/include/rte_cpuflags.h b/lib/eal/x86/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_cpuflags.h
rename to lib/eal/x86/include/rte_cpuflags.h
diff --git a/lib/librte_eal/x86/include/rte_cycles.h b/lib/eal/x86/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_cycles.h
rename to lib/eal/x86/include/rte_cycles.h
diff --git a/lib/librte_eal/x86/include/rte_io.h b/lib/eal/x86/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_io.h
rename to lib/eal/x86/include/rte_io.h
diff --git a/lib/librte_eal/x86/include/rte_mcslock.h b/lib/eal/x86/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_mcslock.h
rename to lib/eal/x86/include/rte_mcslock.h
diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_memcpy.h
rename to lib/eal/x86/include/rte_memcpy.h
diff --git a/lib/librte_eal/x86/include/rte_pause.h b/lib/eal/x86/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_pause.h
rename to lib/eal/x86/include/rte_pause.h
diff --git a/lib/librte_eal/x86/include/rte_pflock.h b/lib/eal/x86/include/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_pflock.h
rename to lib/eal/x86/include/rte_pflock.h
diff --git a/lib/librte_eal/x86/include/rte_power_intrinsics.h b/lib/eal/x86/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_power_intrinsics.h
rename to lib/eal/x86/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/x86/include/rte_prefetch.h b/lib/eal/x86/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_prefetch.h
rename to lib/eal/x86/include/rte_prefetch.h
diff --git a/lib/librte_eal/x86/include/rte_rtm.h b/lib/eal/x86/include/rte_rtm.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_rtm.h
rename to lib/eal/x86/include/rte_rtm.h
diff --git a/lib/librte_eal/x86/include/rte_rwlock.h b/lib/eal/x86/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_rwlock.h
rename to lib/eal/x86/include/rte_rwlock.h
diff --git a/lib/librte_eal/x86/include/rte_spinlock.h b/lib/eal/x86/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_spinlock.h
rename to lib/eal/x86/include/rte_spinlock.h
diff --git a/lib/librte_eal/x86/include/rte_ticketlock.h b/lib/eal/x86/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_ticketlock.h
rename to lib/eal/x86/include/rte_ticketlock.h
diff --git a/lib/librte_eal/x86/include/rte_vect.h b/lib/eal/x86/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_vect.h
rename to lib/eal/x86/include/rte_vect.h
diff --git a/lib/librte_eal/x86/meson.build b/lib/eal/x86/meson.build
similarity index 100%
rename from lib/librte_eal/x86/meson.build
rename to lib/eal/x86/meson.build
diff --git a/lib/librte_eal/x86/rte_cpuflags.c b/lib/eal/x86/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/x86/rte_cpuflags.c
rename to lib/eal/x86/rte_cpuflags.c
diff --git a/lib/librte_eal/x86/rte_cpuid.h b/lib/eal/x86/rte_cpuid.h
similarity index 100%
rename from lib/librte_eal/x86/rte_cpuid.h
rename to lib/eal/x86/rte_cpuid.h
diff --git a/lib/librte_eal/x86/rte_cycles.c b/lib/eal/x86/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/x86/rte_cycles.c
rename to lib/eal/x86/rte_cycles.c
diff --git a/lib/librte_eal/x86/rte_hypervisor.c b/lib/eal/x86/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/x86/rte_hypervisor.c
rename to lib/eal/x86/rte_hypervisor.c
diff --git a/lib/librte_eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/x86/rte_power_intrinsics.c
rename to lib/eal/x86/rte_power_intrinsics.c
diff --git a/lib/librte_eal/x86/rte_spinlock.c b/lib/eal/x86/rte_spinlock.c
similarity index 100%
rename from lib/librte_eal/x86/rte_spinlock.c
rename to lib/eal/x86/rte_spinlock.c
diff --git a/lib/librte_efd/meson.build b/lib/efd/meson.build
similarity index 100%
rename from lib/librte_efd/meson.build
rename to lib/efd/meson.build
diff --git a/lib/librte_efd/rte_efd.c b/lib/efd/rte_efd.c
similarity index 100%
rename from lib/librte_efd/rte_efd.c
rename to lib/efd/rte_efd.c
diff --git a/lib/librte_efd/rte_efd.h b/lib/efd/rte_efd.h
similarity index 100%
rename from lib/librte_efd/rte_efd.h
rename to lib/efd/rte_efd.h
diff --git a/lib/librte_efd/rte_efd_arm64.h b/lib/efd/rte_efd_arm64.h
similarity index 100%
rename from lib/librte_efd/rte_efd_arm64.h
rename to lib/efd/rte_efd_arm64.h
diff --git a/lib/librte_efd/rte_efd_x86.h b/lib/efd/rte_efd_x86.h
similarity index 100%
rename from lib/librte_efd/rte_efd_x86.h
rename to lib/efd/rte_efd_x86.h
diff --git a/lib/librte_efd/version.map b/lib/efd/version.map
similarity index 100%
rename from lib/librte_efd/version.map
rename to lib/efd/version.map
diff --git a/lib/librte_ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_driver.h
rename to lib/ethdev/ethdev_driver.h
diff --git a/lib/librte_ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_pci.h
rename to lib/ethdev/ethdev_pci.h
diff --git a/lib/librte_ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_private.c
rename to lib/ethdev/ethdev_private.c
diff --git a/lib/librte_ethdev/ethdev_private.h b/lib/ethdev/ethdev_private.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_private.h
rename to lib/ethdev/ethdev_private.h
diff --git a/lib/librte_ethdev/ethdev_profile.c b/lib/ethdev/ethdev_profile.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_profile.c
rename to lib/ethdev/ethdev_profile.c
diff --git a/lib/librte_ethdev/ethdev_profile.h b/lib/ethdev/ethdev_profile.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_profile.h
rename to lib/ethdev/ethdev_profile.h
diff --git a/lib/librte_ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_trace_points.c
rename to lib/ethdev/ethdev_trace_points.c
diff --git a/lib/librte_ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_vdev.h
rename to lib/ethdev/ethdev_vdev.h
diff --git a/lib/librte_ethdev/meson.build b/lib/ethdev/meson.build
similarity index 100%
rename from lib/librte_ethdev/meson.build
rename to lib/ethdev/meson.build
diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
similarity index 100%
rename from lib/librte_ethdev/rte_class_eth.c
rename to lib/ethdev/rte_class_eth.c
diff --git a/lib/librte_ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h
similarity index 100%
rename from lib/librte_ethdev/rte_dev_info.h
rename to lib/ethdev/rte_dev_info.h
diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/ethdev/rte_eth_ctrl.h
similarity index 100%
rename from lib/librte_ethdev/rte_eth_ctrl.h
rename to lib/ethdev/rte_eth_ctrl.h
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev.c
rename to lib/ethdev/rte_ethdev.c
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev.h
rename to lib/ethdev/rte_ethdev.h
diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/ethdev/rte_ethdev_core.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_core.h
rename to lib/ethdev/rte_ethdev_core.h
diff --git a/lib/librte_ethdev/rte_ethdev_trace.h b/lib/ethdev/rte_ethdev_trace.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_trace.h
rename to lib/ethdev/rte_ethdev_trace.h
diff --git a/lib/librte_ethdev/rte_ethdev_trace_fp.h b/lib/ethdev/rte_ethdev_trace_fp.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_trace_fp.h
rename to lib/ethdev/rte_ethdev_trace_fp.h
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
similarity index 100%
rename from lib/librte_ethdev/rte_flow.c
rename to lib/ethdev/rte_flow.c
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
similarity index 100%
rename from lib/librte_ethdev/rte_flow.h
rename to lib/ethdev/rte_flow.h
diff --git a/lib/librte_ethdev/rte_flow_driver.h b/lib/ethdev/rte_flow_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_flow_driver.h
rename to lib/ethdev/rte_flow_driver.h
diff --git a/lib/librte_ethdev/rte_mtr.c b/lib/ethdev/rte_mtr.c
similarity index 100%
rename from lib/librte_ethdev/rte_mtr.c
rename to lib/ethdev/rte_mtr.c
diff --git a/lib/librte_ethdev/rte_mtr.h b/lib/ethdev/rte_mtr.h
similarity index 100%
rename from lib/librte_ethdev/rte_mtr.h
rename to lib/ethdev/rte_mtr.h
diff --git a/lib/librte_ethdev/rte_mtr_driver.h b/lib/ethdev/rte_mtr_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_mtr_driver.h
rename to lib/ethdev/rte_mtr_driver.h
diff --git a/lib/librte_ethdev/rte_tm.c b/lib/ethdev/rte_tm.c
similarity index 100%
rename from lib/librte_ethdev/rte_tm.c
rename to lib/ethdev/rte_tm.c
diff --git a/lib/librte_ethdev/rte_tm.h b/lib/ethdev/rte_tm.h
similarity index 100%
rename from lib/librte_ethdev/rte_tm.h
rename to lib/ethdev/rte_tm.h
diff --git a/lib/librte_ethdev/rte_tm_driver.h b/lib/ethdev/rte_tm_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_tm_driver.h
rename to lib/ethdev/rte_tm_driver.h
diff --git a/lib/librte_ethdev/version.map b/lib/ethdev/version.map
similarity index 100%
rename from lib/librte_ethdev/version.map
rename to lib/ethdev/version.map
diff --git a/lib/librte_eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd.h
rename to lib/eventdev/eventdev_pmd.h
diff --git a/lib/librte_eventdev/eventdev_pmd_pci.h b/lib/eventdev/eventdev_pmd_pci.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd_pci.h
rename to lib/eventdev/eventdev_pmd_pci.h
diff --git a/lib/librte_eventdev/eventdev_pmd_vdev.h b/lib/eventdev/eventdev_pmd_vdev.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd_vdev.h
rename to lib/eventdev/eventdev_pmd_vdev.h
diff --git a/lib/librte_eventdev/eventdev_trace_points.c b/lib/eventdev/eventdev_trace_points.c
similarity index 100%
rename from lib/librte_eventdev/eventdev_trace_points.c
rename to lib/eventdev/eventdev_trace_points.c
diff --git a/lib/librte_eventdev/meson.build b/lib/eventdev/meson.build
similarity index 100%
rename from lib/librte_eventdev/meson.build
rename to lib/eventdev/meson.build
diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_crypto_adapter.c
rename to lib/eventdev/rte_event_crypto_adapter.c
diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.h b/lib/eventdev/rte_event_crypto_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_crypto_adapter.h
rename to lib/eventdev/rte_event_crypto_adapter.h
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_rx_adapter.c
rename to lib/eventdev/rte_event_eth_rx_adapter.c
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.h b/lib/eventdev/rte_event_eth_rx_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_rx_adapter.h
rename to lib/eventdev/rte_event_eth_rx_adapter.h
diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_tx_adapter.c
rename to lib/eventdev/rte_event_eth_tx_adapter.c
diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/eventdev/rte_event_eth_tx_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_tx_adapter.h
rename to lib/eventdev/rte_event_eth_tx_adapter.h
diff --git a/lib/librte_eventdev/rte_event_ring.c b/lib/eventdev/rte_event_ring.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_ring.c
rename to lib/eventdev/rte_event_ring.c
diff --git a/lib/librte_eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_ring.h
rename to lib/eventdev/rte_event_ring.h
diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter.c
rename to lib/eventdev/rte_event_timer_adapter.c
diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter.h
rename to lib/eventdev/rte_event_timer_adapter.h
diff --git a/lib/librte_eventdev/rte_event_timer_adapter_pmd.h b/lib/eventdev/rte_event_timer_adapter_pmd.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter_pmd.h
rename to lib/eventdev/rte_event_timer_adapter_pmd.h
diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev.c
rename to lib/eventdev/rte_eventdev.c
diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev.h
rename to lib/eventdev/rte_eventdev.h
diff --git a/lib/librte_eventdev/rte_eventdev_trace.h b/lib/eventdev/rte_eventdev_trace.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_trace.h
rename to lib/eventdev/rte_eventdev_trace.h
diff --git a/lib/librte_eventdev/rte_eventdev_trace_fp.h b/lib/eventdev/rte_eventdev_trace_fp.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_trace_fp.h
rename to lib/eventdev/rte_eventdev_trace_fp.h
diff --git a/lib/librte_eventdev/version.map b/lib/eventdev/version.map
similarity index 100%
rename from lib/librte_eventdev/version.map
rename to lib/eventdev/version.map
diff --git a/lib/librte_fib/dir24_8.c b/lib/fib/dir24_8.c
similarity index 100%
rename from lib/librte_fib/dir24_8.c
rename to lib/fib/dir24_8.c
diff --git a/lib/librte_fib/dir24_8.h b/lib/fib/dir24_8.h
similarity index 100%
rename from lib/librte_fib/dir24_8.h
rename to lib/fib/dir24_8.h
diff --git a/lib/librte_fib/dir24_8_avx512.c b/lib/fib/dir24_8_avx512.c
similarity index 100%
rename from lib/librte_fib/dir24_8_avx512.c
rename to lib/fib/dir24_8_avx512.c
diff --git a/lib/librte_fib/dir24_8_avx512.h b/lib/fib/dir24_8_avx512.h
similarity index 100%
rename from lib/librte_fib/dir24_8_avx512.h
rename to lib/fib/dir24_8_avx512.h
diff --git a/lib/librte_fib/meson.build b/lib/fib/meson.build
similarity index 100%
rename from lib/librte_fib/meson.build
rename to lib/fib/meson.build
diff --git a/lib/librte_fib/rte_fib.c b/lib/fib/rte_fib.c
similarity index 100%
rename from lib/librte_fib/rte_fib.c
rename to lib/fib/rte_fib.c
diff --git a/lib/librte_fib/rte_fib.h b/lib/fib/rte_fib.h
similarity index 100%
rename from lib/librte_fib/rte_fib.h
rename to lib/fib/rte_fib.h
diff --git a/lib/librte_fib/rte_fib6.c b/lib/fib/rte_fib6.c
similarity index 100%
rename from lib/librte_fib/rte_fib6.c
rename to lib/fib/rte_fib6.c
diff --git a/lib/librte_fib/rte_fib6.h b/lib/fib/rte_fib6.h
similarity index 100%
rename from lib/librte_fib/rte_fib6.h
rename to lib/fib/rte_fib6.h
diff --git a/lib/librte_fib/trie.c b/lib/fib/trie.c
similarity index 100%
rename from lib/librte_fib/trie.c
rename to lib/fib/trie.c
diff --git a/lib/librte_fib/trie.h b/lib/fib/trie.h
similarity index 100%
rename from lib/librte_fib/trie.h
rename to lib/fib/trie.h
diff --git a/lib/librte_fib/trie_avx512.c b/lib/fib/trie_avx512.c
similarity index 100%
rename from lib/librte_fib/trie_avx512.c
rename to lib/fib/trie_avx512.c
diff --git a/lib/librte_fib/trie_avx512.h b/lib/fib/trie_avx512.h
similarity index 100%
rename from lib/librte_fib/trie_avx512.h
rename to lib/fib/trie_avx512.h
diff --git a/lib/librte_fib/version.map b/lib/fib/version.map
similarity index 100%
rename from lib/librte_fib/version.map
rename to lib/fib/version.map
diff --git a/lib/librte_flow_classify/meson.build b/lib/flow_classify/meson.build
similarity index 100%
rename from lib/librte_flow_classify/meson.build
rename to lib/flow_classify/meson.build
diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/flow_classify/rte_flow_classify.c
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify.c
rename to lib/flow_classify/rte_flow_classify.c
diff --git a/lib/librte_flow_classify/rte_flow_classify.h b/lib/flow_classify/rte_flow_classify.h
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify.h
rename to lib/flow_classify/rte_flow_classify.h
diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.c b/lib/flow_classify/rte_flow_classify_parse.c
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify_parse.c
rename to lib/flow_classify/rte_flow_classify_parse.c
diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.h b/lib/flow_classify/rte_flow_classify_parse.h
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify_parse.h
rename to lib/flow_classify/rte_flow_classify_parse.h
diff --git a/lib/librte_flow_classify/version.map b/lib/flow_classify/version.map
similarity index 100%
rename from lib/librte_flow_classify/version.map
rename to lib/flow_classify/version.map
diff --git a/lib/librte_graph/graph.c b/lib/graph/graph.c
similarity index 100%
rename from lib/librte_graph/graph.c
rename to lib/graph/graph.c
diff --git a/lib/librte_graph/graph_debug.c b/lib/graph/graph_debug.c
similarity index 100%
rename from lib/librte_graph/graph_debug.c
rename to lib/graph/graph_debug.c
diff --git a/lib/librte_graph/graph_ops.c b/lib/graph/graph_ops.c
similarity index 100%
rename from lib/librte_graph/graph_ops.c
rename to lib/graph/graph_ops.c
diff --git a/lib/librte_graph/graph_populate.c b/lib/graph/graph_populate.c
similarity index 100%
rename from lib/librte_graph/graph_populate.c
rename to lib/graph/graph_populate.c
diff --git a/lib/librte_graph/graph_private.h b/lib/graph/graph_private.h
similarity index 100%
rename from lib/librte_graph/graph_private.h
rename to lib/graph/graph_private.h
diff --git a/lib/librte_graph/graph_stats.c b/lib/graph/graph_stats.c
similarity index 100%
rename from lib/librte_graph/graph_stats.c
rename to lib/graph/graph_stats.c
diff --git a/lib/librte_graph/meson.build b/lib/graph/meson.build
similarity index 100%
rename from lib/librte_graph/meson.build
rename to lib/graph/meson.build
diff --git a/lib/librte_graph/node.c b/lib/graph/node.c
similarity index 100%
rename from lib/librte_graph/node.c
rename to lib/graph/node.c
diff --git a/lib/librte_graph/rte_graph.h b/lib/graph/rte_graph.h
similarity index 100%
rename from lib/librte_graph/rte_graph.h
rename to lib/graph/rte_graph.h
diff --git a/lib/librte_graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h
similarity index 100%
rename from lib/librte_graph/rte_graph_worker.h
rename to lib/graph/rte_graph_worker.h
diff --git a/lib/librte_graph/version.map b/lib/graph/version.map
similarity index 100%
rename from lib/librte_graph/version.map
rename to lib/graph/version.map
diff --git a/lib/librte_gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
similarity index 100%
rename from lib/librte_gro/gro_tcp4.c
rename to lib/gro/gro_tcp4.c
diff --git a/lib/librte_gro/gro_tcp4.h b/lib/gro/gro_tcp4.h
similarity index 100%
rename from lib/librte_gro/gro_tcp4.h
rename to lib/gro/gro_tcp4.h
diff --git a/lib/librte_gro/gro_udp4.c b/lib/gro/gro_udp4.c
similarity index 100%
rename from lib/librte_gro/gro_udp4.c
rename to lib/gro/gro_udp4.c
diff --git a/lib/librte_gro/gro_udp4.h b/lib/gro/gro_udp4.h
similarity index 100%
rename from lib/librte_gro/gro_udp4.h
rename to lib/gro/gro_udp4.h
diff --git a/lib/librte_gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c
similarity index 100%
rename from lib/librte_gro/gro_vxlan_tcp4.c
rename to lib/gro/gro_vxlan_tcp4.c
diff --git a/lib/librte_gro/gro_vxlan_tcp4.h b/lib/gro/gro_vxlan_tcp4.h
similarity index 100%
rename from lib/librte_gro/gro_vxlan_tcp4.h
rename to lib/gro/gro_vxlan_tcp4.h
diff --git a/lib/librte_gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c
similarity index 100%
rename from lib/librte_gro/gro_vxlan_udp4.c
rename to lib/gro/gro_vxlan_udp4.c
diff --git a/lib/librte_gro/gro_vxlan_udp4.h b/lib/gro/gro_vxlan_udp4.h
similarity index 100%
rename from lib/librte_gro/gro_vxlan_udp4.h
rename to lib/gro/gro_vxlan_udp4.h
diff --git a/lib/librte_gro/meson.build b/lib/gro/meson.build
similarity index 100%
rename from lib/librte_gro/meson.build
rename to lib/gro/meson.build
diff --git a/lib/librte_gro/rte_gro.c b/lib/gro/rte_gro.c
similarity index 100%
rename from lib/librte_gro/rte_gro.c
rename to lib/gro/rte_gro.c
diff --git a/lib/librte_gro/rte_gro.h b/lib/gro/rte_gro.h
similarity index 100%
rename from lib/librte_gro/rte_gro.h
rename to lib/gro/rte_gro.h
diff --git a/lib/librte_gro/version.map b/lib/gro/version.map
similarity index 100%
rename from lib/librte_gro/version.map
rename to lib/gro/version.map
diff --git a/lib/librte_gso/gso_common.c b/lib/gso/gso_common.c
similarity index 100%
rename from lib/librte_gso/gso_common.c
rename to lib/gso/gso_common.c
diff --git a/lib/librte_gso/gso_common.h b/lib/gso/gso_common.h
similarity index 100%
rename from lib/librte_gso/gso_common.h
rename to lib/gso/gso_common.h
diff --git a/lib/librte_gso/gso_tcp4.c b/lib/gso/gso_tcp4.c
similarity index 100%
rename from lib/librte_gso/gso_tcp4.c
rename to lib/gso/gso_tcp4.c
diff --git a/lib/librte_gso/gso_tcp4.h b/lib/gso/gso_tcp4.h
similarity index 100%
rename from lib/librte_gso/gso_tcp4.h
rename to lib/gso/gso_tcp4.h
diff --git a/lib/librte_gso/gso_tunnel_tcp4.c b/lib/gso/gso_tunnel_tcp4.c
similarity index 100%
rename from lib/librte_gso/gso_tunnel_tcp4.c
rename to lib/gso/gso_tunnel_tcp4.c
diff --git a/lib/librte_gso/gso_tunnel_tcp4.h b/lib/gso/gso_tunnel_tcp4.h
similarity index 100%
rename from lib/librte_gso/gso_tunnel_tcp4.h
rename to lib/gso/gso_tunnel_tcp4.h
diff --git a/lib/librte_gso/gso_tunnel_udp4.c b/lib/gso/gso_tunnel_udp4.c
similarity index 100%
rename from lib/librte_gso/gso_tunnel_udp4.c
rename to lib/gso/gso_tunnel_udp4.c
diff --git a/lib/librte_gso/gso_tunnel_udp4.h b/lib/gso/gso_tunnel_udp4.h
similarity index 100%
rename from lib/librte_gso/gso_tunnel_udp4.h
rename to lib/gso/gso_tunnel_udp4.h
diff --git a/lib/librte_gso/gso_udp4.c b/lib/gso/gso_udp4.c
similarity index 100%
rename from lib/librte_gso/gso_udp4.c
rename to lib/gso/gso_udp4.c
diff --git a/lib/librte_gso/gso_udp4.h b/lib/gso/gso_udp4.h
similarity index 100%
rename from lib/librte_gso/gso_udp4.h
rename to lib/gso/gso_udp4.h
diff --git a/lib/librte_gso/meson.build b/lib/gso/meson.build
similarity index 100%
rename from lib/librte_gso/meson.build
rename to lib/gso/meson.build
diff --git a/lib/librte_gso/rte_gso.c b/lib/gso/rte_gso.c
similarity index 100%
rename from lib/librte_gso/rte_gso.c
rename to lib/gso/rte_gso.c
diff --git a/lib/librte_gso/rte_gso.h b/lib/gso/rte_gso.h
similarity index 100%
rename from lib/librte_gso/rte_gso.h
rename to lib/gso/rte_gso.h
diff --git a/lib/librte_gso/version.map b/lib/gso/version.map
similarity index 100%
rename from lib/librte_gso/version.map
rename to lib/gso/version.map
diff --git a/lib/librte_hash/meson.build b/lib/hash/meson.build
similarity index 100%
rename from lib/librte_hash/meson.build
rename to lib/hash/meson.build
diff --git a/lib/librte_hash/rte_cmp_arm64.h b/lib/hash/rte_cmp_arm64.h
similarity index 100%
rename from lib/librte_hash/rte_cmp_arm64.h
rename to lib/hash/rte_cmp_arm64.h
diff --git a/lib/librte_hash/rte_cmp_x86.h b/lib/hash/rte_cmp_x86.h
similarity index 100%
rename from lib/librte_hash/rte_cmp_x86.h
rename to lib/hash/rte_cmp_x86.h
diff --git a/lib/librte_hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h
similarity index 100%
rename from lib/librte_hash/rte_crc_arm64.h
rename to lib/hash/rte_crc_arm64.h
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
similarity index 100%
rename from lib/librte_hash/rte_cuckoo_hash.c
rename to lib/hash/rte_cuckoo_hash.c
diff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
similarity index 100%
rename from lib/librte_hash/rte_cuckoo_hash.h
rename to lib/hash/rte_cuckoo_hash.h
diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
similarity index 100%
rename from lib/librte_hash/rte_fbk_hash.c
rename to lib/hash/rte_fbk_hash.c
diff --git a/lib/librte_hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
similarity index 100%
rename from lib/librte_hash/rte_fbk_hash.h
rename to lib/hash/rte_fbk_hash.h
diff --git a/lib/librte_hash/rte_hash.h b/lib/hash/rte_hash.h
similarity index 100%
rename from lib/librte_hash/rte_hash.h
rename to lib/hash/rte_hash.h
diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/hash/rte_hash_crc.h
similarity index 100%
rename from lib/librte_hash/rte_hash_crc.h
rename to lib/hash/rte_hash_crc.h
diff --git a/lib/librte_hash/rte_jhash.h b/lib/hash/rte_jhash.h
similarity index 100%
rename from lib/librte_hash/rte_jhash.h
rename to lib/hash/rte_jhash.h
diff --git a/lib/librte_hash/rte_thash.h b/lib/hash/rte_thash.h
similarity index 100%
rename from lib/librte_hash/rte_thash.h
rename to lib/hash/rte_thash.h
diff --git a/lib/librte_hash/version.map b/lib/hash/version.map
similarity index 100%
rename from lib/librte_hash/version.map
rename to lib/hash/version.map
diff --git a/lib/librte_ip_frag/ip_frag_common.h b/lib/ip_frag/ip_frag_common.h
similarity index 100%
rename from lib/librte_ip_frag/ip_frag_common.h
rename to lib/ip_frag/ip_frag_common.h
diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/ip_frag/ip_frag_internal.c
similarity index 100%
rename from lib/librte_ip_frag/ip_frag_internal.c
rename to lib/ip_frag/ip_frag_internal.c
diff --git a/lib/librte_ip_frag/meson.build b/lib/ip_frag/meson.build
similarity index 100%
rename from lib/librte_ip_frag/meson.build
rename to lib/ip_frag/meson.build
diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h
similarity index 100%
rename from lib/librte_ip_frag/rte_ip_frag.h
rename to lib/ip_frag/rte_ip_frag.h
diff --git a/lib/librte_ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ip_frag_common.c
rename to lib/ip_frag/rte_ip_frag_common.c
diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv4_fragmentation.c
rename to lib/ip_frag/rte_ipv4_fragmentation.c
diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/ip_frag/rte_ipv4_reassembly.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv4_reassembly.c
rename to lib/ip_frag/rte_ipv4_reassembly.c
diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/ip_frag/rte_ipv6_fragmentation.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv6_fragmentation.c
rename to lib/ip_frag/rte_ipv6_fragmentation.c
diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/ip_frag/rte_ipv6_reassembly.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv6_reassembly.c
rename to lib/ip_frag/rte_ipv6_reassembly.c
diff --git a/lib/librte_ip_frag/version.map b/lib/ip_frag/version.map
similarity index 100%
rename from lib/librte_ip_frag/version.map
rename to lib/ip_frag/version.map
diff --git a/lib/librte_ipsec/crypto.h b/lib/ipsec/crypto.h
similarity index 100%
rename from lib/librte_ipsec/crypto.h
rename to lib/ipsec/crypto.h
diff --git a/lib/librte_ipsec/esp_inb.c b/lib/ipsec/esp_inb.c
similarity index 100%
rename from lib/librte_ipsec/esp_inb.c
rename to lib/ipsec/esp_inb.c
diff --git a/lib/librte_ipsec/esp_outb.c b/lib/ipsec/esp_outb.c
similarity index 100%
rename from lib/librte_ipsec/esp_outb.c
rename to lib/ipsec/esp_outb.c
diff --git a/lib/librte_ipsec/iph.h b/lib/ipsec/iph.h
similarity index 100%
rename from lib/librte_ipsec/iph.h
rename to lib/ipsec/iph.h
diff --git a/lib/librte_ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c
similarity index 100%
rename from lib/librte_ipsec/ipsec_sad.c
rename to lib/ipsec/ipsec_sad.c
diff --git a/lib/librte_ipsec/ipsec_sqn.h b/lib/ipsec/ipsec_sqn.h
similarity index 100%
rename from lib/librte_ipsec/ipsec_sqn.h
rename to lib/ipsec/ipsec_sqn.h
diff --git a/lib/librte_ipsec/meson.build b/lib/ipsec/meson.build
similarity index 100%
rename from lib/librte_ipsec/meson.build
rename to lib/ipsec/meson.build
diff --git a/lib/librte_ipsec/misc.h b/lib/ipsec/misc.h
similarity index 100%
rename from lib/librte_ipsec/misc.h
rename to lib/ipsec/misc.h
diff --git a/lib/librte_ipsec/pad.h b/lib/ipsec/pad.h
similarity index 100%
rename from lib/librte_ipsec/pad.h
rename to lib/ipsec/pad.h
diff --git a/lib/librte_ipsec/rte_ipsec.h b/lib/ipsec/rte_ipsec.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec.h
rename to lib/ipsec/rte_ipsec.h
diff --git a/lib/librte_ipsec/rte_ipsec_group.h b/lib/ipsec/rte_ipsec_group.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_group.h
rename to lib/ipsec/rte_ipsec_group.h
diff --git a/lib/librte_ipsec/rte_ipsec_sa.h b/lib/ipsec/rte_ipsec_sa.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_sa.h
rename to lib/ipsec/rte_ipsec_sa.h
diff --git a/lib/librte_ipsec/rte_ipsec_sad.h b/lib/ipsec/rte_ipsec_sad.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_sad.h
rename to lib/ipsec/rte_ipsec_sad.h
diff --git a/lib/librte_ipsec/sa.c b/lib/ipsec/sa.c
similarity index 100%
rename from lib/librte_ipsec/sa.c
rename to lib/ipsec/sa.c
diff --git a/lib/librte_ipsec/sa.h b/lib/ipsec/sa.h
similarity index 100%
rename from lib/librte_ipsec/sa.h
rename to lib/ipsec/sa.h
diff --git a/lib/librte_ipsec/ses.c b/lib/ipsec/ses.c
similarity index 100%
rename from lib/librte_ipsec/ses.c
rename to lib/ipsec/ses.c
diff --git a/lib/librte_ipsec/version.map b/lib/ipsec/version.map
similarity index 100%
rename from lib/librte_ipsec/version.map
rename to lib/ipsec/version.map
diff --git a/lib/librte_jobstats/meson.build b/lib/jobstats/meson.build
similarity index 100%
rename from lib/librte_jobstats/meson.build
rename to lib/jobstats/meson.build
diff --git a/lib/librte_jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
similarity index 100%
rename from lib/librte_jobstats/rte_jobstats.c
rename to lib/jobstats/rte_jobstats.c
diff --git a/lib/librte_jobstats/rte_jobstats.h b/lib/jobstats/rte_jobstats.h
similarity index 100%
rename from lib/librte_jobstats/rte_jobstats.h
rename to lib/jobstats/rte_jobstats.h
diff --git a/lib/librte_jobstats/version.map b/lib/jobstats/version.map
similarity index 100%
rename from lib/librte_jobstats/version.map
rename to lib/jobstats/version.map
diff --git a/lib/librte_kni/meson.build b/lib/kni/meson.build
similarity index 100%
rename from lib/librte_kni/meson.build
rename to lib/kni/meson.build
diff --git a/lib/librte_kni/rte_kni.c b/lib/kni/rte_kni.c
similarity index 100%
rename from lib/librte_kni/rte_kni.c
rename to lib/kni/rte_kni.c
diff --git a/lib/librte_kni/rte_kni.h b/lib/kni/rte_kni.h
similarity index 100%
rename from lib/librte_kni/rte_kni.h
rename to lib/kni/rte_kni.h
diff --git a/lib/librte_kni/rte_kni_common.h b/lib/kni/rte_kni_common.h
similarity index 100%
rename from lib/librte_kni/rte_kni_common.h
rename to lib/kni/rte_kni_common.h
diff --git a/lib/librte_kni/rte_kni_fifo.h b/lib/kni/rte_kni_fifo.h
similarity index 100%
rename from lib/librte_kni/rte_kni_fifo.h
rename to lib/kni/rte_kni_fifo.h
diff --git a/lib/librte_kni/version.map b/lib/kni/version.map
similarity index 100%
rename from lib/librte_kni/version.map
rename to lib/kni/version.map
diff --git a/lib/librte_kvargs/meson.build b/lib/kvargs/meson.build
similarity index 100%
rename from lib/librte_kvargs/meson.build
rename to lib/kvargs/meson.build
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c
similarity index 100%
rename from lib/librte_kvargs/rte_kvargs.c
rename to lib/kvargs/rte_kvargs.c
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/kvargs/rte_kvargs.h
similarity index 100%
rename from lib/librte_kvargs/rte_kvargs.h
rename to lib/kvargs/rte_kvargs.h
diff --git a/lib/librte_kvargs/version.map b/lib/kvargs/version.map
similarity index 100%
rename from lib/librte_kvargs/version.map
rename to lib/kvargs/version.map
diff --git a/lib/librte_latencystats/meson.build b/lib/latencystats/meson.build
similarity index 100%
rename from lib/librte_latencystats/meson.build
rename to lib/latencystats/meson.build
diff --git a/lib/librte_latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c
similarity index 100%
rename from lib/librte_latencystats/rte_latencystats.c
rename to lib/latencystats/rte_latencystats.c
diff --git a/lib/librte_latencystats/rte_latencystats.h b/lib/latencystats/rte_latencystats.h
similarity index 100%
rename from lib/librte_latencystats/rte_latencystats.h
rename to lib/latencystats/rte_latencystats.h
diff --git a/lib/librte_latencystats/version.map b/lib/latencystats/version.map
similarity index 100%
rename from lib/librte_latencystats/version.map
rename to lib/latencystats/version.map
diff --git a/lib/librte_lpm/meson.build b/lib/lpm/meson.build
similarity index 100%
rename from lib/librte_lpm/meson.build
rename to lib/lpm/meson.build
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
similarity index 100%
rename from lib/librte_lpm/rte_lpm.c
rename to lib/lpm/rte_lpm.c
diff --git a/lib/librte_lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm.h
rename to lib/lpm/rte_lpm.h
diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
similarity index 100%
rename from lib/librte_lpm/rte_lpm6.c
rename to lib/lpm/rte_lpm6.c
diff --git a/lib/librte_lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm6.h
rename to lib/lpm/rte_lpm6.h
diff --git a/lib/librte_lpm/rte_lpm_altivec.h b/lib/lpm/rte_lpm_altivec.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_altivec.h
rename to lib/lpm/rte_lpm_altivec.h
diff --git a/lib/librte_lpm/rte_lpm_neon.h b/lib/lpm/rte_lpm_neon.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_neon.h
rename to lib/lpm/rte_lpm_neon.h
diff --git a/lib/librte_lpm/rte_lpm_sse.h b/lib/lpm/rte_lpm_sse.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_sse.h
rename to lib/lpm/rte_lpm_sse.h
diff --git a/lib/librte_lpm/rte_lpm_sve.h b/lib/lpm/rte_lpm_sve.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_sve.h
rename to lib/lpm/rte_lpm_sve.h
diff --git a/lib/librte_lpm/version.map b/lib/lpm/version.map
similarity index 100%
rename from lib/librte_lpm/version.map
rename to lib/lpm/version.map
diff --git a/lib/librte_mbuf/meson.build b/lib/mbuf/meson.build
similarity index 100%
rename from lib/librte_mbuf/meson.build
rename to lib/mbuf/meson.build
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf.c
rename to lib/mbuf/rte_mbuf.c
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf.h
rename to lib/mbuf/rte_mbuf.h
diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_core.h
rename to lib/mbuf/rte_mbuf_core.h
diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_dyn.c
rename to lib/mbuf/rte_mbuf_dyn.c
diff --git a/lib/librte_mbuf/rte_mbuf_dyn.h b/lib/mbuf/rte_mbuf_dyn.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_dyn.h
rename to lib/mbuf/rte_mbuf_dyn.h
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_pool_ops.c
rename to lib/mbuf/rte_mbuf_pool_ops.c
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.h b/lib/mbuf/rte_mbuf_pool_ops.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_pool_ops.h
rename to lib/mbuf/rte_mbuf_pool_ops.h
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.c b/lib/mbuf/rte_mbuf_ptype.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_ptype.c
rename to lib/mbuf/rte_mbuf_ptype.c
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/mbuf/rte_mbuf_ptype.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_ptype.h
rename to lib/mbuf/rte_mbuf_ptype.h
diff --git a/lib/librte_mbuf/version.map b/lib/mbuf/version.map
similarity index 100%
rename from lib/librte_mbuf/version.map
rename to lib/mbuf/version.map
diff --git a/lib/librte_member/meson.build b/lib/member/meson.build
similarity index 100%
rename from lib/librte_member/meson.build
rename to lib/member/meson.build
diff --git a/lib/librte_member/rte_member.c b/lib/member/rte_member.c
similarity index 100%
rename from lib/librte_member/rte_member.c
rename to lib/member/rte_member.c
diff --git a/lib/librte_member/rte_member.h b/lib/member/rte_member.h
similarity index 100%
rename from lib/librte_member/rte_member.h
rename to lib/member/rte_member.h
diff --git a/lib/librte_member/rte_member_ht.c b/lib/member/rte_member_ht.c
similarity index 100%
rename from lib/librte_member/rte_member_ht.c
rename to lib/member/rte_member_ht.c
diff --git a/lib/librte_member/rte_member_ht.h b/lib/member/rte_member_ht.h
similarity index 100%
rename from lib/librte_member/rte_member_ht.h
rename to lib/member/rte_member_ht.h
diff --git a/lib/librte_member/rte_member_vbf.c b/lib/member/rte_member_vbf.c
similarity index 100%
rename from lib/librte_member/rte_member_vbf.c
rename to lib/member/rte_member_vbf.c
diff --git a/lib/librte_member/rte_member_vbf.h b/lib/member/rte_member_vbf.h
similarity index 100%
rename from lib/librte_member/rte_member_vbf.h
rename to lib/member/rte_member_vbf.h
diff --git a/lib/librte_member/rte_member_x86.h b/lib/member/rte_member_x86.h
similarity index 100%
rename from lib/librte_member/rte_member_x86.h
rename to lib/member/rte_member_x86.h
diff --git a/lib/librte_member/version.map b/lib/member/version.map
similarity index 100%
rename from lib/librte_member/version.map
rename to lib/member/version.map
diff --git a/lib/librte_mempool/mempool_trace_points.c b/lib/mempool/mempool_trace_points.c
similarity index 100%
rename from lib/librte_mempool/mempool_trace_points.c
rename to lib/mempool/mempool_trace_points.c
diff --git a/lib/librte_mempool/meson.build b/lib/mempool/meson.build
similarity index 100%
rename from lib/librte_mempool/meson.build
rename to lib/mempool/meson.build
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool.c
rename to lib/mempool/rte_mempool.c
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool.h
rename to lib/mempool/rte_mempool.h
diff --git a/lib/librte_mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool_ops.c
rename to lib/mempool/rte_mempool_ops.c
diff --git a/lib/librte_mempool/rte_mempool_ops_default.c b/lib/mempool/rte_mempool_ops_default.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool_ops_default.c
rename to lib/mempool/rte_mempool_ops_default.c
diff --git a/lib/librte_mempool/rte_mempool_trace.h b/lib/mempool/rte_mempool_trace.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool_trace.h
rename to lib/mempool/rte_mempool_trace.h
diff --git a/lib/librte_mempool/rte_mempool_trace_fp.h b/lib/mempool/rte_mempool_trace_fp.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool_trace_fp.h
rename to lib/mempool/rte_mempool_trace_fp.h
diff --git a/lib/librte_mempool/version.map b/lib/mempool/version.map
similarity index 100%
rename from lib/librte_mempool/version.map
rename to lib/mempool/version.map
diff --git a/lib/meson.build b/lib/meson.build
index 9b99aa0be..3a9a6c3be 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -114,8 +114,10 @@ foreach l:libraries
         deps += ['eal']
     endif
 
-    dir_name = 'librte_' + l
-    subdir(dir_name)
+    subdir(l)
+    if name != l
+        warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
+    endif
 
     if not build
         dpdk_libs_disabled += name
@@ -128,7 +130,7 @@ foreach l:libraries
     foreach d:deps
         if not is_variable('shared_rte_' + d)
             error('Missing internal dependency "@0@" for @1@ [@2@]'
-                    .format(d, name, 'lib/' + dir_name))
+                    .format(d, name, 'lib/' + l))
         endif
         shared_deps += [get_variable('shared_rte_' + d)]
         static_deps += [get_variable('static_rte_' + d)]
@@ -144,7 +146,7 @@ foreach l:libraries
     dpdk_chkinc_headers += headers
 
     libname = 'rte_' + name
-    includes += include_directories(dir_name)
+    includes += include_directories(l)
 
     if is_windows and use_function_versioning
         message('@0@: Function versioning is not supported by Windows.'.format(name))
@@ -176,8 +178,8 @@ foreach l:libraries
         cflags += '-DRTE_BUILD_SHARED_LIB'
     endif
     version_map = '@0@/@1@/version.map'.format(
-            meson.current_source_dir(), dir_name)
-    implib = dir_name + '.dll.a'
+            meson.current_source_dir(), l)
+    implib = 'librte_' + l + '.dll.a'
 
     def_file = custom_target(libname + '_def',
             command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
@@ -236,6 +238,6 @@ foreach l:libraries
     set_variable('shared_rte_' + name, shared_dep)
     set_variable('static_rte_' + name, static_dep)
     if developer_mode
-        message('lib/@0@: Defining dependency "@1@"'.format(dir_name, name))
+        message('lib/@0@: Defining dependency "@1@"'.format(l, name))
     endif
 endforeach
diff --git a/lib/librte_meter/meson.build b/lib/meter/meson.build
similarity index 100%
rename from lib/librte_meter/meson.build
rename to lib/meter/meson.build
diff --git a/lib/librte_meter/rte_meter.c b/lib/meter/rte_meter.c
similarity index 100%
rename from lib/librte_meter/rte_meter.c
rename to lib/meter/rte_meter.c
diff --git a/lib/librte_meter/rte_meter.h b/lib/meter/rte_meter.h
similarity index 100%
rename from lib/librte_meter/rte_meter.h
rename to lib/meter/rte_meter.h
diff --git a/lib/librte_meter/version.map b/lib/meter/version.map
similarity index 100%
rename from lib/librte_meter/version.map
rename to lib/meter/version.map
diff --git a/lib/librte_metrics/meson.build b/lib/metrics/meson.build
similarity index 100%
rename from lib/librte_metrics/meson.build
rename to lib/metrics/meson.build
diff --git a/lib/librte_metrics/rte_metrics.c b/lib/metrics/rte_metrics.c
similarity index 100%
rename from lib/librte_metrics/rte_metrics.c
rename to lib/metrics/rte_metrics.c
diff --git a/lib/librte_metrics/rte_metrics.h b/lib/metrics/rte_metrics.h
similarity index 100%
rename from lib/librte_metrics/rte_metrics.h
rename to lib/metrics/rte_metrics.h
diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/metrics/rte_metrics_telemetry.c
similarity index 100%
rename from lib/librte_metrics/rte_metrics_telemetry.c
rename to lib/metrics/rte_metrics_telemetry.c
diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/metrics/rte_metrics_telemetry.h
similarity index 100%
rename from lib/librte_metrics/rte_metrics_telemetry.h
rename to lib/metrics/rte_metrics_telemetry.h
diff --git a/lib/librte_metrics/version.map b/lib/metrics/version.map
similarity index 100%
rename from lib/librte_metrics/version.map
rename to lib/metrics/version.map
diff --git a/lib/librte_net/meson.build b/lib/net/meson.build
similarity index 100%
rename from lib/librte_net/meson.build
rename to lib/net/meson.build
diff --git a/lib/librte_net/net_crc.h b/lib/net/net_crc.h
similarity index 100%
rename from lib/librte_net/net_crc.h
rename to lib/net/net_crc.h
diff --git a/lib/librte_net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
similarity index 100%
rename from lib/librte_net/net_crc_avx512.c
rename to lib/net/net_crc_avx512.c
diff --git a/lib/librte_net/net_crc_neon.c b/lib/net/net_crc_neon.c
similarity index 100%
rename from lib/librte_net/net_crc_neon.c
rename to lib/net/net_crc_neon.c
diff --git a/lib/librte_net/net_crc_sse.c b/lib/net/net_crc_sse.c
similarity index 100%
rename from lib/librte_net/net_crc_sse.c
rename to lib/net/net_crc_sse.c
diff --git a/lib/librte_net/rte_arp.c b/lib/net/rte_arp.c
similarity index 100%
rename from lib/librte_net/rte_arp.c
rename to lib/net/rte_arp.c
diff --git a/lib/librte_net/rte_arp.h b/lib/net/rte_arp.h
similarity index 100%
rename from lib/librte_net/rte_arp.h
rename to lib/net/rte_arp.h
diff --git a/lib/librte_net/rte_ecpri.h b/lib/net/rte_ecpri.h
similarity index 100%
rename from lib/librte_net/rte_ecpri.h
rename to lib/net/rte_ecpri.h
diff --git a/lib/librte_net/rte_esp.h b/lib/net/rte_esp.h
similarity index 100%
rename from lib/librte_net/rte_esp.h
rename to lib/net/rte_esp.h
diff --git a/lib/librte_net/rte_ether.c b/lib/net/rte_ether.c
similarity index 100%
rename from lib/librte_net/rte_ether.c
rename to lib/net/rte_ether.c
diff --git a/lib/librte_net/rte_ether.h b/lib/net/rte_ether.h
similarity index 100%
rename from lib/librte_net/rte_ether.h
rename to lib/net/rte_ether.h
diff --git a/lib/librte_net/rte_geneve.h b/lib/net/rte_geneve.h
similarity index 100%
rename from lib/librte_net/rte_geneve.h
rename to lib/net/rte_geneve.h
diff --git a/lib/librte_net/rte_gre.h b/lib/net/rte_gre.h
similarity index 100%
rename from lib/librte_net/rte_gre.h
rename to lib/net/rte_gre.h
diff --git a/lib/librte_net/rte_gtp.h b/lib/net/rte_gtp.h
similarity index 100%
rename from lib/librte_net/rte_gtp.h
rename to lib/net/rte_gtp.h
diff --git a/lib/librte_net/rte_higig.h b/lib/net/rte_higig.h
similarity index 100%
rename from lib/librte_net/rte_higig.h
rename to lib/net/rte_higig.h
diff --git a/lib/librte_net/rte_icmp.h b/lib/net/rte_icmp.h
similarity index 100%
rename from lib/librte_net/rte_icmp.h
rename to lib/net/rte_icmp.h
diff --git a/lib/librte_net/rte_ip.h b/lib/net/rte_ip.h
similarity index 100%
rename from lib/librte_net/rte_ip.h
rename to lib/net/rte_ip.h
diff --git a/lib/librte_net/rte_mpls.h b/lib/net/rte_mpls.h
similarity index 100%
rename from lib/librte_net/rte_mpls.h
rename to lib/net/rte_mpls.h
diff --git a/lib/librte_net/rte_net.c b/lib/net/rte_net.c
similarity index 100%
rename from lib/librte_net/rte_net.c
rename to lib/net/rte_net.c
diff --git a/lib/librte_net/rte_net.h b/lib/net/rte_net.h
similarity index 100%
rename from lib/librte_net/rte_net.h
rename to lib/net/rte_net.h
diff --git a/lib/librte_net/rte_net_crc.c b/lib/net/rte_net_crc.c
similarity index 100%
rename from lib/librte_net/rte_net_crc.c
rename to lib/net/rte_net_crc.c
diff --git a/lib/librte_net/rte_net_crc.h b/lib/net/rte_net_crc.h
similarity index 100%
rename from lib/librte_net/rte_net_crc.h
rename to lib/net/rte_net_crc.h
diff --git a/lib/librte_net/rte_sctp.h b/lib/net/rte_sctp.h
similarity index 100%
rename from lib/librte_net/rte_sctp.h
rename to lib/net/rte_sctp.h
diff --git a/lib/librte_net/rte_tcp.h b/lib/net/rte_tcp.h
similarity index 100%
rename from lib/librte_net/rte_tcp.h
rename to lib/net/rte_tcp.h
diff --git a/lib/librte_net/rte_udp.h b/lib/net/rte_udp.h
similarity index 100%
rename from lib/librte_net/rte_udp.h
rename to lib/net/rte_udp.h
diff --git a/lib/librte_net/rte_vxlan.h b/lib/net/rte_vxlan.h
similarity index 100%
rename from lib/librte_net/rte_vxlan.h
rename to lib/net/rte_vxlan.h
diff --git a/lib/librte_net/version.map b/lib/net/version.map
similarity index 100%
rename from lib/librte_net/version.map
rename to lib/net/version.map
diff --git a/lib/librte_node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
similarity index 100%
rename from lib/librte_node/ethdev_ctrl.c
rename to lib/node/ethdev_ctrl.c
diff --git a/lib/librte_node/ethdev_rx.c b/lib/node/ethdev_rx.c
similarity index 100%
rename from lib/librte_node/ethdev_rx.c
rename to lib/node/ethdev_rx.c
diff --git a/lib/librte_node/ethdev_rx_priv.h b/lib/node/ethdev_rx_priv.h
similarity index 100%
rename from lib/librte_node/ethdev_rx_priv.h
rename to lib/node/ethdev_rx_priv.h
diff --git a/lib/librte_node/ethdev_tx.c b/lib/node/ethdev_tx.c
similarity index 100%
rename from lib/librte_node/ethdev_tx.c
rename to lib/node/ethdev_tx.c
diff --git a/lib/librte_node/ethdev_tx_priv.h b/lib/node/ethdev_tx_priv.h
similarity index 100%
rename from lib/librte_node/ethdev_tx_priv.h
rename to lib/node/ethdev_tx_priv.h
diff --git a/lib/librte_node/ip4_lookup.c b/lib/node/ip4_lookup.c
similarity index 100%
rename from lib/librte_node/ip4_lookup.c
rename to lib/node/ip4_lookup.c
diff --git a/lib/librte_node/ip4_lookup_neon.h b/lib/node/ip4_lookup_neon.h
similarity index 100%
rename from lib/librte_node/ip4_lookup_neon.h
rename to lib/node/ip4_lookup_neon.h
diff --git a/lib/librte_node/ip4_lookup_sse.h b/lib/node/ip4_lookup_sse.h
similarity index 100%
rename from lib/librte_node/ip4_lookup_sse.h
rename to lib/node/ip4_lookup_sse.h
diff --git a/lib/librte_node/ip4_rewrite.c b/lib/node/ip4_rewrite.c
similarity index 100%
rename from lib/librte_node/ip4_rewrite.c
rename to lib/node/ip4_rewrite.c
diff --git a/lib/librte_node/ip4_rewrite_priv.h b/lib/node/ip4_rewrite_priv.h
similarity index 100%
rename from lib/librte_node/ip4_rewrite_priv.h
rename to lib/node/ip4_rewrite_priv.h
diff --git a/lib/librte_node/log.c b/lib/node/log.c
similarity index 100%
rename from lib/librte_node/log.c
rename to lib/node/log.c
diff --git a/lib/librte_node/meson.build b/lib/node/meson.build
similarity index 100%
rename from lib/librte_node/meson.build
rename to lib/node/meson.build
diff --git a/lib/librte_node/node_private.h b/lib/node/node_private.h
similarity index 100%
rename from lib/librte_node/node_private.h
rename to lib/node/node_private.h
diff --git a/lib/librte_node/null.c b/lib/node/null.c
similarity index 100%
rename from lib/librte_node/null.c
rename to lib/node/null.c
diff --git a/lib/librte_node/pkt_cls.c b/lib/node/pkt_cls.c
similarity index 100%
rename from lib/librte_node/pkt_cls.c
rename to lib/node/pkt_cls.c
diff --git a/lib/librte_node/pkt_cls_priv.h b/lib/node/pkt_cls_priv.h
similarity index 100%
rename from lib/librte_node/pkt_cls_priv.h
rename to lib/node/pkt_cls_priv.h
diff --git a/lib/librte_node/pkt_drop.c b/lib/node/pkt_drop.c
similarity index 100%
rename from lib/librte_node/pkt_drop.c
rename to lib/node/pkt_drop.c
diff --git a/lib/librte_node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
similarity index 100%
rename from lib/librte_node/rte_node_eth_api.h
rename to lib/node/rte_node_eth_api.h
diff --git a/lib/librte_node/rte_node_ip4_api.h b/lib/node/rte_node_ip4_api.h
similarity index 100%
rename from lib/librte_node/rte_node_ip4_api.h
rename to lib/node/rte_node_ip4_api.h
diff --git a/lib/librte_node/version.map b/lib/node/version.map
similarity index 100%
rename from lib/librte_node/version.map
rename to lib/node/version.map
diff --git a/lib/librte_pci/meson.build b/lib/pci/meson.build
similarity index 100%
rename from lib/librte_pci/meson.build
rename to lib/pci/meson.build
diff --git a/lib/librte_pci/rte_pci.c b/lib/pci/rte_pci.c
similarity index 100%
rename from lib/librte_pci/rte_pci.c
rename to lib/pci/rte_pci.c
diff --git a/lib/librte_pci/rte_pci.h b/lib/pci/rte_pci.h
similarity index 100%
rename from lib/librte_pci/rte_pci.h
rename to lib/pci/rte_pci.h
diff --git a/lib/librte_pci/version.map b/lib/pci/version.map
similarity index 100%
rename from lib/librte_pci/version.map
rename to lib/pci/version.map
diff --git a/lib/librte_pdump/meson.build b/lib/pdump/meson.build
similarity index 100%
rename from lib/librte_pdump/meson.build
rename to lib/pdump/meson.build
diff --git a/lib/librte_pdump/rte_pdump.c b/lib/pdump/rte_pdump.c
similarity index 100%
rename from lib/librte_pdump/rte_pdump.c
rename to lib/pdump/rte_pdump.c
diff --git a/lib/librte_pdump/rte_pdump.h b/lib/pdump/rte_pdump.h
similarity index 100%
rename from lib/librte_pdump/rte_pdump.h
rename to lib/pdump/rte_pdump.h
diff --git a/lib/librte_pdump/version.map b/lib/pdump/version.map
similarity index 100%
rename from lib/librte_pdump/version.map
rename to lib/pdump/version.map
diff --git a/lib/librte_pipeline/meson.build b/lib/pipeline/meson.build
similarity index 100%
rename from lib/librte_pipeline/meson.build
rename to lib/pipeline/meson.build
diff --git a/lib/librte_pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
similarity index 100%
rename from lib/librte_pipeline/rte_pipeline.c
rename to lib/pipeline/rte_pipeline.c
diff --git a/lib/librte_pipeline/rte_pipeline.h b/lib/pipeline/rte_pipeline.h
similarity index 100%
rename from lib/librte_pipeline/rte_pipeline.h
rename to lib/pipeline/rte_pipeline.h
diff --git a/lib/librte_pipeline/rte_port_in_action.c b/lib/pipeline/rte_port_in_action.c
similarity index 100%
rename from lib/librte_pipeline/rte_port_in_action.c
rename to lib/pipeline/rte_port_in_action.c
diff --git a/lib/librte_pipeline/rte_port_in_action.h b/lib/pipeline/rte_port_in_action.h
similarity index 100%
rename from lib/librte_pipeline/rte_port_in_action.h
rename to lib/pipeline/rte_port_in_action.h
diff --git a/lib/librte_pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_ctl.c
rename to lib/pipeline/rte_swx_ctl.c
diff --git a/lib/librte_pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_ctl.h
rename to lib/pipeline/rte_swx_ctl.h
diff --git a/lib/librte_pipeline/rte_swx_extern.h b/lib/pipeline/rte_swx_extern.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_extern.h
rename to lib/pipeline/rte_swx_extern.h
diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline.c
rename to lib/pipeline/rte_swx_pipeline.c
diff --git a/lib/librte_pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline.h
rename to lib/pipeline/rte_swx_pipeline.h
diff --git a/lib/librte_pipeline/rte_swx_pipeline_spec.c b/lib/pipeline/rte_swx_pipeline_spec.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline_spec.c
rename to lib/pipeline/rte_swx_pipeline_spec.c
diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c
similarity index 100%
rename from lib/librte_pipeline/rte_table_action.c
rename to lib/pipeline/rte_table_action.c
diff --git a/lib/librte_pipeline/rte_table_action.h b/lib/pipeline/rte_table_action.h
similarity index 100%
rename from lib/librte_pipeline/rte_table_action.h
rename to lib/pipeline/rte_table_action.h
diff --git a/lib/librte_pipeline/version.map b/lib/pipeline/version.map
similarity index 100%
rename from lib/librte_pipeline/version.map
rename to lib/pipeline/version.map
diff --git a/lib/librte_port/meson.build b/lib/port/meson.build
similarity index 100%
rename from lib/librte_port/meson.build
rename to lib/port/meson.build
diff --git a/lib/librte_port/rte_port.h b/lib/port/rte_port.h
similarity index 100%
rename from lib/librte_port/rte_port.h
rename to lib/port/rte_port.h
diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/port/rte_port_ethdev.c
similarity index 100%
rename from lib/librte_port/rte_port_ethdev.c
rename to lib/port/rte_port_ethdev.c
diff --git a/lib/librte_port/rte_port_ethdev.h b/lib/port/rte_port_ethdev.h
similarity index 100%
rename from lib/librte_port/rte_port_ethdev.h
rename to lib/port/rte_port_ethdev.h
diff --git a/lib/librte_port/rte_port_eventdev.c b/lib/port/rte_port_eventdev.c
similarity index 100%
rename from lib/librte_port/rte_port_eventdev.c
rename to lib/port/rte_port_eventdev.c
diff --git a/lib/librte_port/rte_port_eventdev.h b/lib/port/rte_port_eventdev.h
similarity index 100%
rename from lib/librte_port/rte_port_eventdev.h
rename to lib/port/rte_port_eventdev.h
diff --git a/lib/librte_port/rte_port_fd.c b/lib/port/rte_port_fd.c
similarity index 100%
rename from lib/librte_port/rte_port_fd.c
rename to lib/port/rte_port_fd.c
diff --git a/lib/librte_port/rte_port_fd.h b/lib/port/rte_port_fd.h
similarity index 100%
rename from lib/librte_port/rte_port_fd.h
rename to lib/port/rte_port_fd.h
diff --git a/lib/librte_port/rte_port_frag.c b/lib/port/rte_port_frag.c
similarity index 100%
rename from lib/librte_port/rte_port_frag.c
rename to lib/port/rte_port_frag.c
diff --git a/lib/librte_port/rte_port_frag.h b/lib/port/rte_port_frag.h
similarity index 100%
rename from lib/librte_port/rte_port_frag.h
rename to lib/port/rte_port_frag.h
diff --git a/lib/librte_port/rte_port_kni.c b/lib/port/rte_port_kni.c
similarity index 100%
rename from lib/librte_port/rte_port_kni.c
rename to lib/port/rte_port_kni.c
diff --git a/lib/librte_port/rte_port_kni.h b/lib/port/rte_port_kni.h
similarity index 100%
rename from lib/librte_port/rte_port_kni.h
rename to lib/port/rte_port_kni.h
diff --git a/lib/librte_port/rte_port_ras.c b/lib/port/rte_port_ras.c
similarity index 100%
rename from lib/librte_port/rte_port_ras.c
rename to lib/port/rte_port_ras.c
diff --git a/lib/librte_port/rte_port_ras.h b/lib/port/rte_port_ras.h
similarity index 100%
rename from lib/librte_port/rte_port_ras.h
rename to lib/port/rte_port_ras.h
diff --git a/lib/librte_port/rte_port_ring.c b/lib/port/rte_port_ring.c
similarity index 100%
rename from lib/librte_port/rte_port_ring.c
rename to lib/port/rte_port_ring.c
diff --git a/lib/librte_port/rte_port_ring.h b/lib/port/rte_port_ring.h
similarity index 100%
rename from lib/librte_port/rte_port_ring.h
rename to lib/port/rte_port_ring.h
diff --git a/lib/librte_port/rte_port_sched.c b/lib/port/rte_port_sched.c
similarity index 100%
rename from lib/librte_port/rte_port_sched.c
rename to lib/port/rte_port_sched.c
diff --git a/lib/librte_port/rte_port_sched.h b/lib/port/rte_port_sched.h
similarity index 100%
rename from lib/librte_port/rte_port_sched.h
rename to lib/port/rte_port_sched.h
diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/port/rte_port_source_sink.c
similarity index 100%
rename from lib/librte_port/rte_port_source_sink.c
rename to lib/port/rte_port_source_sink.c
diff --git a/lib/librte_port/rte_port_source_sink.h b/lib/port/rte_port_source_sink.h
similarity index 100%
rename from lib/librte_port/rte_port_source_sink.h
rename to lib/port/rte_port_source_sink.h
diff --git a/lib/librte_port/rte_port_sym_crypto.c b/lib/port/rte_port_sym_crypto.c
similarity index 100%
rename from lib/librte_port/rte_port_sym_crypto.c
rename to lib/port/rte_port_sym_crypto.c
diff --git a/lib/librte_port/rte_port_sym_crypto.h b/lib/port/rte_port_sym_crypto.h
similarity index 100%
rename from lib/librte_port/rte_port_sym_crypto.h
rename to lib/port/rte_port_sym_crypto.h
diff --git a/lib/librte_port/rte_swx_port.h b/lib/port/rte_swx_port.h
similarity index 100%
rename from lib/librte_port/rte_swx_port.h
rename to lib/port/rte_swx_port.h
diff --git a/lib/librte_port/rte_swx_port_ethdev.c b/lib/port/rte_swx_port_ethdev.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_ethdev.c
rename to lib/port/rte_swx_port_ethdev.c
diff --git a/lib/librte_port/rte_swx_port_ethdev.h b/lib/port/rte_swx_port_ethdev.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_ethdev.h
rename to lib/port/rte_swx_port_ethdev.h
diff --git a/lib/librte_port/rte_swx_port_fd.c b/lib/port/rte_swx_port_fd.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_fd.c
rename to lib/port/rte_swx_port_fd.c
diff --git a/lib/librte_port/rte_swx_port_fd.h b/lib/port/rte_swx_port_fd.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_fd.h
rename to lib/port/rte_swx_port_fd.h
diff --git a/lib/librte_port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_ring.c
rename to lib/port/rte_swx_port_ring.c
diff --git a/lib/librte_port/rte_swx_port_ring.h b/lib/port/rte_swx_port_ring.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_ring.h
rename to lib/port/rte_swx_port_ring.h
diff --git a/lib/librte_port/rte_swx_port_source_sink.c b/lib/port/rte_swx_port_source_sink.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_source_sink.c
rename to lib/port/rte_swx_port_source_sink.c
diff --git a/lib/librte_port/rte_swx_port_source_sink.h b/lib/port/rte_swx_port_source_sink.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_source_sink.h
rename to lib/port/rte_swx_port_source_sink.h
diff --git a/lib/librte_port/version.map b/lib/port/version.map
similarity index 100%
rename from lib/librte_port/version.map
rename to lib/port/version.map
diff --git a/lib/librte_power/guest_channel.c b/lib/power/guest_channel.c
similarity index 100%
rename from lib/librte_power/guest_channel.c
rename to lib/power/guest_channel.c
diff --git a/lib/librte_power/guest_channel.h b/lib/power/guest_channel.h
similarity index 100%
rename from lib/librte_power/guest_channel.h
rename to lib/power/guest_channel.h
diff --git a/lib/librte_power/meson.build b/lib/power/meson.build
similarity index 100%
rename from lib/librte_power/meson.build
rename to lib/power/meson.build
diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
similarity index 100%
rename from lib/librte_power/power_acpi_cpufreq.c
rename to lib/power/power_acpi_cpufreq.c
diff --git a/lib/librte_power/power_acpi_cpufreq.h b/lib/power/power_acpi_cpufreq.h
similarity index 100%
rename from lib/librte_power/power_acpi_cpufreq.h
rename to lib/power/power_acpi_cpufreq.h
diff --git a/lib/librte_power/power_common.c b/lib/power/power_common.c
similarity index 100%
rename from lib/librte_power/power_common.c
rename to lib/power/power_common.c
diff --git a/lib/librte_power/power_common.h b/lib/power/power_common.h
similarity index 100%
rename from lib/librte_power/power_common.h
rename to lib/power/power_common.h
diff --git a/lib/librte_power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
similarity index 100%
rename from lib/librte_power/power_kvm_vm.c
rename to lib/power/power_kvm_vm.c
diff --git a/lib/librte_power/power_kvm_vm.h b/lib/power/power_kvm_vm.h
similarity index 100%
rename from lib/librte_power/power_kvm_vm.h
rename to lib/power/power_kvm_vm.h
diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c
similarity index 100%
rename from lib/librte_power/power_pstate_cpufreq.c
rename to lib/power/power_pstate_cpufreq.c
diff --git a/lib/librte_power/power_pstate_cpufreq.h b/lib/power/power_pstate_cpufreq.h
similarity index 100%
rename from lib/librte_power/power_pstate_cpufreq.h
rename to lib/power/power_pstate_cpufreq.h
diff --git a/lib/librte_power/rte_power.c b/lib/power/rte_power.c
similarity index 100%
rename from lib/librte_power/rte_power.c
rename to lib/power/rte_power.c
diff --git a/lib/librte_power/rte_power.h b/lib/power/rte_power.h
similarity index 100%
rename from lib/librte_power/rte_power.h
rename to lib/power/rte_power.h
diff --git a/lib/librte_power/rte_power_empty_poll.c b/lib/power/rte_power_empty_poll.c
similarity index 100%
rename from lib/librte_power/rte_power_empty_poll.c
rename to lib/power/rte_power_empty_poll.c
diff --git a/lib/librte_power/rte_power_empty_poll.h b/lib/power/rte_power_empty_poll.h
similarity index 100%
rename from lib/librte_power/rte_power_empty_poll.h
rename to lib/power/rte_power_empty_poll.h
diff --git a/lib/librte_power/rte_power_guest_channel.h b/lib/power/rte_power_guest_channel.h
similarity index 100%
rename from lib/librte_power/rte_power_guest_channel.h
rename to lib/power/rte_power_guest_channel.h
diff --git a/lib/librte_power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
similarity index 100%
rename from lib/librte_power/rte_power_pmd_mgmt.c
rename to lib/power/rte_power_pmd_mgmt.c
diff --git a/lib/librte_power/rte_power_pmd_mgmt.h b/lib/power/rte_power_pmd_mgmt.h
similarity index 100%
rename from lib/librte_power/rte_power_pmd_mgmt.h
rename to lib/power/rte_power_pmd_mgmt.h
diff --git a/lib/librte_power/version.map b/lib/power/version.map
similarity index 100%
rename from lib/librte_power/version.map
rename to lib/power/version.map
diff --git a/lib/librte_rawdev/meson.build b/lib/rawdev/meson.build
similarity index 100%
rename from lib/librte_rawdev/meson.build
rename to lib/rawdev/meson.build
diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev.c
rename to lib/rawdev/rte_rawdev.c
diff --git a/lib/librte_rawdev/rte_rawdev.h b/lib/rawdev/rte_rawdev.h
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev.h
rename to lib/rawdev/rte_rawdev.h
diff --git a/lib/librte_rawdev/rte_rawdev_pmd.h b/lib/rawdev/rte_rawdev_pmd.h
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev_pmd.h
rename to lib/rawdev/rte_rawdev_pmd.h
diff --git a/lib/librte_rawdev/version.map b/lib/rawdev/version.map
similarity index 100%
rename from lib/librte_rawdev/version.map
rename to lib/rawdev/version.map
diff --git a/lib/librte_rcu/meson.build b/lib/rcu/meson.build
similarity index 100%
rename from lib/librte_rcu/meson.build
rename to lib/rcu/meson.build
diff --git a/lib/librte_rcu/rcu_qsbr_pvt.h b/lib/rcu/rcu_qsbr_pvt.h
similarity index 100%
rename from lib/librte_rcu/rcu_qsbr_pvt.h
rename to lib/rcu/rcu_qsbr_pvt.h
diff --git a/lib/librte_rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
similarity index 100%
rename from lib/librte_rcu/rte_rcu_qsbr.c
rename to lib/rcu/rte_rcu_qsbr.c
diff --git a/lib/librte_rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
similarity index 100%
rename from lib/librte_rcu/rte_rcu_qsbr.h
rename to lib/rcu/rte_rcu_qsbr.h
diff --git a/lib/librte_rcu/version.map b/lib/rcu/version.map
similarity index 100%
rename from lib/librte_rcu/version.map
rename to lib/rcu/version.map
diff --git a/lib/librte_regexdev/meson.build b/lib/regexdev/meson.build
similarity index 100%
rename from lib/librte_regexdev/meson.build
rename to lib/regexdev/meson.build
diff --git a/lib/librte_regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev.c
rename to lib/regexdev/rte_regexdev.c
diff --git a/lib/librte_regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev.h
rename to lib/regexdev/rte_regexdev.h
diff --git a/lib/librte_regexdev/rte_regexdev_core.h b/lib/regexdev/rte_regexdev_core.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev_core.h
rename to lib/regexdev/rte_regexdev_core.h
diff --git a/lib/librte_regexdev/rte_regexdev_driver.h b/lib/regexdev/rte_regexdev_driver.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev_driver.h
rename to lib/regexdev/rte_regexdev_driver.h
diff --git a/lib/librte_regexdev/version.map b/lib/regexdev/version.map
similarity index 100%
rename from lib/librte_regexdev/version.map
rename to lib/regexdev/version.map
diff --git a/lib/librte_reorder/meson.build b/lib/reorder/meson.build
similarity index 100%
rename from lib/librte_reorder/meson.build
rename to lib/reorder/meson.build
diff --git a/lib/librte_reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
similarity index 100%
rename from lib/librte_reorder/rte_reorder.c
rename to lib/reorder/rte_reorder.c
diff --git a/lib/librte_reorder/rte_reorder.h b/lib/reorder/rte_reorder.h
similarity index 100%
rename from lib/librte_reorder/rte_reorder.h
rename to lib/reorder/rte_reorder.h
diff --git a/lib/librte_reorder/version.map b/lib/reorder/version.map
similarity index 100%
rename from lib/librte_reorder/version.map
rename to lib/reorder/version.map
diff --git a/lib/librte_rib/meson.build b/lib/rib/meson.build
similarity index 100%
rename from lib/librte_rib/meson.build
rename to lib/rib/meson.build
diff --git a/lib/librte_rib/rte_rib.c b/lib/rib/rte_rib.c
similarity index 100%
rename from lib/librte_rib/rte_rib.c
rename to lib/rib/rte_rib.c
diff --git a/lib/librte_rib/rte_rib.h b/lib/rib/rte_rib.h
similarity index 100%
rename from lib/librte_rib/rte_rib.h
rename to lib/rib/rte_rib.h
diff --git a/lib/librte_rib/rte_rib6.c b/lib/rib/rte_rib6.c
similarity index 100%
rename from lib/librte_rib/rte_rib6.c
rename to lib/rib/rte_rib6.c
diff --git a/lib/librte_rib/rte_rib6.h b/lib/rib/rte_rib6.h
similarity index 100%
rename from lib/librte_rib/rte_rib6.h
rename to lib/rib/rte_rib6.h
diff --git a/lib/librte_rib/version.map b/lib/rib/version.map
similarity index 100%
rename from lib/librte_rib/version.map
rename to lib/rib/version.map
diff --git a/lib/librte_ring/meson.build b/lib/ring/meson.build
similarity index 100%
rename from lib/librte_ring/meson.build
rename to lib/ring/meson.build
diff --git a/lib/librte_ring/rte_ring.c b/lib/ring/rte_ring.c
similarity index 100%
rename from lib/librte_ring/rte_ring.c
rename to lib/ring/rte_ring.c
diff --git a/lib/librte_ring/rte_ring.h b/lib/ring/rte_ring.h
similarity index 100%
rename from lib/librte_ring/rte_ring.h
rename to lib/ring/rte_ring.h
diff --git a/lib/librte_ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_c11_pvt.h
rename to lib/ring/rte_ring_c11_pvt.h
diff --git a/lib/librte_ring/rte_ring_core.h b/lib/ring/rte_ring_core.h
similarity index 100%
rename from lib/librte_ring/rte_ring_core.h
rename to lib/ring/rte_ring_core.h
diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/ring/rte_ring_elem.h
similarity index 100%
rename from lib/librte_ring/rte_ring_elem.h
rename to lib/ring/rte_ring_elem.h
diff --git a/lib/librte_ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_elem_pvt.h
rename to lib/ring/rte_ring_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_generic_pvt.h
rename to lib/ring/rte_ring_generic_pvt.h
diff --git a/lib/librte_ring/rte_ring_hts.h b/lib/ring/rte_ring_hts.h
similarity index 100%
rename from lib/librte_ring/rte_ring_hts.h
rename to lib/ring/rte_ring_hts.h
diff --git a/lib/librte_ring/rte_ring_hts_elem_pvt.h b/lib/ring/rte_ring_hts_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_hts_elem_pvt.h
rename to lib/ring/rte_ring_hts_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_peek.h b/lib/ring/rte_ring_peek.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek.h
rename to lib/ring/rte_ring_peek.h
diff --git a/lib/librte_ring/rte_ring_peek_elem_pvt.h b/lib/ring/rte_ring_peek_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek_elem_pvt.h
rename to lib/ring/rte_ring_peek_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_peek_zc.h b/lib/ring/rte_ring_peek_zc.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek_zc.h
rename to lib/ring/rte_ring_peek_zc.h
diff --git a/lib/librte_ring/rte_ring_rts.h b/lib/ring/rte_ring_rts.h
similarity index 100%
rename from lib/librte_ring/rte_ring_rts.h
rename to lib/ring/rte_ring_rts.h
diff --git a/lib/librte_ring/rte_ring_rts_elem_pvt.h b/lib/ring/rte_ring_rts_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_rts_elem_pvt.h
rename to lib/ring/rte_ring_rts_elem_pvt.h
diff --git a/lib/librte_ring/version.map b/lib/ring/version.map
similarity index 100%
rename from lib/librte_ring/version.map
rename to lib/ring/version.map
diff --git a/lib/librte_sched/meson.build b/lib/sched/meson.build
similarity index 100%
rename from lib/librte_sched/meson.build
rename to lib/sched/meson.build
diff --git a/lib/librte_sched/rte_approx.c b/lib/sched/rte_approx.c
similarity index 100%
rename from lib/librte_sched/rte_approx.c
rename to lib/sched/rte_approx.c
diff --git a/lib/librte_sched/rte_approx.h b/lib/sched/rte_approx.h
similarity index 100%
rename from lib/librte_sched/rte_approx.h
rename to lib/sched/rte_approx.h
diff --git a/lib/librte_sched/rte_red.c b/lib/sched/rte_red.c
similarity index 100%
rename from lib/librte_sched/rte_red.c
rename to lib/sched/rte_red.c
diff --git a/lib/librte_sched/rte_red.h b/lib/sched/rte_red.h
similarity index 100%
rename from lib/librte_sched/rte_red.h
rename to lib/sched/rte_red.h
diff --git a/lib/librte_sched/rte_sched.c b/lib/sched/rte_sched.c
similarity index 100%
rename from lib/librte_sched/rte_sched.c
rename to lib/sched/rte_sched.c
diff --git a/lib/librte_sched/rte_sched.h b/lib/sched/rte_sched.h
similarity index 100%
rename from lib/librte_sched/rte_sched.h
rename to lib/sched/rte_sched.h
diff --git a/lib/librte_sched/rte_sched_common.h b/lib/sched/rte_sched_common.h
similarity index 100%
rename from lib/librte_sched/rte_sched_common.h
rename to lib/sched/rte_sched_common.h
diff --git a/lib/librte_sched/version.map b/lib/sched/version.map
similarity index 100%
rename from lib/librte_sched/version.map
rename to lib/sched/version.map
diff --git a/lib/librte_security/meson.build b/lib/security/meson.build
similarity index 100%
rename from lib/librte_security/meson.build
rename to lib/security/meson.build
diff --git a/lib/librte_security/rte_security.c b/lib/security/rte_security.c
similarity index 100%
rename from lib/librte_security/rte_security.c
rename to lib/security/rte_security.c
diff --git a/lib/librte_security/rte_security.h b/lib/security/rte_security.h
similarity index 100%
rename from lib/librte_security/rte_security.h
rename to lib/security/rte_security.h
diff --git a/lib/librte_security/rte_security_driver.h b/lib/security/rte_security_driver.h
similarity index 100%
rename from lib/librte_security/rte_security_driver.h
rename to lib/security/rte_security_driver.h
diff --git a/lib/librte_security/version.map b/lib/security/version.map
similarity index 100%
rename from lib/librte_security/version.map
rename to lib/security/version.map
diff --git a/lib/librte_stack/meson.build b/lib/stack/meson.build
similarity index 100%
rename from lib/librte_stack/meson.build
rename to lib/stack/meson.build
diff --git a/lib/librte_stack/rte_stack.c b/lib/stack/rte_stack.c
similarity index 100%
rename from lib/librte_stack/rte_stack.c
rename to lib/stack/rte_stack.c
diff --git a/lib/librte_stack/rte_stack.h b/lib/stack/rte_stack.h
similarity index 100%
rename from lib/librte_stack/rte_stack.h
rename to lib/stack/rte_stack.h
diff --git a/lib/librte_stack/rte_stack_lf.c b/lib/stack/rte_stack_lf.c
similarity index 100%
rename from lib/librte_stack/rte_stack_lf.c
rename to lib/stack/rte_stack_lf.c
diff --git a/lib/librte_stack/rte_stack_lf.h b/lib/stack/rte_stack_lf.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf.h
rename to lib/stack/rte_stack_lf.h
diff --git a/lib/librte_stack/rte_stack_lf_c11.h b/lib/stack/rte_stack_lf_c11.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_c11.h
rename to lib/stack/rte_stack_lf_c11.h
diff --git a/lib/librte_stack/rte_stack_lf_generic.h b/lib/stack/rte_stack_lf_generic.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_generic.h
rename to lib/stack/rte_stack_lf_generic.h
diff --git a/lib/librte_stack/rte_stack_lf_stubs.h b/lib/stack/rte_stack_lf_stubs.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_stubs.h
rename to lib/stack/rte_stack_lf_stubs.h
diff --git a/lib/librte_stack/rte_stack_std.c b/lib/stack/rte_stack_std.c
similarity index 100%
rename from lib/librte_stack/rte_stack_std.c
rename to lib/stack/rte_stack_std.c
diff --git a/lib/librte_stack/rte_stack_std.h b/lib/stack/rte_stack_std.h
similarity index 100%
rename from lib/librte_stack/rte_stack_std.h
rename to lib/stack/rte_stack_std.h
diff --git a/lib/librte_stack/stack_pvt.h b/lib/stack/stack_pvt.h
similarity index 100%
rename from lib/librte_stack/stack_pvt.h
rename to lib/stack/stack_pvt.h
diff --git a/lib/librte_stack/version.map b/lib/stack/version.map
similarity index 100%
rename from lib/librte_stack/version.map
rename to lib/stack/version.map
diff --git a/lib/librte_table/meson.build b/lib/table/meson.build
similarity index 100%
rename from lib/librte_table/meson.build
rename to lib/table/meson.build
diff --git a/lib/librte_table/rte_lru.h b/lib/table/rte_lru.h
similarity index 100%
rename from lib/librte_table/rte_lru.h
rename to lib/table/rte_lru.h
diff --git a/lib/librte_table/rte_lru_arm64.h b/lib/table/rte_lru_arm64.h
similarity index 100%
rename from lib/librte_table/rte_lru_arm64.h
rename to lib/table/rte_lru_arm64.h
diff --git a/lib/librte_table/rte_lru_x86.h b/lib/table/rte_lru_x86.h
similarity index 100%
rename from lib/librte_table/rte_lru_x86.h
rename to lib/table/rte_lru_x86.h
diff --git a/lib/librte_table/rte_swx_table.h b/lib/table/rte_swx_table.h
similarity index 100%
rename from lib/librte_table/rte_swx_table.h
rename to lib/table/rte_swx_table.h
diff --git a/lib/librte_table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
similarity index 100%
rename from lib/librte_table/rte_swx_table_em.c
rename to lib/table/rte_swx_table_em.c
diff --git a/lib/librte_table/rte_swx_table_em.h b/lib/table/rte_swx_table_em.h
similarity index 100%
rename from lib/librte_table/rte_swx_table_em.h
rename to lib/table/rte_swx_table_em.h
diff --git a/lib/librte_table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
similarity index 100%
rename from lib/librte_table/rte_swx_table_wm.c
rename to lib/table/rte_swx_table_wm.c
diff --git a/lib/librte_table/rte_swx_table_wm.h b/lib/table/rte_swx_table_wm.h
similarity index 100%
rename from lib/librte_table/rte_swx_table_wm.h
rename to lib/table/rte_swx_table_wm.h
diff --git a/lib/librte_table/rte_table.h b/lib/table/rte_table.h
similarity index 100%
rename from lib/librte_table/rte_table.h
rename to lib/table/rte_table.h
diff --git a/lib/librte_table/rte_table_acl.c b/lib/table/rte_table_acl.c
similarity index 100%
rename from lib/librte_table/rte_table_acl.c
rename to lib/table/rte_table_acl.c
diff --git a/lib/librte_table/rte_table_acl.h b/lib/table/rte_table_acl.h
similarity index 100%
rename from lib/librte_table/rte_table_acl.h
rename to lib/table/rte_table_acl.h
diff --git a/lib/librte_table/rte_table_array.c b/lib/table/rte_table_array.c
similarity index 100%
rename from lib/librte_table/rte_table_array.c
rename to lib/table/rte_table_array.c
diff --git a/lib/librte_table/rte_table_array.h b/lib/table/rte_table_array.h
similarity index 100%
rename from lib/librte_table/rte_table_array.h
rename to lib/table/rte_table_array.h
diff --git a/lib/librte_table/rte_table_hash.h b/lib/table/rte_table_hash.h
similarity index 100%
rename from lib/librte_table/rte_table_hash.h
rename to lib/table/rte_table_hash.h
diff --git a/lib/librte_table/rte_table_hash_cuckoo.c b/lib/table/rte_table_hash_cuckoo.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_cuckoo.c
rename to lib/table/rte_table_hash_cuckoo.c
diff --git a/lib/librte_table/rte_table_hash_cuckoo.h b/lib/table/rte_table_hash_cuckoo.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_cuckoo.h
rename to lib/table/rte_table_hash_cuckoo.h
diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/table/rte_table_hash_ext.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_ext.c
rename to lib/table/rte_table_hash_ext.c
diff --git a/lib/librte_table/rte_table_hash_func.h b/lib/table/rte_table_hash_func.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_func.h
rename to lib/table/rte_table_hash_func.h
diff --git a/lib/librte_table/rte_table_hash_func_arm64.h b/lib/table/rte_table_hash_func_arm64.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_func_arm64.h
rename to lib/table/rte_table_hash_func_arm64.h
diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key16.c
rename to lib/table/rte_table_hash_key16.c
diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key32.c
rename to lib/table/rte_table_hash_key32.c
diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key8.c
rename to lib/table/rte_table_hash_key8.c
diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/table/rte_table_hash_lru.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_lru.c
rename to lib/table/rte_table_hash_lru.c
diff --git a/lib/librte_table/rte_table_lpm.c b/lib/table/rte_table_lpm.c
similarity index 100%
rename from lib/librte_table/rte_table_lpm.c
rename to lib/table/rte_table_lpm.c
diff --git a/lib/librte_table/rte_table_lpm.h b/lib/table/rte_table_lpm.h
similarity index 100%
rename from lib/librte_table/rte_table_lpm.h
rename to lib/table/rte_table_lpm.h
diff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/table/rte_table_lpm_ipv6.c
similarity index 100%
rename from lib/librte_table/rte_table_lpm_ipv6.c
rename to lib/table/rte_table_lpm_ipv6.c
diff --git a/lib/librte_table/rte_table_lpm_ipv6.h b/lib/table/rte_table_lpm_ipv6.h
similarity index 100%
rename from lib/librte_table/rte_table_lpm_ipv6.h
rename to lib/table/rte_table_lpm_ipv6.h
diff --git a/lib/librte_table/rte_table_stub.c b/lib/table/rte_table_stub.c
similarity index 100%
rename from lib/librte_table/rte_table_stub.c
rename to lib/table/rte_table_stub.c
diff --git a/lib/librte_table/rte_table_stub.h b/lib/table/rte_table_stub.h
similarity index 100%
rename from lib/librte_table/rte_table_stub.h
rename to lib/table/rte_table_stub.h
diff --git a/lib/librte_table/version.map b/lib/table/version.map
similarity index 100%
rename from lib/librte_table/version.map
rename to lib/table/version.map
diff --git a/lib/librte_telemetry/meson.build b/lib/telemetry/meson.build
similarity index 80%
rename from lib/librte_telemetry/meson.build
rename to lib/telemetry/meson.build
index 719973ff9..f84c9aa3b 100644
--- a/lib/librte_telemetry/meson.build
+++ b/lib/telemetry/meson.build
@@ -5,4 +5,4 @@ includes = [global_inc]
 
 sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c')
 headers = files('rte_telemetry.h')
-includes += include_directories('../librte_metrics')
+includes += include_directories('../metrics')
diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
similarity index 100%
rename from lib/librte_telemetry/rte_telemetry.h
rename to lib/telemetry/rte_telemetry.h
diff --git a/lib/librte_telemetry/telemetry.c b/lib/telemetry/telemetry.c
similarity index 100%
rename from lib/librte_telemetry/telemetry.c
rename to lib/telemetry/telemetry.c
diff --git a/lib/librte_telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c
similarity index 100%
rename from lib/librte_telemetry/telemetry_data.c
rename to lib/telemetry/telemetry_data.c
diff --git a/lib/librte_telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_data.h
rename to lib/telemetry/telemetry_data.h
diff --git a/lib/librte_telemetry/telemetry_internal.h b/lib/telemetry/telemetry_internal.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_internal.h
rename to lib/telemetry/telemetry_internal.h
diff --git a/lib/librte_telemetry/telemetry_json.h b/lib/telemetry/telemetry_json.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_json.h
rename to lib/telemetry/telemetry_json.h
diff --git a/lib/librte_telemetry/telemetry_legacy.c b/lib/telemetry/telemetry_legacy.c
similarity index 100%
rename from lib/librte_telemetry/telemetry_legacy.c
rename to lib/telemetry/telemetry_legacy.c
diff --git a/lib/librte_telemetry/version.map b/lib/telemetry/version.map
similarity index 100%
rename from lib/librte_telemetry/version.map
rename to lib/telemetry/version.map
diff --git a/lib/librte_timer/meson.build b/lib/timer/meson.build
similarity index 100%
rename from lib/librte_timer/meson.build
rename to lib/timer/meson.build
diff --git a/lib/librte_timer/rte_timer.c b/lib/timer/rte_timer.c
similarity index 100%
rename from lib/librte_timer/rte_timer.c
rename to lib/timer/rte_timer.c
diff --git a/lib/librte_timer/rte_timer.h b/lib/timer/rte_timer.h
similarity index 100%
rename from lib/librte_timer/rte_timer.h
rename to lib/timer/rte_timer.h
diff --git a/lib/librte_timer/version.map b/lib/timer/version.map
similarity index 100%
rename from lib/librte_timer/version.map
rename to lib/timer/version.map
diff --git a/lib/librte_vhost/fd_man.c b/lib/vhost/fd_man.c
similarity index 100%
rename from lib/librte_vhost/fd_man.c
rename to lib/vhost/fd_man.c
diff --git a/lib/librte_vhost/fd_man.h b/lib/vhost/fd_man.h
similarity index 100%
rename from lib/librte_vhost/fd_man.h
rename to lib/vhost/fd_man.h
diff --git a/lib/librte_vhost/iotlb.c b/lib/vhost/iotlb.c
similarity index 100%
rename from lib/librte_vhost/iotlb.c
rename to lib/vhost/iotlb.c
diff --git a/lib/librte_vhost/iotlb.h b/lib/vhost/iotlb.h
similarity index 100%
rename from lib/librte_vhost/iotlb.h
rename to lib/vhost/iotlb.h
diff --git a/lib/librte_vhost/meson.build b/lib/vhost/meson.build
similarity index 100%
rename from lib/librte_vhost/meson.build
rename to lib/vhost/meson.build
diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/vhost/rte_vdpa.h
similarity index 100%
rename from lib/librte_vhost/rte_vdpa.h
rename to lib/vhost/rte_vdpa.h
diff --git a/lib/librte_vhost/rte_vdpa_dev.h b/lib/vhost/rte_vdpa_dev.h
similarity index 100%
rename from lib/librte_vhost/rte_vdpa_dev.h
rename to lib/vhost/rte_vdpa_dev.h
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/vhost/rte_vhost.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost.h
rename to lib/vhost/rte_vhost.h
diff --git a/lib/librte_vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost_async.h
rename to lib/vhost/rte_vhost_async.h
diff --git a/lib/librte_vhost/rte_vhost_crypto.h b/lib/vhost/rte_vhost_crypto.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost_crypto.h
rename to lib/vhost/rte_vhost_crypto.h
diff --git a/lib/librte_vhost/socket.c b/lib/vhost/socket.c
similarity index 100%
rename from lib/librte_vhost/socket.c
rename to lib/vhost/socket.c
diff --git a/lib/librte_vhost/vdpa.c b/lib/vhost/vdpa.c
similarity index 100%
rename from lib/librte_vhost/vdpa.c
rename to lib/vhost/vdpa.c
diff --git a/lib/librte_vhost/version.map b/lib/vhost/version.map
similarity index 100%
rename from lib/librte_vhost/version.map
rename to lib/vhost/version.map
diff --git a/lib/librte_vhost/vhost.c b/lib/vhost/vhost.c
similarity index 100%
rename from lib/librte_vhost/vhost.c
rename to lib/vhost/vhost.c
diff --git a/lib/librte_vhost/vhost.h b/lib/vhost/vhost.h
similarity index 100%
rename from lib/librte_vhost/vhost.h
rename to lib/vhost/vhost.h
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
similarity index 100%
rename from lib/librte_vhost/vhost_crypto.c
rename to lib/vhost/vhost_crypto.c
diff --git a/lib/librte_vhost/vhost_user.c b/lib/vhost/vhost_user.c
similarity index 100%
rename from lib/librte_vhost/vhost_user.c
rename to lib/vhost/vhost_user.c
diff --git a/lib/librte_vhost/vhost_user.h b/lib/vhost/vhost_user.h
similarity index 100%
rename from lib/librte_vhost/vhost_user.h
rename to lib/vhost/vhost_user.h
diff --git a/lib/librte_vhost/virtio_crypto.h b/lib/vhost/virtio_crypto.h
similarity index 100%
rename from lib/librte_vhost/virtio_crypto.h
rename to lib/vhost/virtio_crypto.h
diff --git a/lib/librte_vhost/virtio_net.c b/lib/vhost/virtio_net.c
similarity index 100%
rename from lib/librte_vhost/virtio_net.c
rename to lib/vhost/virtio_net.c
diff --git a/license/exceptions.txt b/license/exceptions.txt
index 636c69b9b..1bd4dbf8f 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -12,8 +12,8 @@ Note that following licenses are not exceptions:-
 ---------------------------------------------------------------------------------------------------
 SPDX Identifier     TB Approval Date  GB Approval Date  File name
 ---------------------------------------------------------------------------------------------------
-1.MIT               10/23/2019        02/10/2020        lib/librte_eal/windows/include/dirent.h
-2.BSD-2-Clause      10/23/2019        12/18/2019        lib/librte_eal/windows/include/getopt.h
+1.MIT               10/23/2019        02/10/2020        lib/eal/windows/include/dirent.h
+2.BSD-2-Clause      10/23/2019        12/18/2019        lib/eal/windows/include/getopt.h
 3.ISC AND
-  BSD-2-Clause      10/23/2019        12/18/2019        lib/librte_eal/windows/getopt.c
+  BSD-2-Clause      10/23/2019        12/18/2019        lib/eal/windows/getopt.c
 ---------------------------------------------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 6d7f8c501..001a1230c 100644
--- a/meson.build
+++ b/meson.build
@@ -50,9 +50,9 @@ endif
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
 global_inc = include_directories('.', 'config',
-    'lib/librte_eal/include',
-    'lib/librte_eal/@0@/include'.format(host_machine.system()),
-    'lib/librte_eal/@0@/include'.format(arch_subdir),
+    'lib/eal/include',
+    'lib/eal/@0@/include'.format(host_machine.system()),
+    'lib/eal/@0@/include'.format(arch_subdir),
 )
 
 # do configuration and get tool paths
-- 
2.27.0

[dpdk-dev] [PATCH 14/14] lib: allow disabling optional libraries

[Bruce Richardson]

Add support for the disable_libs option, to allow disabling the build of
particular libraries. As part of this, maintain a list of what libraries
can safely be disabled, without breaking the build - for now this list is
solely those libraries which are not built on FreeBSD, kni, power and
vhost. This list can be expanded by future patches.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build   | 24 +++++++++++++++++++++++-
 meson_options.txt |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/meson.build b/lib/meson.build
index 3a9a6c3be..c9a20f65b 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -81,6 +81,23 @@ if is_windows
     ] # only supported libraries for windows
 endif
 
+optional_libs = [
+    'kni',
+    'power',
+    'vhost',
+]
+
+disabled_libs = []
+opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs')).stdout().split()
+foreach l:opt_disabled_libs
+    if not optional_libs.contains(l)
+        warning('Cannot disable mandatory library "@0@"'.format(l))
+        continue
+    endif
+    disabled_libs += l
+endforeach
+
+
 default_cflags = machine_args
 default_cflags += ['-DALLOW_EXPERIMENTAL_API']
 default_cflags += ['-DALLOW_INTERNAL_API']
@@ -114,7 +131,12 @@ foreach l:libraries
         deps += ['eal']
     endif
 
-    subdir(l)
+    if disabled_libs.contains(l)
+        build = false
+        reason = 'explicitly disabled via build config'
+    else
+        subdir(l)
+    endif
     if name != l
         warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
     endif
diff --git a/meson_options.txt b/meson_options.txt
index 530fcddfa..9d73fd541 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,6 +6,8 @@ option('developer_mode', type: 'feature', description:
         'turn on additional build checks relevant for DPDK developers')
 option('disable_drivers', type: 'string', value: '', description:
         'Comma-separated list of drivers to explicitly disable.')
+option('disable_libs', type: 'string', value: '', description:
+        'Comma-separated list of libraries to explicitly disable. [NOTE: not all libs can be disabled]')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', description:
         'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
 option('enable_docs', type: 'boolean', value: false, description:
-- 
2.27.0

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Xueming(Steven) Li]

Hi Bruce,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Bruce Richardson
> Sent: Saturday, April 17, 2021 1:05 AM
> To: dev@dpdk.org
> Cc: Bruce Richardson <bruce.richardson@intel.com>
> Subject: [dpdk-dev] [PATCH 00/14] Build file updates
> 
> This RFC contains 5 changes/updates to the DPDK build and build files.
> 
> The changes in this set are:
> 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
>    in the foreach loops when building library or driver components.
> 2. For libraries, drop support for header-only libraries, which was added just
>    for the "compat" lib which had a single header, and is now part of EAL. This
>    similarly reduces indentation levels and makes the code easier to follow
> 3. Since the larger blocks of meson code in our repo is seeing massive
>    whitespace changes, take the opportunity to switch our indentation style for
>    meson files from that of C-files using tabs, to Meson/Python style using
>    spaces. [More below on this for discussion]
> 4. Remove the "librte_" prefix from all our library directories. While as useful
>    cleanup, the main driver for this was that it simplifies the matching for #5
>    below.
> 5. Add a "disable_libs" build option to allow the user to optionally not build
>    certain components. Include in this an explicit list of libraries which are
>    "known safe" to disable in the build. For now this is a short list of three
>    libs, all of which are safe because they are not buildable on FreeBSD. More
>    work is needed to expand this list in future.

Great feature, very useful for PMD developer who only focus on some specific
class driver, most drivers and libs are not relevant, disable them will speed up
build process significantly, this always happen when switch release or rebase code.

Currently I collected a long disabled driver list for my minimal build, have to update
time to time as dpdk community grows quickly. An enable_list might be more efficient
here to allow minimal lib/drivers for net, vdpa etc.. plus specific pmd driver for NIC on hand.

Alternative way might be Linux ".config" file style which specifies module enable/disable states.

Not related this this patch set, off-topic discussion :)

Best Regards,
Xueming

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Bruce Richardson]

On Sun, Apr 18, 2021 at 08:45:25AM +0000, Xueming(Steven) Li wrote:
> Hi Bruce,
> 
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Bruce Richardson
> > Sent: Saturday, April 17, 2021 1:05 AM
> > To: dev@dpdk.org
> > Cc: Bruce Richardson <bruce.richardson@intel.com>
> > Subject: [dpdk-dev] [PATCH 00/14] Build file updates
> > 
> > This RFC contains 5 changes/updates to the DPDK build and build files.
> > 
> > The changes in this set are:
> > 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
> >    in the foreach loops when building library or driver components.
> > 2. For libraries, drop support for header-only libraries, which was added just
> >    for the "compat" lib which had a single header, and is now part of EAL. This
> >    similarly reduces indentation levels and makes the code easier to follow
> > 3. Since the larger blocks of meson code in our repo is seeing massive
> >    whitespace changes, take the opportunity to switch our indentation style for
> >    meson files from that of C-files using tabs, to Meson/Python style using
> >    spaces. [More below on this for discussion]
> > 4. Remove the "librte_" prefix from all our library directories. While as useful
> >    cleanup, the main driver for this was that it simplifies the matching for #5
> >    below.
> > 5. Add a "disable_libs" build option to allow the user to optionally not build
> >    certain components. Include in this an explicit list of libraries which are
> >    "known safe" to disable in the build. For now this is a short list of three
> >    libs, all of which are safe because they are not buildable on FreeBSD. More
> >    work is needed to expand this list in future.
> 
> Great feature, very useful for PMD developer who only focus on some specific
> class driver, most drivers and libs are not relevant, disable them will speed up
> build process significantly, this always happen when switch release or rebase code.
> 
> Currently I collected a long disabled driver list for my minimal build, have to update
> time to time as dpdk community grows quickly. An enable_list might be more efficient
> here to allow minimal lib/drivers for net, vdpa etc.. plus specific pmd driver for NIC on hand.
> 

Managing such a list should not be too much work if wildcards are used
appropriately. Here is the disable_drivers option I use which just enables
the necessary bus drivers, as well as intel NIC and rawdev drivers (or
rather NIC and rawdev drivers whose names start with "i" or "e". It does
enable a few extra drivers I don't care about, but not many!)

"base*/*,bus/[!pv]*,c*/*,event/*,net/[!ie]*,r*/[!i]*,vdpa/*"

/Bruce

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Xueming(Steven) Li]

> -----Original Message-----
> From: Bruce Richardson <bruce.richardson@intel.com>
> Sent: Monday, April 19, 2021 9:06 PM
> To: Xueming(Steven) Li <xuemingl@nvidia.com>
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH 00/14] Build file updates
> 
> On Sun, Apr 18, 2021 at 08:45:25AM +0000, Xueming(Steven) Li wrote:
> > Hi Bruce,
> >
> > > -----Original Message-----
> > > From: dev <dev-bounces@dpdk.org> On Behalf Of Bruce Richardson
> > > Sent: Saturday, April 17, 2021 1:05 AM
> > > To: dev@dpdk.org
> > > Cc: Bruce Richardson <bruce.richardson@intel.com>
> > > Subject: [dpdk-dev] [PATCH 00/14] Build file updates
> > >
> > > This RFC contains 5 changes/updates to the DPDK build and build files.
> > >
> > > The changes in this set are:
> > > 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
> > >    in the foreach loops when building library or driver components.
> > > 2. For libraries, drop support for header-only libraries, which was added just
> > >    for the "compat" lib which had a single header, and is now part of EAL. This
> > >    similarly reduces indentation levels and makes the code easier to
> > > follow 3. Since the larger blocks of meson code in our repo is seeing massive
> > >    whitespace changes, take the opportunity to switch our indentation style for
> > >    meson files from that of C-files using tabs, to Meson/Python style using
> > >    spaces. [More below on this for discussion] 4. Remove the
> > > "librte_" prefix from all our library directories. While as useful
> > >    cleanup, the main driver for this was that it simplifies the matching for #5
> > >    below.
> > > 5. Add a "disable_libs" build option to allow the user to optionally not build
> > >    certain components. Include in this an explicit list of libraries which are
> > >    "known safe" to disable in the build. For now this is a short list of three
> > >    libs, all of which are safe because they are not buildable on FreeBSD. More
> > >    work is needed to expand this list in future.
> >
> > Great feature, very useful for PMD developer who only focus on some
> > specific class driver, most drivers and libs are not relevant, disable
> > them will speed up build process significantly, this always happen when switch release or rebase code.
> >
> > Currently I collected a long disabled driver list for my minimal
> > build, have to update time to time as dpdk community grows quickly. An
> > enable_list might be more efficient here to allow minimal lib/drivers for net, vdpa etc.. plus specific pmd driver for NIC on hand.
> >
> 
> Managing such a list should not be too much work if wildcards are used appropriately. Here is the disable_drivers option I use which
> just enables the necessary bus drivers, as well as intel NIC and rawdev drivers (or rather NIC and rawdev drivers whose names start
> with "i" or "e". It does enable a few extra drivers I don't care about, but not many!)
> 
> "base*/*,bus/[!pv]*,c*/*,event/*,net/[!ie]*,r*/[!i]*,vdpa/*"

Thanks, wildcards here is a magic :)

> 
> /Bruce

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Xueming(Steven) Li]

> -----Original Message-----
> From: Xueming(Steven) Li
> Sent: Wednesday, April 21, 2021 9:02 PM
> To: 'Bruce Richardson' <bruce.richardson@intel.com>
> Cc: dev@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH 00/14] Build file updates
> 
> 
> > -----Original Message-----
> > From: Bruce Richardson <bruce.richardson@intel.com>
> > Sent: Monday, April 19, 2021 9:06 PM
> > To: Xueming(Steven) Li <xuemingl@nvidia.com>
> > Cc: dev@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH 00/14] Build file updates
> >
> > On Sun, Apr 18, 2021 at 08:45:25AM +0000, Xueming(Steven) Li wrote:
> > > Hi Bruce,
> > >
> > > > -----Original Message-----
> > > > From: dev <dev-bounces@dpdk.org> On Behalf Of Bruce Richardson
> > > > Sent: Saturday, April 17, 2021 1:05 AM
> > > > To: dev@dpdk.org
> > > > Cc: Bruce Richardson <bruce.richardson@intel.com>
> > > > Subject: [dpdk-dev] [PATCH 00/14] Build file updates
> > > >
> > > > This RFC contains 5 changes/updates to the DPDK build and build files.
> > > >
> > > > The changes in this set are:
> > > > 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
> > > >    in the foreach loops when building library or driver components.
> > > > 2. For libraries, drop support for header-only libraries, which was added just
> > > >    for the "compat" lib which had a single header, and is now part of EAL. This
> > > >    similarly reduces indentation levels and makes the code easier
> > > > to follow 3. Since the larger blocks of meson code in our repo is seeing massive
> > > >    whitespace changes, take the opportunity to switch our indentation style for
> > > >    meson files from that of C-files using tabs, to Meson/Python style using
> > > >    spaces. [More below on this for discussion] 4. Remove the
> > > > "librte_" prefix from all our library directories. While as useful
> > > >    cleanup, the main driver for this was that it simplifies the matching for #5
> > > >    below.
> > > > 5. Add a "disable_libs" build option to allow the user to optionally not build
> > > >    certain components. Include in this an explicit list of libraries which are
> > > >    "known safe" to disable in the build. For now this is a short list of three
> > > >    libs, all of which are safe because they are not buildable on FreeBSD. More
> > > >    work is needed to expand this list in future.
> > >
> > > Great feature, very useful for PMD developer who only focus on some
> > > specific class driver, most drivers and libs are not relevant,
> > > disable them will speed up build process significantly, this always happen when switch release or rebase code.
> > >
> > > Currently I collected a long disabled driver list for my minimal
> > > build, have to update time to time as dpdk community grows quickly.
> > > An enable_list might be more efficient here to allow minimal lib/drivers for net, vdpa etc.. plus specific pmd driver for NIC on hand.
> > >
> >
> > Managing such a list should not be too much work if wildcards are used
> > appropriately. Here is the disable_drivers option I use which just
> > enables the necessary bus drivers, as well as intel NIC and rawdev
> > drivers (or rather NIC and rawdev drivers whose names start with "i"
> > or "e". It does enable a few extra drivers I don't care about, but not
> > many!)
> >
> > "base*/*,bus/[!pv]*,c*/*,event/*,net/[!ie]*,r*/[!i]*,vdpa/*"
> 
> Thanks, wildcards here is a magic :)

Just update, seems white list support already there, below wildcards works:
  -Denable_drivers= */mlx5,net/virtio

> 
> >
> > /Bruce

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Thomas Monjalon]

16/04/2021 19:04, Bruce Richardson:
> RFC -> V1:
> * rebased to current main branch
> * performed cleanup on many meson.build files to ensure correct formatting of
>   lists:
>    * split lists with >3 or >4 entries to be one per line
>    * first entry on own line
>    * last entry on own line with ","
>    * closing braces dedented to original indent level
>    * alphabetical ordering
>   Files in "lib" folder should be mostly ok now - files in the drivers
>   directory have not been done to the same level, as there are so many of
>   them to work on.
> * other general whitespace changes, including merging lines where possible,
>   since indent levels are reduced

There were 2 more suggestions in the RFC:
- ignore-rev file to avoid polluting git blame
- devtools script to convert patches for backport

For me they are must-have before merging.

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Bruce Richardson]

On Mon, Apr 19, 2021 at 02:20:47AM +0200, Thomas Monjalon wrote:
> 16/04/2021 19:04, Bruce Richardson:
> > RFC -> V1: * rebased to current main branch * performed cleanup on many
> > meson.build files to ensure correct formatting of lists: * split lists
> > with >3 or >4 entries to be one per line * first entry on own line *
> > last entry on own line with "," * closing braces dedented to original
> > indent level * alphabetical ordering Files in "lib" folder should be
> > mostly ok now - files in the drivers directory have not been done to
> > the same level, as there are so many of them to work on.  * other
> > general whitespace changes, including merging lines where possible,
> > since indent levels are reduced
> 
> There were 2 more suggestions in the RFC: - ignore-rev file to avoid
> polluting git blame
From what I gather from reading the docs, an ignore-rev file can only be
created after the patches are applied and we have the correct commit-ids to
ignore. Therefore, I'm not sure what value there is in including one in
this set since it would have to be completely rewritten on apply.

> - devtools script to convert patches for backport
Such a script would be to convert the "lib/librte_X" paths to "lib/X" in
the patch files, correct? I can see about working on this for the next
revision.

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Thomas Monjalon]

19/04/2021 15:09, Bruce Richardson:
> On Mon, Apr 19, 2021 at 02:20:47AM +0200, Thomas Monjalon wrote:
> > 16/04/2021 19:04, Bruce Richardson:
> > > RFC -> V1: * rebased to current main branch * performed cleanup on many
> > > meson.build files to ensure correct formatting of lists: * split lists
> > > with >3 or >4 entries to be one per line * first entry on own line *
> > > last entry on own line with "," * closing braces dedented to original
> > > indent level * alphabetical ordering Files in "lib" folder should be
> > > mostly ok now - files in the drivers directory have not been done to
> > > the same level, as there are so many of them to work on.  * other
> > > general whitespace changes, including merging lines where possible,
> > > since indent levels are reduced
> > 
> > There were 2 more suggestions in the RFC: - ignore-rev file to avoid
> > polluting git blame
> 
> From what I gather from reading the docs, an ignore-rev file can only be
> created after the patches are applied and we have the correct commit-ids to
> ignore. Therefore, I'm not sure what value there is in including one in
> this set since it would have to be completely rewritten on apply.

OK I don't know how it works.
> 
> > - devtools script to convert patches for backport
> 
> Such a script would be to convert the "lib/librte_X" paths to "lib/X" in
> the patch files, correct? I can see about working on this for the next
> revision.

Yes, thanks.

Re: [dpdk-dev] [PATCH 00/14] Build file updates

[Bruce Richardson]

On Mon, Apr 19, 2021 at 03:47:49PM +0200, Thomas Monjalon wrote:
> 19/04/2021 15:09, Bruce Richardson:
> > On Mon, Apr 19, 2021 at 02:20:47AM +0200, Thomas Monjalon wrote:
> > > 16/04/2021 19:04, Bruce Richardson:
> > > > RFC -> V1: * rebased to current main branch * performed cleanup on many
> > > > meson.build files to ensure correct formatting of lists: * split lists
> > > > with >3 or >4 entries to be one per line * first entry on own line *
> > > > last entry on own line with "," * closing braces dedented to original
> > > > indent level * alphabetical ordering Files in "lib" folder should be
> > > > mostly ok now - files in the drivers directory have not been done to
> > > > the same level, as there are so many of them to work on.  * other
> > > > general whitespace changes, including merging lines where possible,
> > > > since indent levels are reduced
> > > 
> > > There were 2 more suggestions in the RFC: - ignore-rev file to avoid
> > > polluting git blame
> > 
> > From what I gather from reading the docs, an ignore-rev file can only be
> > created after the patches are applied and we have the correct commit-ids to
> > ignore. Therefore, I'm not sure what value there is in including one in
> > this set since it would have to be completely rewritten on apply.
> 
> OK I don't know how it works.

I didn't either until I started using google for it! 
@bluca, please correct me if I'm wrong in my understanding above, or
provide any advice about how to manage this?

[dpdk-dev] [PATCH v2 00/16] Build file updates

[Bruce Richardson]

This set contains 5 changes/updates to the DPDK build and build files.

The changes in this set are:
1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
   in the foreach loops when building library or driver components.
2. For libraries, drop support for header-only libraries, which was added just
   for the "compat" lib which had a single header, and is now part of EAL. This
   similarly reduces indentation levels and makes the code easier to follow
3. Since the larger blocks of meson code in our repo is seeing massive
   whitespace changes, take the opportunity to switch our indentation style for
   meson files from that of C-files using tabs, to Meson/Python style using
   spaces.[1]
4. Remove the "librte_" prefix from all our library directories. While as useful
   cleanup, the main driver for this was that it simplifies the matching for #5
   below.
5. Add a "disable_libs" build option to allow the user to optionally not build
   certain components. Include in this an explicit list of libraries which are
   "known safe" to disable in the build. For now this is a short list of three
   libs, all of which are safe because they are not buildable on FreeBSD. More
   work is needed to expand this list in future.

[1] https://mesonbuild.com/Style-guide.html#tabs-or-spaces

V2:
  * more fixes for list formats in drivers - one element per line, trailing
    comma on last entry, alphabetical order, etc.
  * added a patch with a script for fixing up newer patches for backport to
    older releases, i.e. adding back in librte_ prefix to filenames
  * added in contributors guide section on meson coding style

RFC -> V1:
* rebased to current main branch
* performed cleanup on many meson.build files to ensure correct formatting of
  lists:
   * split lists with >3 or >4 entries to be one per line
   * first entry on own line
   * last entry on own line with ","
   * closing braces dedented to original indent level
   * alphabetical ordering
  Files in "lib" folder should be mostly ok now - files in the drivers
  directory have not been done to the same level, as there are so many of
  them to work on.
* other general whitespace changes, including merging lines where possible,
  since indent levels are reduced
                        *** SUBJECT HERE ***

*** BLURB HERE ***

Bruce Richardson (16):
  build: simplify library build file
  build: tidy up list of libraries to build
  build: simplify the driver build configuration file
  build: clean up driver lists
  build: reduce indentation in app build spec
  build: reduce indentation in examples build spec
  build: change infrastructure file tabs to spaces
  lib: cleanup whitespace in meson build files
  drivers: change meson file tabs to spaces
  examples: change meson file tabs to spaces
  app: change meson file tabs to spaces
  editorconfig: add entry for meson files
  doc: add meson coding style section to contributors guide
  lib: remove librte_ prefix from directory names
  devtools: add script to ease backport of renamed files
  lib: allow disabling optional libraries

 .editorconfig                                 |   5 +
 MAINTAINERS                                   | 210 +++---
 app/meson.build                               | 101 +--
 app/test-bbdev/meson.build                    |  16 +-
 app/test-compress-perf/meson.build            |  14 +-
 app/test-crypto-perf/meson.build              |  24 +-
 app/test-eventdev/meson.build                 |  28 +-
 app/test-flow-perf/meson.build                |   8 +-
 app/test-pipeline/meson.build                 |  19 +-
 app/test-pmd/meson.build                      |  64 +-
 app/test/meson.build                          | 530 ++++++-------
 app/test/test_eal_fs.c                        |   2 +-
 app/test/test_memzone.c                       |   2 +-
 app/test/test_telemetry_json.c                |   2 +-
 buildtools/chkincs/meson.build                |  24 +-
 buildtools/meson.build                        |  34 +-
 buildtools/pkg-config/meson.build             |  34 +-
 config/arm/meson.build                        | 704 +++++++++---------
 config/meson.build                            | 286 ++++---
 config/ppc/meson.build                        |   8 +-
 config/x86/meson.build                        |  64 +-
 devtools/build-tags.sh                        |  14 +-
 devtools/update_patches.py                    |  53 ++
 doc/api/doxy-api.conf.in                      | 104 +--
 doc/api/meson.build                           |  36 +-
 doc/guides/contributing/abi_versioning.rst    |  12 +-
 doc/guides/contributing/coding_style.rst      |  50 +-
 doc/guides/contributing/documentation.rst     |  10 +-
 doc/guides/meson.build                        |  25 +-
 doc/guides/prog_guide/event_timer_adapter.rst |   2 +-
 doc/guides/prog_guide/qos_framework.rst       |   4 +-
 doc/guides/prog_guide/rawdev.rst              |   2 +-
 doc/guides/rel_notes/known_issues.rst         |   2 +-
 doc/meson.build                               |   6 +-
 drivers/baseband/meson.build                  |  10 +-
 drivers/baseband/turbo_sw/meson.build         |  46 +-
 drivers/bus/dpaa/meson.build                  |  28 +-
 drivers/bus/fslmc/meson.build                 |  30 +-
 drivers/bus/ifpga/meson.build                 |   6 +-
 drivers/bus/meson.build                       |   9 +-
 drivers/bus/pci/meson.build                   |  24 +-
 drivers/bus/vdev/meson.build                  |   2 +-
 drivers/bus/vmbus/meson.build                 |  22 +-
 drivers/common/cnxk/meson.build               |  78 +-
 drivers/common/cpt/meson.build                |   9 +-
 drivers/common/dpaax/meson.build              |   8 +-
 drivers/common/meson.build                    |   9 +-
 drivers/common/mlx5/linux/meson.build         | 349 +++++----
 drivers/common/mlx5/meson.build               |  40 +-
 drivers/common/mlx5/windows/meson.build       |  30 +-
 drivers/common/mvep/meson.build               |  12 +-
 drivers/common/octeontx/meson.build           |   6 +-
 drivers/common/octeontx2/meson.build          |  29 +-
 drivers/common/qat/meson.build                |  71 +-
 drivers/common/sfc_efx/base/meson.build       | 142 ++--
 drivers/common/sfc_efx/meson.build            |  24 +-
 drivers/compress/isal/meson.build             |   4 +-
 drivers/compress/meson.build                  |   9 +-
 drivers/compress/mlx5/meson.build             |  24 +-
 drivers/compress/zlib/meson.build             |   4 +-
 drivers/crypto/aesni_gcm/meson.build          |  22 +-
 drivers/crypto/aesni_mb/meson.build           |  22 +-
 drivers/crypto/armv8/meson.build              |   6 +-
 drivers/crypto/bcmfs/meson.build              |  26 +-
 drivers/crypto/caam_jr/meson.build            |  10 +-
 drivers/crypto/ccp/meson.build                |  16 +-
 drivers/crypto/dpaa2_sec/meson.build          |   6 +-
 drivers/crypto/dpaa_sec/meson.build           |   4 +-
 drivers/crypto/kasumi/meson.build             |  20 +-
 drivers/crypto/meson.build                    |  42 +-
 drivers/crypto/mvsam/meson.build              |   6 +-
 drivers/crypto/nitrox/meson.build             |  20 +-
 drivers/crypto/octeontx/meson.build           |  12 +-
 drivers/crypto/octeontx2/meson.build          |  16 +-
 drivers/crypto/openssl/meson.build            |   4 +-
 drivers/crypto/qat/meson.build                |  20 +-
 drivers/crypto/scheduler/meson.build          |  18 +-
 drivers/crypto/snow3g/meson.build             |  18 +-
 drivers/crypto/virtio/meson.build             |   4 +-
 drivers/crypto/zuc/meson.build                |  20 +-
 drivers/event/dlb2/meson.build                |  14 +-
 drivers/event/dpaa/meson.build                |   4 +-
 drivers/event/dpaa2/meson.build               |   8 +-
 drivers/event/dsw/meson.build                 |   2 +-
 drivers/event/meson.build                     |  18 +-
 drivers/event/octeontx/meson.build            |  12 +-
 drivers/event/octeontx2/meson.build           |  24 +-
 drivers/event/opdl/meson.build                |  10 +-
 drivers/event/sw/meson.build                  |   8 +-
 drivers/mempool/bucket/meson.build            |   4 +-
 drivers/mempool/cnxk/meson.build              |  16 +-
 drivers/mempool/dpaa/meson.build              |   4 +-
 drivers/mempool/dpaa2/meson.build             |   4 +-
 drivers/mempool/meson.build                   |  12 +-
 drivers/mempool/octeontx/meson.build          |   6 +-
 drivers/mempool/octeontx2/meson.build         |  20 +-
 drivers/mempool/stack/meson.build             |   4 +-
 drivers/meson.build                           | 422 ++++++-----
 drivers/net/af_packet/meson.build             |   4 +-
 drivers/net/af_xdp/meson.build                |  24 +-
 drivers/net/ark/meson.build                   |  28 +-
 drivers/net/atlantic/meson.build              |  22 +-
 drivers/net/avp/meson.build                   |   4 +-
 drivers/net/axgbe/meson.build                 |  16 +-
 drivers/net/bnx2x/meson.build                 |  18 +-
 drivers/net/bnxt/meson.build                  | 124 +--
 drivers/net/bonding/meson.build               |   8 +-
 drivers/net/cxgbe/meson.build                 |  30 +-
 drivers/net/dpaa/meson.build                  |  16 +-
 drivers/net/dpaa2/meson.build                 |  26 +-
 drivers/net/e1000/base/meson.build            |  50 +-
 drivers/net/e1000/meson.build                 |  20 +-
 drivers/net/ena/meson.build                   |  10 +-
 drivers/net/enetc/meson.build                 |   6 +-
 drivers/net/enic/meson.build                  |  46 +-
 drivers/net/failsafe/meson.build              |  24 +-
 drivers/net/fm10k/base/meson.build            |  28 +-
 drivers/net/fm10k/meson.build                 |  12 +-
 drivers/net/hinic/base/meson.build            |  26 +-
 drivers/net/hinic/meson.build                 |  16 +-
 drivers/net/hns3/meson.build                  |  52 +-
 drivers/net/i40e/base/meson.build             |  32 +-
 drivers/net/i40e/meson.build                  | 110 +--
 drivers/net/iavf/meson.build                  |  94 +--
 drivers/net/ice/base/meson.build              |  45 +-
 drivers/net/ice/meson.build                   | 105 +--
 drivers/net/igc/base/meson.build              |  20 +-
 drivers/net/igc/meson.build                   |  16 +-
 drivers/net/ionic/meson.build                 |  20 +-
 drivers/net/ipn3ke/meson.build                |  18 +-
 drivers/net/ixgbe/base/meson.build            |  42 +-
 drivers/net/ixgbe/meson.build                 |  32 +-
 drivers/net/kni/meson.build                   |   6 +-
 drivers/net/liquidio/meson.build              |  12 +-
 drivers/net/memif/meson.build                 |   6 +-
 drivers/net/meson.build                       | 108 +--
 drivers/net/mlx4/meson.build                  | 160 ++--
 drivers/net/mlx5/linux/meson.build            |  14 +-
 drivers/net/mlx5/meson.build                  |  90 +--
 drivers/net/mlx5/windows/meson.build          |  10 +-
 drivers/net/mvneta/meson.build                |  16 +-
 drivers/net/mvpp2/meson.build                 |  22 +-
 drivers/net/netvsc/meson.build                |   6 +-
 drivers/net/nfb/meson.build                   |   6 +-
 drivers/net/nfp/meson.build                   |  28 +-
 drivers/net/null/meson.build                  |   6 +-
 drivers/net/octeontx/base/meson.build         |  18 +-
 drivers/net/octeontx/meson.build              |  12 +-
 drivers/net/octeontx2/meson.build             |  62 +-
 drivers/net/octeontx_ep/meson.build           |   8 +-
 drivers/net/pcap/meson.build                  |  10 +-
 drivers/net/pfe/meson.build                   |  12 +-
 drivers/net/qede/base/meson.build             |  78 +-
 drivers/net/qede/meson.build                  |  22 +-
 drivers/net/ring/meson.build                  |   6 +-
 drivers/net/sfc/meson.build                   |  64 +-
 drivers/net/softnic/meson.build               |  32 +-
 drivers/net/szedata2/meson.build              |   6 +-
 drivers/net/tap/meson.build                   |  36 +-
 drivers/net/thunderx/base/meson.build         |  10 +-
 drivers/net/thunderx/meson.build              |  14 +-
 drivers/net/txgbe/base/meson.build            |  26 +-
 drivers/net/txgbe/meson.build                 |  24 +-
 drivers/net/vdev_netvsc/meson.build           |   4 +-
 drivers/net/vhost/meson.build                 |   6 +-
 drivers/net/virtio/meson.build                |  78 +-
 drivers/net/vmxnet3/meson.build               |  10 +-
 drivers/raw/ifpga/base/meson.build            |  54 +-
 drivers/raw/ifpga/meson.build                 |   8 +-
 drivers/raw/ioat/meson.build                  |  18 +-
 drivers/raw/meson.build                       |  17 +-
 drivers/raw/ntb/meson.build                   |   2 +-
 drivers/raw/octeontx2_dma/meson.build         |   8 +-
 drivers/raw/octeontx2_ep/meson.build          |   6 +-
 drivers/regex/meson.build                     |   5 +-
 drivers/regex/mlx5/meson.build                |  32 +-
 drivers/regex/octeontx2/meson.build           |  22 +-
 drivers/vdpa/meson.build                      |   8 +-
 drivers/vdpa/mlx5/meson.build                 |  38 +-
 examples/bbdev_app/meson.build                |   2 +-
 examples/bond/meson.build                     |   2 +-
 examples/cmdline/meson.build                  |   4 +-
 examples/distributor/meson.build              |   4 +-
 examples/ethtool/meson.build                  |  12 +-
 examples/eventdev_pipeline/meson.build        |   6 +-
 examples/fips_validation/meson.build          |  22 +-
 examples/flow_classify/meson.build            |   2 +-
 examples/flow_filtering/meson.build           |   2 +-
 examples/helloworld/meson.build               |   2 +-
 examples/ioat/meson.build                     |   4 +-
 examples/ip_fragmentation/meson.build         |   2 +-
 examples/ip_pipeline/meson.build              |  30 +-
 examples/ip_reassembly/meson.build            |   2 +-
 examples/ipsec-secgw/meson.build              |  26 +-
 examples/ipv4_multicast/meson.build           |   2 +-
 examples/kni/meson.build                      |   4 +-
 examples/l2fwd-cat/meson.build                |   5 +-
 examples/l2fwd-crypto/meson.build             |   4 +-
 examples/l2fwd-event/meson.build              |  12 +-
 examples/l2fwd-jobstats/meson.build           |   2 +-
 examples/l2fwd-keepalive/meson.build          |   7 +-
 examples/l2fwd/meson.build                    |   2 +-
 examples/l3fwd-acl/meson.build                |   2 +-
 examples/l3fwd-graph/meson.build              |   2 +-
 examples/l3fwd-power/meson.build              |   3 +-
 examples/l3fwd/meson.build                    |   8 +-
 examples/link_status_interrupt/meson.build    |   2 +-
 examples/meson.build                          | 177 +++--
 .../client_server_mp/mp_client/meson.build    |   2 +-
 .../client_server_mp/mp_server/meson.build    |   2 +-
 examples/multi_process/hotplug_mp/meson.build |   2 +-
 examples/multi_process/simple_mp/meson.build  |   2 +-
 .../multi_process/symmetric_mp/meson.build    |   2 +-
 examples/ntb/meson.build                      |   8 +-
 examples/packet_ordering/meson.build          |   2 +-
 .../l3fwd-thread/meson.build                  |  20 +-
 .../pthread_shim/meson.build                  |  22 +-
 examples/pipeline/meson.build                 |  12 +-
 examples/ptpclient/meson.build                |   2 +-
 examples/qos_meter/meson.build                |   3 +-
 examples/qos_sched/meson.build                |   9 +-
 examples/rxtx_callbacks/meson.build           |   2 +-
 examples/service_cores/meson.build            |   2 +-
 examples/skeleton/meson.build                 |   2 +-
 examples/timer/meson.build                    |   2 +-
 examples/vdpa/meson.build                     |   6 +-
 examples/vhost/meson.build                    |  11 +-
 examples/vhost_blk/meson.build                |  12 +-
 examples/vhost_crypto/meson.build             |   4 +-
 .../vm_power_manager/guest_cli/meson.build    |   4 +-
 examples/vm_power_manager/meson.build         |  25 +-
 examples/vmdq/meson.build                     |   2 +-
 examples/vmdq_dcb/meson.build                 |   2 +-
 kernel/freebsd/meson.build                    |  32 +-
 kernel/linux/kni/meson.build                  |  41 +-
 kernel/linux/meson.build                      | 111 ++-
 lib/{librte_acl => acl}/acl.h                 |   0
 lib/{librte_acl => acl}/acl_bld.c             |   0
 lib/{librte_acl => acl}/acl_gen.c             |   0
 lib/{librte_acl => acl}/acl_run.h             |   0
 lib/{librte_acl => acl}/acl_run_altivec.c     |   0
 lib/{librte_acl => acl}/acl_run_altivec.h     |   0
 lib/{librte_acl => acl}/acl_run_avx2.c        |   0
 lib/{librte_acl => acl}/acl_run_avx2.h        |   0
 lib/{librte_acl => acl}/acl_run_avx512.c      |   0
 .../acl_run_avx512_common.h                   |   0
 lib/{librte_acl => acl}/acl_run_avx512x16.h   |   0
 lib/{librte_acl => acl}/acl_run_avx512x8.h    |   0
 lib/{librte_acl => acl}/acl_run_neon.c        |   0
 lib/{librte_acl => acl}/acl_run_neon.h        |   0
 lib/{librte_acl => acl}/acl_run_scalar.c      |   0
 lib/{librte_acl => acl}/acl_run_sse.c         |   0
 lib/{librte_acl => acl}/acl_run_sse.h         |   0
 lib/{librte_acl => acl}/acl_vect.h            |   0
 lib/acl/meson.build                           |  83 +++
 lib/{librte_acl => acl}/rte_acl.c             |   0
 lib/{librte_acl => acl}/rte_acl.h             |   0
 lib/{librte_acl => acl}/rte_acl_osdep.h       |   0
 lib/{librte_acl => acl}/tb_mem.c              |   0
 lib/{librte_acl => acl}/tb_mem.h              |   0
 lib/{librte_acl => acl}/version.map           |   0
 lib/{librte_bbdev => bbdev}/meson.build       |   4 +-
 lib/{librte_bbdev => bbdev}/rte_bbdev.c       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.h       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_op.h    |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h   |   0
 lib/{librte_bbdev => bbdev}/version.map       |   0
 .../meson.build                               |   0
 .../rte_bitrate.c                             |   0
 .../rte_bitrate.h                             |   0
 .../version.map                               |   0
 lib/{librte_bpf => bpf}/bpf.c                 |   0
 lib/{librte_bpf => bpf}/bpf_def.h             |   0
 lib/{librte_bpf => bpf}/bpf_exec.c            |   0
 lib/{librte_bpf => bpf}/bpf_impl.h            |   0
 lib/{librte_bpf => bpf}/bpf_jit_arm64.c       |   0
 lib/{librte_bpf => bpf}/bpf_jit_x86.c         |   0
 lib/{librte_bpf => bpf}/bpf_load.c            |   0
 lib/{librte_bpf => bpf}/bpf_load_elf.c        |   0
 lib/{librte_bpf => bpf}/bpf_pkt.c             |   0
 lib/{librte_bpf => bpf}/bpf_validate.c        |   0
 lib/{librte_bpf => bpf}/meson.build           |  22 +-
 lib/{librte_bpf => bpf}/rte_bpf.h             |   0
 lib/{librte_bpf => bpf}/rte_bpf_ethdev.h      |   0
 lib/{librte_bpf => bpf}/version.map           |   0
 lib/{librte_cfgfile => cfgfile}/meson.build   |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h |   0
 lib/{librte_cfgfile => cfgfile}/version.map   |   0
 lib/{librte_cmdline => cmdline}/cmdline.c     |   0
 lib/{librte_cmdline => cmdline}/cmdline.h     |   0
 .../cmdline_cirbuf.c                          |   0
 .../cmdline_cirbuf.h                          |   0
 .../cmdline_os_unix.c                         |   0
 .../cmdline_os_windows.c                      |   0
 .../cmdline_parse.c                           |   0
 .../cmdline_parse.h                           |   0
 .../cmdline_parse_etheraddr.c                 |   0
 .../cmdline_parse_etheraddr.h                 |   0
 .../cmdline_parse_ipaddr.c                    |   0
 .../cmdline_parse_ipaddr.h                    |   0
 .../cmdline_parse_num.c                       |   0
 .../cmdline_parse_num.h                       |   0
 .../cmdline_parse_portlist.c                  |   0
 .../cmdline_parse_portlist.h                  |   0
 .../cmdline_parse_string.c                    |   0
 .../cmdline_parse_string.h                    |   0
 .../cmdline_private.h                         |   0
 .../cmdline_rdline.c                          |   0
 .../cmdline_rdline.h                          |   0
 .../cmdline_socket.c                          |   0
 .../cmdline_socket.h                          |   0
 .../cmdline_vt100.c                           |   0
 .../cmdline_vt100.h                           |   0
 lib/cmdline/meson.build                       |  34 +
 lib/{librte_cmdline => cmdline}/version.map   |   0
 .../meson.build                               |  10 +-
 .../rte_comp.c                                |   0
 .../rte_comp.h                                |   0
 .../rte_compressdev.c                         |   0
 .../rte_compressdev.h                         |   0
 .../rte_compressdev_internal.h                |   0
 .../rte_compressdev_pmd.c                     |   0
 .../rte_compressdev_pmd.h                     |   0
 .../version.map                               |   0
 .../cryptodev_trace_points.c                  |   0
 .../meson.build                               |  12 +-
 .../rte_crypto.h                              |   0
 .../rte_crypto_asym.h                         |   0
 .../rte_crypto_sym.h                          |   0
 .../rte_cryptodev.c                           |   0
 .../rte_cryptodev.h                           |   0
 .../rte_cryptodev_pmd.c                       |   0
 .../rte_cryptodev_pmd.h                       |   0
 .../rte_cryptodev_trace.h                     |   0
 .../rte_cryptodev_trace_fp.h                  |   0
 .../version.map                               |   0
 .../distributor_private.h                     |   0
 .../meson.build                               |   4 +-
 .../rte_distributor.c                         |   0
 .../rte_distributor.h                         |   0
 .../rte_distributor_match_generic.c           |   0
 .../rte_distributor_match_sse.c               |   0
 .../rte_distributor_single.c                  |   0
 .../rte_distributor_single.h                  |   0
 .../version.map                               |   0
 lib/eal/arm/include/meson.build               |  34 +
 .../arm/include/rte_atomic.h                  |   0
 .../arm/include/rte_atomic_32.h               |   0
 .../arm/include/rte_atomic_64.h               |   0
 .../arm/include/rte_byteorder.h               |   0
 .../arm/include/rte_cpuflags.h                |   0
 .../arm/include/rte_cpuflags_32.h             |   0
 .../arm/include/rte_cpuflags_64.h             |   0
 .../arm/include/rte_cycles.h                  |   0
 .../arm/include/rte_cycles_32.h               |   0
 .../arm/include/rte_cycles_64.h               |   0
 lib/{librte_eal => eal}/arm/include/rte_io.h  |   0
 .../arm/include/rte_io_64.h                   |   0
 .../arm/include/rte_mcslock.h                 |   0
 .../arm/include/rte_memcpy.h                  |   0
 .../arm/include/rte_memcpy_32.h               |   0
 .../arm/include/rte_memcpy_64.h               |   0
 .../arm/include/rte_pause.h                   |   0
 .../arm/include/rte_pause_32.h                |   0
 .../arm/include/rte_pause_64.h                |   0
 .../arm/include/rte_pflock.h                  |   0
 .../arm/include/rte_power_intrinsics.h        |   0
 .../arm/include/rte_prefetch.h                |   0
 .../arm/include/rte_prefetch_32.h             |   0
 .../arm/include/rte_prefetch_64.h             |   0
 .../arm/include/rte_rwlock.h                  |   0
 .../arm/include/rte_spinlock.h                |   0
 .../arm/include/rte_ticketlock.h              |   0
 .../arm/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/arm/meson.build       |   8 +-
 lib/{librte_eal => eal}/arm/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/arm/rte_cycles.c      |   0
 lib/{librte_eal => eal}/arm/rte_hypervisor.c  |   0
 .../arm/rte_power_intrinsics.c                |   0
 .../common/eal_common_bus.c                   |   0
 .../common/eal_common_class.c                 |   0
 .../common/eal_common_config.c                |   0
 .../common/eal_common_cpuflags.c              |   0
 .../common/eal_common_debug.c                 |   0
 .../common/eal_common_dev.c                   |   0
 .../common/eal_common_devargs.c               |   0
 .../common/eal_common_dynmem.c                |   0
 .../common/eal_common_errno.c                 |   0
 .../common/eal_common_fbarray.c               |   0
 .../common/eal_common_hexdump.c               |   0
 .../common/eal_common_hypervisor.c            |   0
 .../common/eal_common_launch.c                |   0
 .../common/eal_common_lcore.c                 |   0
 .../common/eal_common_log.c                   |   0
 .../common/eal_common_mcfg.c                  |   0
 .../common/eal_common_memalloc.c              |   0
 .../common/eal_common_memory.c                |   0
 .../common/eal_common_memzone.c               |   0
 .../common/eal_common_options.c               |   0
 .../common/eal_common_proc.c                  |   0
 .../common/eal_common_string_fns.c            |   0
 .../common/eal_common_tailqs.c                |   0
 .../common/eal_common_thread.c                |   0
 .../common/eal_common_timer.c                 |   0
 .../common/eal_common_trace.c                 |   0
 .../common/eal_common_trace_ctf.c             |   0
 .../common/eal_common_trace_points.c          |   0
 .../common/eal_common_trace_utils.c           |   0
 .../common/eal_common_uuid.c                  |   0
 .../common/eal_filesystem.h                   |   0
 .../common/eal_hugepages.h                    |   0
 .../common/eal_internal_cfg.h                 |   0
 lib/{librte_eal => eal}/common/eal_log.h      |   0
 lib/{librte_eal => eal}/common/eal_memalloc.h |   0
 lib/{librte_eal => eal}/common/eal_memcfg.h   |   0
 lib/{librte_eal => eal}/common/eal_options.h  |   0
 lib/{librte_eal => eal}/common/eal_private.h  |   0
 lib/{librte_eal => eal}/common/eal_thread.h   |   0
 lib/{librte_eal => eal}/common/eal_trace.h    |   0
 lib/{librte_eal => eal}/common/hotplug_mp.c   |   0
 lib/{librte_eal => eal}/common/hotplug_mp.h   |   0
 lib/{librte_eal => eal}/common/malloc_elem.c  |   0
 lib/{librte_eal => eal}/common/malloc_elem.h  |   0
 lib/{librte_eal => eal}/common/malloc_heap.c  |   0
 lib/{librte_eal => eal}/common/malloc_heap.h  |   0
 lib/{librte_eal => eal}/common/malloc_mp.c    |   0
 lib/{librte_eal => eal}/common/malloc_mp.h    |   0
 lib/eal/common/meson.build                    |  88 +++
 .../common/rte_keepalive.c                    |   0
 lib/{librte_eal => eal}/common/rte_malloc.c   |   0
 lib/{librte_eal => eal}/common/rte_random.c   |   0
 .../common/rte_reciprocal.c                   |   0
 lib/{librte_eal => eal}/common/rte_service.c  |   0
 lib/{librte_eal => eal}/common/rte_version.c  |   0
 lib/{librte_eal => eal}/freebsd/eal.c         |   0
 lib/{librte_eal => eal}/freebsd/eal_alarm.c   |   0
 .../freebsd/eal_alarm_private.h               |   0
 .../freebsd/eal_cpuflags.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_debug.c   |   0
 lib/{librte_eal => eal}/freebsd/eal_dev.c     |   0
 .../freebsd/eal_hugepage_info.c               |   0
 .../freebsd/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/freebsd/eal_lcore.c   |   0
 .../freebsd/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_memory.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_thread.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_timer.c   |   0
 .../freebsd/include/meson.build               |   0
 .../freebsd/include/rte_os.h                  |   0
 .../freebsd/include/rte_os_shim.h             |   0
 lib/eal/freebsd/meson.build                   |  21 +
 .../include/generic/rte_atomic.h              |   0
 .../include/generic/rte_byteorder.h           |   0
 .../include/generic/rte_cpuflags.h            |   0
 .../include/generic/rte_cycles.h              |   0
 .../include/generic/rte_io.h                  |   0
 .../include/generic/rte_mcslock.h             |   0
 .../include/generic/rte_memcpy.h              |   0
 .../include/generic/rte_pause.h               |   0
 .../include/generic/rte_pflock.h              |   0
 .../include/generic/rte_power_intrinsics.h    |   0
 .../include/generic/rte_prefetch.h            |   0
 .../include/generic/rte_rwlock.h              |   0
 .../include/generic/rte_spinlock.h            |   0
 .../include/generic/rte_ticketlock.h          |   0
 .../include/generic/rte_vect.h                |   0
 lib/eal/include/meson.build                   |  70 ++
 lib/{librte_eal => eal}/include/rte_alarm.h   |   0
 lib/{librte_eal => eal}/include/rte_bitmap.h  |   0
 lib/{librte_eal => eal}/include/rte_bitops.h  |   0
 .../include/rte_branch_prediction.h           |   0
 lib/{librte_eal => eal}/include/rte_bus.h     |   0
 lib/{librte_eal => eal}/include/rte_class.h   |   0
 lib/{librte_eal => eal}/include/rte_common.h  |   0
 lib/{librte_eal => eal}/include/rte_compat.h  |   0
 lib/{librte_eal => eal}/include/rte_debug.h   |   0
 lib/{librte_eal => eal}/include/rte_dev.h     |   0
 lib/{librte_eal => eal}/include/rte_devargs.h |   0
 lib/{librte_eal => eal}/include/rte_eal.h     |   0
 .../include/rte_eal_interrupts.h              |   0
 .../include/rte_eal_memconfig.h               |   0
 .../include/rte_eal_paging.h                  |   0
 .../include/rte_eal_trace.h                   |   0
 lib/{librte_eal => eal}/include/rte_errno.h   |   0
 lib/{librte_eal => eal}/include/rte_fbarray.h |   0
 .../include/rte_function_versioning.h         |   0
 lib/{librte_eal => eal}/include/rte_hexdump.h |   0
 .../include/rte_hypervisor.h                  |   0
 .../include/rte_interrupts.h                  |   0
 .../include/rte_keepalive.h                   |   0
 lib/{librte_eal => eal}/include/rte_launch.h  |   0
 lib/{librte_eal => eal}/include/rte_lcore.h   |   0
 lib/{librte_eal => eal}/include/rte_log.h     |   0
 lib/{librte_eal => eal}/include/rte_malloc.h  |   0
 lib/{librte_eal => eal}/include/rte_memory.h  |   0
 lib/{librte_eal => eal}/include/rte_memzone.h |   0
 .../include/rte_pci_dev_feature_defs.h        |   0
 .../include/rte_pci_dev_features.h            |   0
 .../include/rte_per_lcore.h                   |   0
 lib/{librte_eal => eal}/include/rte_random.h  |   0
 .../include/rte_reciprocal.h                  |   0
 lib/{librte_eal => eal}/include/rte_service.h |   0
 .../include/rte_service_component.h           |   0
 .../include/rte_string_fns.h                  |   0
 lib/{librte_eal => eal}/include/rte_tailq.h   |   0
 lib/{librte_eal => eal}/include/rte_test.h    |   0
 lib/{librte_eal => eal}/include/rte_thread.h  |   0
 lib/{librte_eal => eal}/include/rte_time.h    |   0
 lib/{librte_eal => eal}/include/rte_trace.h   |   0
 .../include/rte_trace_point.h                 |   0
 .../include/rte_trace_point_register.h        |   0
 lib/{librte_eal => eal}/include/rte_uuid.h    |   0
 lib/{librte_eal => eal}/include/rte_version.h |   0
 lib/{librte_eal => eal}/include/rte_vfio.h    |   0
 lib/{librte_eal => eal}/linux/eal.c           |   0
 lib/{librte_eal => eal}/linux/eal_alarm.c     |   0
 lib/{librte_eal => eal}/linux/eal_cpuflags.c  |   0
 lib/{librte_eal => eal}/linux/eal_debug.c     |   0
 lib/{librte_eal => eal}/linux/eal_dev.c       |   0
 .../linux/eal_hugepage_info.c                 |   0
 .../linux/eal_interrupts.c                    |   0
 lib/{librte_eal => eal}/linux/eal_lcore.c     |   0
 lib/{librte_eal => eal}/linux/eal_log.c       |   0
 lib/{librte_eal => eal}/linux/eal_memalloc.c  |   0
 lib/{librte_eal => eal}/linux/eal_memory.c    |   0
 lib/{librte_eal => eal}/linux/eal_thread.c    |   0
 lib/{librte_eal => eal}/linux/eal_timer.c     |   0
 lib/{librte_eal => eal}/linux/eal_vfio.c      |   0
 lib/{librte_eal => eal}/linux/eal_vfio.h      |   0
 .../linux/eal_vfio_mp_sync.c                  |   0
 .../linux/include/meson.build                 |   0
 .../linux/include/rte_os.h                    |   0
 .../linux/include/rte_os_shim.h               |   0
 lib/eal/linux/meson.build                     |  27 +
 lib/{librte_eal => eal}/meson.build           |   8 +-
 lib/eal/ppc/include/meson.build               |  22 +
 .../ppc/include/rte_altivec.h                 |   0
 .../ppc/include/rte_atomic.h                  |   0
 .../ppc/include/rte_byteorder.h               |   0
 .../ppc/include/rte_cpuflags.h                |   0
 .../ppc/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/ppc/include/rte_io.h  |   0
 .../ppc/include/rte_mcslock.h                 |   0
 .../ppc/include/rte_memcpy.h                  |   0
 .../ppc/include/rte_pause.h                   |   0
 .../ppc/include/rte_pflock.h                  |   0
 .../ppc/include/rte_power_intrinsics.h        |   0
 .../ppc/include/rte_prefetch.h                |   0
 .../ppc/include/rte_rwlock.h                  |   0
 .../ppc/include/rte_spinlock.h                |   0
 .../ppc/include/rte_ticketlock.h              |   0
 .../ppc/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/ppc/meson.build       |   8 +-
 lib/{librte_eal => eal}/ppc/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/ppc/rte_cycles.c      |   0
 lib/{librte_eal => eal}/ppc/rte_hypervisor.c  |   0
 .../ppc/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/unix/eal_file.c       |   0
 .../unix/eal_unix_memory.c                    |   0
 lib/{librte_eal => eal}/unix/eal_unix_timer.c |   0
 lib/eal/unix/meson.build                      |   9 +
 lib/{librte_eal => eal}/unix/rte_thread.c     |   0
 lib/{librte_eal => eal}/version.map           |   0
 lib/{librte_eal => eal}/windows/eal.c         |   0
 lib/{librte_eal => eal}/windows/eal_alarm.c   |   0
 lib/{librte_eal => eal}/windows/eal_debug.c   |   0
 lib/{librte_eal => eal}/windows/eal_file.c    |   0
 .../windows/eal_hugepages.c                   |   0
 .../windows/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/windows/eal_lcore.c   |   0
 lib/{librte_eal => eal}/windows/eal_log.c     |   0
 .../windows/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/windows/eal_memory.c  |   0
 lib/{librte_eal => eal}/windows/eal_mp.c      |   0
 lib/{librte_eal => eal}/windows/eal_thread.c  |   0
 lib/{librte_eal => eal}/windows/eal_timer.c   |   0
 lib/{librte_eal => eal}/windows/eal_windows.h |   0
 lib/{librte_eal => eal}/windows/fnmatch.c     |   0
 lib/{librte_eal => eal}/windows/getopt.c      |   0
 .../windows/include/dirent.h                  |   0
 .../windows/include/fnmatch.h                 |   0
 .../windows/include/getopt.h                  |   0
 .../windows/include/meson.build               |   0
 .../windows/include/pthread.h                 |   0
 .../windows/include/regex.h                   |   0
 .../windows/include/rte_os.h                  |   0
 .../windows/include/rte_os_shim.h             |   0
 .../windows/include/rte_virt2phys.h           |   0
 .../windows/include/rte_windows.h             |   0
 .../windows/include/sched.h                   |   0
 .../windows/include/sys/queue.h               |   0
 .../windows/include/unistd.h                  |   0
 lib/eal/windows/meson.build                   |  25 +
 lib/{librte_eal => eal}/windows/rte_thread.c  |   0
 lib/eal/x86/include/meson.build               |  29 +
 .../x86/include/rte_atomic.h                  |   0
 .../x86/include/rte_atomic_32.h               |   0
 .../x86/include/rte_atomic_64.h               |   0
 .../x86/include/rte_byteorder.h               |   0
 .../x86/include/rte_byteorder_32.h            |   0
 .../x86/include/rte_byteorder_64.h            |   0
 .../x86/include/rte_cpuflags.h                |   0
 .../x86/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/x86/include/rte_io.h  |   0
 .../x86/include/rte_mcslock.h                 |   0
 .../x86/include/rte_memcpy.h                  |   0
 .../x86/include/rte_pause.h                   |   0
 .../x86/include/rte_pflock.h                  |   0
 .../x86/include/rte_power_intrinsics.h        |   0
 .../x86/include/rte_prefetch.h                |   0
 lib/{librte_eal => eal}/x86/include/rte_rtm.h |   0
 .../x86/include/rte_rwlock.h                  |   0
 .../x86/include/rte_spinlock.h                |   0
 .../x86/include/rte_ticketlock.h              |   0
 .../x86/include/rte_vect.h                    |   0
 lib/eal/x86/meson.build                       |  12 +
 lib/{librte_eal => eal}/x86/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/x86/rte_cpuid.h       |   0
 lib/{librte_eal => eal}/x86/rte_cycles.c      |   0
 lib/{librte_eal => eal}/x86/rte_hypervisor.c  |   0
 .../x86/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/x86/rte_spinlock.c    |   0
 lib/{librte_efd => efd}/meson.build           |   0
 lib/{librte_efd => efd}/rte_efd.c             |   0
 lib/{librte_efd => efd}/rte_efd.h             |   0
 lib/{librte_efd => efd}/rte_efd_arm64.h       |   0
 lib/{librte_efd => efd}/rte_efd_x86.h         |   0
 lib/{librte_efd => efd}/version.map           |   0
 lib/{librte_ethdev => ethdev}/ethdev_driver.h |   0
 lib/{librte_ethdev => ethdev}/ethdev_pci.h    |   0
 .../ethdev_private.c                          |   0
 .../ethdev_private.h                          |   0
 .../ethdev_profile.c                          |   0
 .../ethdev_profile.h                          |   0
 .../ethdev_trace_points.c                     |   0
 lib/{librte_ethdev => ethdev}/ethdev_vdev.h   |   0
 lib/ethdev/meson.build                        |  39 +
 lib/{librte_ethdev => ethdev}/rte_class_eth.c |   0
 lib/{librte_ethdev => ethdev}/rte_dev_info.h  |   0
 lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h  |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.c    |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.h    |   0
 .../rte_ethdev_core.h                         |   0
 .../rte_ethdev_trace.h                        |   0
 .../rte_ethdev_trace_fp.h                     |   0
 lib/{librte_ethdev => ethdev}/rte_flow.c      |   0
 lib/{librte_ethdev => ethdev}/rte_flow.h      |   0
 .../rte_flow_driver.h                         |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.c       |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.h       |   0
 .../rte_mtr_driver.h                          |   0
 lib/{librte_ethdev => ethdev}/rte_tm.c        |   0
 lib/{librte_ethdev => ethdev}/rte_tm.h        |   0
 lib/{librte_ethdev => ethdev}/rte_tm_driver.h |   0
 lib/{librte_ethdev => ethdev}/version.map     |   0
 .../eventdev_pmd.h                            |   0
 .../eventdev_pmd_pci.h                        |   0
 .../eventdev_pmd_vdev.h                       |   0
 .../eventdev_trace_points.c                   |   0
 lib/eventdev/meson.build                      |  31 +
 .../rte_event_crypto_adapter.c                |   0
 .../rte_event_crypto_adapter.h                |   0
 .../rte_event_eth_rx_adapter.c                |   0
 .../rte_event_eth_rx_adapter.h                |   0
 .../rte_event_eth_tx_adapter.c                |   0
 .../rte_event_eth_tx_adapter.h                |   0
 .../rte_event_ring.c                          |   0
 .../rte_event_ring.h                          |   0
 .../rte_event_timer_adapter.c                 |   0
 .../rte_event_timer_adapter.h                 |   0
 .../rte_event_timer_adapter_pmd.h             |   0
 .../rte_eventdev.c                            |   0
 .../rte_eventdev.h                            |   0
 .../rte_eventdev_trace.h                      |   0
 .../rte_eventdev_trace_fp.h                   |   0
 lib/{librte_eventdev => eventdev}/version.map |   0
 lib/{librte_fib => fib}/dir24_8.c             |   0
 lib/{librte_fib => fib}/dir24_8.h             |   0
 lib/{librte_fib => fib}/dir24_8_avx512.c      |   0
 lib/{librte_fib => fib}/dir24_8_avx512.h      |   0
 lib/fib/meson.build                           |  58 ++
 lib/{librte_fib => fib}/rte_fib.c             |   0
 lib/{librte_fib => fib}/rte_fib.h             |   0
 lib/{librte_fib => fib}/rte_fib6.c            |   0
 lib/{librte_fib => fib}/rte_fib6.h            |   0
 lib/{librte_fib => fib}/trie.c                |   0
 lib/{librte_fib => fib}/trie.h                |   0
 lib/{librte_fib => fib}/trie_avx512.c         |   0
 lib/{librte_fib => fib}/trie_avx512.h         |   0
 lib/{librte_fib => fib}/version.map           |   0
 .../meson.build                               |   0
 .../rte_flow_classify.c                       |   0
 .../rte_flow_classify.h                       |   0
 .../rte_flow_classify_parse.c                 |   0
 .../rte_flow_classify_parse.h                 |   0
 .../version.map                               |   0
 lib/{librte_graph => graph}/graph.c           |   0
 lib/{librte_graph => graph}/graph_debug.c     |   0
 lib/{librte_graph => graph}/graph_ops.c       |   0
 lib/{librte_graph => graph}/graph_populate.c  |   0
 lib/{librte_graph => graph}/graph_private.h   |   0
 lib/{librte_graph => graph}/graph_stats.c     |   0
 lib/{librte_graph => graph}/meson.build       |   9 +-
 lib/{librte_graph => graph}/node.c            |   0
 lib/{librte_graph => graph}/rte_graph.h       |   0
 .../rte_graph_worker.h                        |   0
 lib/{librte_graph => graph}/version.map       |   0
 lib/{librte_gro => gro}/gro_tcp4.c            |   0
 lib/{librte_gro => gro}/gro_tcp4.h            |   0
 lib/{librte_gro => gro}/gro_udp4.c            |   0
 lib/{librte_gro => gro}/gro_udp4.h            |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.h      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.h      |   0
 lib/gro/meson.build                           |  12 +
 lib/{librte_gro => gro}/rte_gro.c             |   0
 lib/{librte_gro => gro}/rte_gro.h             |   0
 lib/{librte_gro => gro}/version.map           |   0
 lib/{librte_gso => gso}/gso_common.c          |   0
 lib/{librte_gso => gso}/gso_common.h          |   0
 lib/{librte_gso => gso}/gso_tcp4.c            |   0
 lib/{librte_gso => gso}/gso_tcp4.h            |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.h     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.h     |   0
 lib/{librte_gso => gso}/gso_udp4.c            |   0
 lib/{librte_gso => gso}/gso_udp4.h            |   0
 lib/gso/meson.build                           |  13 +
 lib/{librte_gso => gso}/rte_gso.c             |   0
 lib/{librte_gso => gso}/rte_gso.h             |   0
 lib/{librte_gso => gso}/version.map           |   0
 lib/{librte_hash => hash}/meson.build         |  12 +-
 lib/{librte_hash => hash}/rte_cmp_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cmp_x86.h       |   0
 lib/{librte_hash => hash}/rte_crc_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.c   |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.h   |   0
 lib/{librte_hash => hash}/rte_fbk_hash.c      |   0
 lib/{librte_hash => hash}/rte_fbk_hash.h      |   0
 lib/{librte_hash => hash}/rte_hash.h          |   0
 lib/{librte_hash => hash}/rte_hash_crc.h      |   0
 lib/{librte_hash => hash}/rte_jhash.h         |   0
 lib/{librte_hash => hash}/rte_thash.h         |   0
 lib/{librte_hash => hash}/version.map         |   0
 .../ip_frag_common.h                          |   0
 .../ip_frag_internal.c                        |   0
 lib/ip_frag/meson.build                       |  13 +
 lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h |   0
 .../rte_ip_frag_common.c                      |   0
 .../rte_ipv4_fragmentation.c                  |   0
 .../rte_ipv4_reassembly.c                     |   0
 .../rte_ipv6_fragmentation.c                  |   0
 .../rte_ipv6_reassembly.c                     |   0
 lib/{librte_ip_frag => ip_frag}/version.map   |   0
 lib/{librte_ipsec => ipsec}/crypto.h          |   0
 lib/{librte_ipsec => ipsec}/esp_inb.c         |   0
 lib/{librte_ipsec => ipsec}/esp_outb.c        |   0
 lib/{librte_ipsec => ipsec}/iph.h             |   0
 lib/{librte_ipsec => ipsec}/ipsec_sad.c       |   0
 lib/{librte_ipsec => ipsec}/ipsec_sqn.h       |   0
 lib/{librte_ipsec => ipsec}/meson.build       |   0
 lib/{librte_ipsec => ipsec}/misc.h            |   0
 lib/{librte_ipsec => ipsec}/pad.h             |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec.h       |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_group.h |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h    |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h   |   0
 lib/{librte_ipsec => ipsec}/sa.c              |   0
 lib/{librte_ipsec => ipsec}/sa.h              |   0
 lib/{librte_ipsec => ipsec}/ses.c             |   0
 lib/{librte_ipsec => ipsec}/version.map       |   0
 lib/{librte_jobstats => jobstats}/meson.build |   0
 .../rte_jobstats.c                            |   0
 .../rte_jobstats.h                            |   0
 lib/{librte_jobstats => jobstats}/version.map |   0
 lib/{librte_kni => kni}/meson.build           |   4 +-
 lib/{librte_kni => kni}/rte_kni.c             |   0
 lib/{librte_kni => kni}/rte_kni.h             |   0
 lib/{librte_kni => kni}/rte_kni_common.h      |   0
 lib/{librte_kni => kni}/rte_kni_fifo.h        |   0
 lib/{librte_kni => kni}/version.map           |   0
 lib/{librte_kvargs => kvargs}/meson.build     |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.c    |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.h    |   0
 lib/{librte_kvargs => kvargs}/version.map     |   0
 .../meson.build                               |   0
 .../rte_latencystats.c                        |   0
 .../rte_latencystats.h                        |   0
 .../version.map                               |   0
 lib/librte_acl/meson.build                    |  83 ---
 lib/librte_cmdline/meson.build                |  34 -
 lib/librte_eal/arm/include/meson.build        |  34 -
 lib/librte_eal/common/meson.build             |  88 ---
 lib/librte_eal/freebsd/meson.build            |  21 -
 lib/librte_eal/include/meson.build            |  70 --
 lib/librte_eal/linux/meson.build              |  27 -
 lib/librte_eal/ppc/include/meson.build        |  22 -
 lib/librte_eal/unix/meson.build               |   9 -
 lib/librte_eal/windows/meson.build            |  25 -
 lib/librte_eal/x86/include/meson.build        |  30 -
 lib/librte_eal/x86/meson.build                |  12 -
 lib/librte_ethdev/meson.build                 |  33 -
 lib/librte_eventdev/meson.build               |  27 -
 lib/librte_fib/meson.build                    |  58 --
 lib/librte_gro/meson.build                    |   6 -
 lib/librte_gso/meson.build                    |   7 -
 lib/librte_ip_frag/meson.build                |  11 -
 lib/librte_mbuf/meson.build                   |   9 -
 lib/librte_mempool/meson.build                |  16 -
 lib/librte_net/meson.build                    | 110 ---
 lib/librte_pipeline/meson.build               |  16 -
 lib/librte_port/meson.build                   |  46 --
 lib/librte_power/meson.build                  |  17 -
 lib/librte_ring/meson.build                   |  19 -
 lib/librte_table/meson.build                  |  36 -
 lib/librte_vhost/meson.build                  |  26 -
 lib/{librte_lpm => lpm}/meson.build           |   7 +-
 lib/{librte_lpm => lpm}/rte_lpm.c             |   0
 lib/{librte_lpm => lpm}/rte_lpm.h             |   0
 lib/{librte_lpm => lpm}/rte_lpm6.c            |   0
 lib/{librte_lpm => lpm}/rte_lpm6.h            |   0
 lib/{librte_lpm => lpm}/rte_lpm_altivec.h     |   0
 lib/{librte_lpm => lpm}/rte_lpm_neon.h        |   0
 lib/{librte_lpm => lpm}/rte_lpm_sse.h         |   0
 lib/{librte_lpm => lpm}/rte_lpm_sve.h         |   0
 lib/{librte_lpm => lpm}/version.map           |   0
 lib/mbuf/meson.build                          |  17 +
 lib/{librte_mbuf => mbuf}/rte_mbuf.c          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.h          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_core.h     |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c    |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h    |   0
 lib/{librte_mbuf => mbuf}/version.map         |   0
 lib/{librte_member => member}/meson.build     |   0
 lib/{librte_member => member}/rte_member.c    |   0
 lib/{librte_member => member}/rte_member.h    |   0
 lib/{librte_member => member}/rte_member_ht.c |   0
 lib/{librte_member => member}/rte_member_ht.h |   0
 .../rte_member_vbf.c                          |   0
 .../rte_member_vbf.h                          |   0
 .../rte_member_x86.h                          |   0
 lib/{librte_member => member}/version.map     |   0
 .../mempool_trace_points.c                    |   0
 lib/mempool/meson.build                       |  23 +
 lib/{librte_mempool => mempool}/rte_mempool.c |   0
 lib/{librte_mempool => mempool}/rte_mempool.h |   0
 .../rte_mempool_ops.c                         |   0
 .../rte_mempool_ops_default.c                 |   0
 .../rte_mempool_trace.h                       |   0
 .../rte_mempool_trace_fp.h                    |   0
 lib/{librte_mempool => mempool}/version.map   |   0
 lib/meson.build                               | 431 ++++++-----
 lib/{librte_meter => meter}/meson.build       |   0
 lib/{librte_meter => meter}/rte_meter.c       |   0
 lib/{librte_meter => meter}/rte_meter.h       |   0
 lib/{librte_meter => meter}/version.map       |   0
 lib/{librte_metrics => metrics}/meson.build   |   4 +-
 lib/{librte_metrics => metrics}/rte_metrics.c |   0
 lib/{librte_metrics => metrics}/rte_metrics.h |   0
 .../rte_metrics_telemetry.c                   |   0
 .../rte_metrics_telemetry.h                   |   0
 lib/{librte_metrics => metrics}/version.map   |   0
 lib/net/meson.build                           | 121 +++
 lib/{librte_net => net}/net_crc.h             |   0
 lib/{librte_net => net}/net_crc_avx512.c      |   0
 lib/{librte_net => net}/net_crc_neon.c        |   0
 lib/{librte_net => net}/net_crc_sse.c         |   0
 lib/{librte_net => net}/rte_arp.c             |   0
 lib/{librte_net => net}/rte_arp.h             |   0
 lib/{librte_net => net}/rte_ecpri.h           |   0
 lib/{librte_net => net}/rte_esp.h             |   0
 lib/{librte_net => net}/rte_ether.c           |   0
 lib/{librte_net => net}/rte_ether.h           |   0
 lib/{librte_net => net}/rte_geneve.h          |   0
 lib/{librte_net => net}/rte_gre.h             |   0
 lib/{librte_net => net}/rte_gtp.h             |   0
 lib/{librte_net => net}/rte_higig.h           |   0
 lib/{librte_net => net}/rte_icmp.h            |   0
 lib/{librte_net => net}/rte_ip.h              |   0
 lib/{librte_net => net}/rte_mpls.h            |   0
 lib/{librte_net => net}/rte_net.c             |   0
 lib/{librte_net => net}/rte_net.h             |   0
 lib/{librte_net => net}/rte_net_crc.c         |   0
 lib/{librte_net => net}/rte_net_crc.h         |   0
 lib/{librte_net => net}/rte_sctp.h            |   0
 lib/{librte_net => net}/rte_tcp.h             |   0
 lib/{librte_net => net}/rte_udp.h             |   0
 lib/{librte_net => net}/rte_vxlan.h           |   0
 lib/{librte_net => net}/version.map           |   0
 lib/{librte_node => node}/ethdev_ctrl.c       |   0
 lib/{librte_node => node}/ethdev_rx.c         |   0
 lib/{librte_node => node}/ethdev_rx_priv.h    |   0
 lib/{librte_node => node}/ethdev_tx.c         |   0
 lib/{librte_node => node}/ethdev_tx_priv.h    |   0
 lib/{librte_node => node}/ip4_lookup.c        |   0
 lib/{librte_node => node}/ip4_lookup_neon.h   |   0
 lib/{librte_node => node}/ip4_lookup_sse.h    |   0
 lib/{librte_node => node}/ip4_rewrite.c       |   0
 lib/{librte_node => node}/ip4_rewrite_priv.h  |   0
 lib/{librte_node => node}/log.c               |   0
 lib/{librte_node => node}/meson.build         |  13 +-
 lib/{librte_node => node}/node_private.h      |   0
 lib/{librte_node => node}/null.c              |   0
 lib/{librte_node => node}/pkt_cls.c           |   0
 lib/{librte_node => node}/pkt_cls_priv.h      |   0
 lib/{librte_node => node}/pkt_drop.c          |   0
 lib/{librte_node => node}/rte_node_eth_api.h  |   0
 lib/{librte_node => node}/rte_node_ip4_api.h  |   0
 lib/{librte_node => node}/version.map         |   0
 lib/{librte_pci => pci}/meson.build           |   0
 lib/{librte_pci => pci}/rte_pci.c             |   0
 lib/{librte_pci => pci}/rte_pci.h             |   0
 lib/{librte_pci => pci}/version.map           |   0
 lib/{librte_pdump => pdump}/meson.build       |   0
 lib/{librte_pdump => pdump}/rte_pdump.c       |   0
 lib/{librte_pdump => pdump}/rte_pdump.h       |   0
 lib/{librte_pdump => pdump}/version.map       |   0
 lib/pipeline/meson.build                      |  20 +
 .../rte_pipeline.c                            |   0
 .../rte_pipeline.h                            |   0
 .../rte_port_in_action.c                      |   0
 .../rte_port_in_action.h                      |   0
 .../rte_swx_ctl.c                             |   0
 .../rte_swx_ctl.h                             |   0
 .../rte_swx_extern.h                          |   0
 .../rte_swx_pipeline.c                        |   0
 .../rte_swx_pipeline.h                        |   0
 .../rte_swx_pipeline_spec.c                   |   0
 .../rte_table_action.c                        |   0
 .../rte_table_action.h                        |   0
 lib/{librte_pipeline => pipeline}/version.map |   0
 lib/port/meson.build                          |  46 ++
 lib/{librte_port => port}/rte_port.h          |   0
 lib/{librte_port => port}/rte_port_ethdev.c   |   0
 lib/{librte_port => port}/rte_port_ethdev.h   |   0
 lib/{librte_port => port}/rte_port_eventdev.c |   0
 lib/{librte_port => port}/rte_port_eventdev.h |   0
 lib/{librte_port => port}/rte_port_fd.c       |   0
 lib/{librte_port => port}/rte_port_fd.h       |   0
 lib/{librte_port => port}/rte_port_frag.c     |   0
 lib/{librte_port => port}/rte_port_frag.h     |   0
 lib/{librte_port => port}/rte_port_kni.c      |   0
 lib/{librte_port => port}/rte_port_kni.h      |   0
 lib/{librte_port => port}/rte_port_ras.c      |   0
 lib/{librte_port => port}/rte_port_ras.h      |   0
 lib/{librte_port => port}/rte_port_ring.c     |   0
 lib/{librte_port => port}/rte_port_ring.h     |   0
 lib/{librte_port => port}/rte_port_sched.c    |   0
 lib/{librte_port => port}/rte_port_sched.h    |   0
 .../rte_port_source_sink.c                    |   0
 .../rte_port_source_sink.h                    |   0
 .../rte_port_sym_crypto.c                     |   0
 .../rte_port_sym_crypto.h                     |   0
 lib/{librte_port => port}/rte_swx_port.h      |   0
 .../rte_swx_port_ethdev.c                     |   0
 .../rte_swx_port_ethdev.h                     |   0
 lib/{librte_port => port}/rte_swx_port_fd.c   |   0
 lib/{librte_port => port}/rte_swx_port_fd.h   |   0
 lib/{librte_port => port}/rte_swx_port_ring.c |   0
 lib/{librte_port => port}/rte_swx_port_ring.h |   0
 .../rte_swx_port_source_sink.c                |   0
 .../rte_swx_port_source_sink.h                |   0
 lib/{librte_port => port}/version.map         |   0
 lib/{librte_power => power}/guest_channel.c   |   0
 lib/{librte_power => power}/guest_channel.h   |   0
 lib/power/meson.build                         |  24 +
 .../power_acpi_cpufreq.c                      |   0
 .../power_acpi_cpufreq.h                      |   0
 lib/{librte_power => power}/power_common.c    |   0
 lib/{librte_power => power}/power_common.h    |   0
 lib/{librte_power => power}/power_kvm_vm.c    |   0
 lib/{librte_power => power}/power_kvm_vm.h    |   0
 .../power_pstate_cpufreq.c                    |   0
 .../power_pstate_cpufreq.h                    |   0
 lib/{librte_power => power}/rte_power.c       |   0
 lib/{librte_power => power}/rte_power.h       |   0
 .../rte_power_empty_poll.c                    |   0
 .../rte_power_empty_poll.h                    |   0
 .../rte_power_guest_channel.h                 |   0
 .../rte_power_pmd_mgmt.c                      |   0
 .../rte_power_pmd_mgmt.h                      |   0
 lib/{librte_power => power}/version.map       |   0
 lib/{librte_rawdev => rawdev}/meson.build     |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.c    |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.h    |   0
 .../rte_rawdev_pmd.h                          |   0
 lib/{librte_rawdev => rawdev}/version.map     |   0
 lib/{librte_rcu => rcu}/meson.build           |   0
 lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.c        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.h        |   0
 lib/{librte_rcu => rcu}/version.map           |   0
 lib/{librte_regexdev => regexdev}/meson.build |   3 +-
 .../rte_regexdev.c                            |   0
 .../rte_regexdev.h                            |   0
 .../rte_regexdev_core.h                       |   0
 .../rte_regexdev_driver.h                     |   0
 lib/{librte_regexdev => regexdev}/version.map |   0
 lib/{librte_reorder => reorder}/meson.build   |   0
 lib/{librte_reorder => reorder}/rte_reorder.c |   0
 lib/{librte_reorder => reorder}/rte_reorder.h |   0
 lib/{librte_reorder => reorder}/version.map   |   0
 lib/{librte_rib => rib}/meson.build           |   0
 lib/{librte_rib => rib}/rte_rib.c             |   0
 lib/{librte_rib => rib}/rte_rib.h             |   0
 lib/{librte_rib => rib}/rte_rib6.c            |   0
 lib/{librte_rib => rib}/rte_rib6.h            |   0
 lib/{librte_rib => rib}/version.map           |   0
 lib/ring/meson.build                          |  20 +
 lib/{librte_ring => ring}/rte_ring.c          |   0
 lib/{librte_ring => ring}/rte_ring.h          |   0
 lib/{librte_ring => ring}/rte_ring_c11_pvt.h  |   0
 lib/{librte_ring => ring}/rte_ring_core.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem_pvt.h |   0
 .../rte_ring_generic_pvt.h                    |   0
 lib/{librte_ring => ring}/rte_ring_hts.h      |   0
 .../rte_ring_hts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/rte_ring_peek.h     |   0
 .../rte_ring_peek_elem_pvt.h                  |   0
 lib/{librte_ring => ring}/rte_ring_peek_zc.h  |   0
 lib/{librte_ring => ring}/rte_ring_rts.h      |   0
 .../rte_ring_rts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/version.map         |   0
 lib/{librte_sched => sched}/meson.build       |   8 +-
 lib/{librte_sched => sched}/rte_approx.c      |   0
 lib/{librte_sched => sched}/rte_approx.h      |   0
 lib/{librte_sched => sched}/rte_red.c         |   0
 lib/{librte_sched => sched}/rte_red.h         |   0
 lib/{librte_sched => sched}/rte_sched.c       |   0
 lib/{librte_sched => sched}/rte_sched.h       |   0
 .../rte_sched_common.h                        |   0
 lib/{librte_sched => sched}/version.map       |   0
 lib/{librte_security => security}/meson.build |   0
 .../rte_security.c                            |   0
 .../rte_security.h                            |   0
 .../rte_security_driver.h                     |   0
 lib/{librte_security => security}/version.map |   0
 lib/{librte_stack => stack}/meson.build       |   9 +-
 lib/{librte_stack => stack}/rte_stack.c       |   0
 lib/{librte_stack => stack}/rte_stack.h       |   0
 lib/{librte_stack => stack}/rte_stack_lf.c    |   0
 lib/{librte_stack => stack}/rte_stack_lf.h    |   0
 .../rte_stack_lf_c11.h                        |   0
 .../rte_stack_lf_generic.h                    |   0
 .../rte_stack_lf_stubs.h                      |   0
 lib/{librte_stack => stack}/rte_stack_std.c   |   0
 lib/{librte_stack => stack}/rte_stack_std.h   |   0
 lib/{librte_stack => stack}/stack_pvt.h       |   0
 lib/{librte_stack => stack}/version.map       |   0
 lib/table/meson.build                         |  40 +
 lib/{librte_table => table}/rte_lru.h         |   0
 lib/{librte_table => table}/rte_lru_arm64.h   |   0
 lib/{librte_table => table}/rte_lru_x86.h     |   0
 lib/{librte_table => table}/rte_swx_table.h   |   0
 .../rte_swx_table_em.c                        |   0
 .../rte_swx_table_em.h                        |   0
 .../rte_swx_table_wm.c                        |   0
 .../rte_swx_table_wm.h                        |   0
 lib/{librte_table => table}/rte_table.h       |   0
 lib/{librte_table => table}/rte_table_acl.c   |   0
 lib/{librte_table => table}/rte_table_acl.h   |   0
 lib/{librte_table => table}/rte_table_array.c |   0
 lib/{librte_table => table}/rte_table_array.h |   0
 lib/{librte_table => table}/rte_table_hash.h  |   0
 .../rte_table_hash_cuckoo.c                   |   0
 .../rte_table_hash_cuckoo.h                   |   0
 .../rte_table_hash_ext.c                      |   0
 .../rte_table_hash_func.h                     |   0
 .../rte_table_hash_func_arm64.h               |   0
 .../rte_table_hash_key16.c                    |   0
 .../rte_table_hash_key32.c                    |   0
 .../rte_table_hash_key8.c                     |   0
 .../rte_table_hash_lru.c                      |   0
 lib/{librte_table => table}/rte_table_lpm.c   |   0
 lib/{librte_table => table}/rte_table_lpm.h   |   0
 .../rte_table_lpm_ipv6.c                      |   0
 .../rte_table_lpm_ipv6.h                      |   0
 lib/{librte_table => table}/rte_table_stub.c  |   0
 lib/{librte_table => table}/rte_table_stub.h  |   0
 lib/{librte_table => table}/version.map       |   0
 .../meson.build                               |   2 +-
 .../rte_telemetry.h                           |   0
 .../telemetry.c                               |   0
 .../telemetry_data.c                          |   0
 .../telemetry_data.h                          |   0
 .../telemetry_internal.h                      |   0
 .../telemetry_json.h                          |   0
 .../telemetry_legacy.c                        |   0
 .../version.map                               |   0
 lib/{librte_timer => timer}/meson.build       |   0
 lib/{librte_timer => timer}/rte_timer.c       |   0
 lib/{librte_timer => timer}/rte_timer.h       |   0
 lib/{librte_timer => timer}/version.map       |   0
 lib/{librte_vhost => vhost}/fd_man.c          |   0
 lib/{librte_vhost => vhost}/fd_man.h          |   0
 lib/{librte_vhost => vhost}/iotlb.c           |   0
 lib/{librte_vhost => vhost}/iotlb.h           |   0
 lib/vhost/meson.build                         |  37 +
 lib/{librte_vhost => vhost}/rte_vdpa.h        |   0
 lib/{librte_vhost => vhost}/rte_vdpa_dev.h    |   0
 lib/{librte_vhost => vhost}/rte_vhost.h       |   0
 lib/{librte_vhost => vhost}/rte_vhost_async.h |   0
 .../rte_vhost_crypto.h                        |   0
 lib/{librte_vhost => vhost}/socket.c          |   0
 lib/{librte_vhost => vhost}/vdpa.c            |   0
 lib/{librte_vhost => vhost}/version.map       |   0
 lib/{librte_vhost => vhost}/vhost.c           |   0
 lib/{librte_vhost => vhost}/vhost.h           |   0
 lib/{librte_vhost => vhost}/vhost_crypto.c    |   0
 lib/{librte_vhost => vhost}/vhost_user.c      |   0
 lib/{librte_vhost => vhost}/vhost_user.h      |   0
 lib/{librte_vhost => vhost}/virtio_crypto.h   |   0
 lib/{librte_vhost => vhost}/virtio_net.c      |   0
 license/exceptions.txt                        |   6 +-
 meson.build                                   |  94 +--
 meson_options.txt                             |  86 +--
 usertools/meson.build                         |  11 +-
 1125 files changed, 5263 insertions(+), 4890 deletions(-)
 create mode 100755 devtools/update_patches.py
 rename lib/{librte_acl => acl}/acl.h (100%)
 rename lib/{librte_acl => acl}/acl_bld.c (100%)
 rename lib/{librte_acl => acl}/acl_gen.c (100%)
 rename lib/{librte_acl => acl}/acl_run.h (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.c (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512_common.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x16.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x8.h (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.c (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.h (100%)
 rename lib/{librte_acl => acl}/acl_run_scalar.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.h (100%)
 rename lib/{librte_acl => acl}/acl_vect.h (100%)
 create mode 100644 lib/acl/meson.build
 rename lib/{librte_acl => acl}/rte_acl.c (100%)
 rename lib/{librte_acl => acl}/rte_acl.h (100%)
 rename lib/{librte_acl => acl}/rte_acl_osdep.h (100%)
 rename lib/{librte_acl => acl}/tb_mem.c (100%)
 rename lib/{librte_acl => acl}/tb_mem.h (100%)
 rename lib/{librte_acl => acl}/version.map (100%)
 rename lib/{librte_bbdev => bbdev}/meson.build (74%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.c (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_op.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h (100%)
 rename lib/{librte_bbdev => bbdev}/version.map (100%)
 rename lib/{librte_bitratestats => bitratestats}/meson.build (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.c (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.h (100%)
 rename lib/{librte_bitratestats => bitratestats}/version.map (100%)
 rename lib/{librte_bpf => bpf}/bpf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_def.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_exec.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_impl.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_arm64.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_x86.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load_elf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_pkt.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_validate.c (100%)
 rename lib/{librte_bpf => bpf}/meson.build (52%)
 rename lib/{librte_bpf => bpf}/rte_bpf.h (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf_ethdev.h (100%)
 rename lib/{librte_bpf => bpf}/version.map (100%)
 rename lib/{librte_cfgfile => cfgfile}/meson.build (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h (100%)
 rename lib/{librte_cfgfile => cfgfile}/version.map (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_unix.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_windows.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_private.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.h (100%)
 create mode 100644 lib/cmdline/meson.build
 rename lib/{librte_cmdline => cmdline}/version.map (100%)
 rename lib/{librte_compressdev => compressdev}/meson.build (58%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_internal.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.h (100%)
 rename lib/{librte_compressdev => compressdev}/version.map (100%)
 rename lib/{librte_cryptodev => cryptodev}/cryptodev_trace_points.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/meson.build (56%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_asym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_sym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace_fp.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/version.map (100%)
 rename lib/{librte_distributor => distributor}/distributor_private.h (100%)
 rename lib/{librte_distributor => distributor}/meson.build (68%)
 rename lib/{librte_distributor => distributor}/rte_distributor.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.h (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_generic.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_sse.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.h (100%)
 rename lib/{librte_distributor => distributor}/version.map (100%)
 create mode 100644 lib/eal/arm/include/meson.build
 rename lib/{librte_eal => eal}/arm/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/arm/meson.build (51%)
 rename lib/{librte_eal => eal}/arm/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_bus.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_class.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_config.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_debug.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dev.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_devargs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dynmem.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_errno.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_fbarray.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hexdump.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_launch.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_lcore.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_log.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_mcfg.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memalloc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memory.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memzone.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_options.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_proc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_string_fns.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_tailqs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_thread.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_timer.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_ctf.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_points.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_utils.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_uuid.c (100%)
 rename lib/{librte_eal => eal}/common/eal_filesystem.h (100%)
 rename lib/{librte_eal => eal}/common/eal_hugepages.h (100%)
 rename lib/{librte_eal => eal}/common/eal_internal_cfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_log.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memalloc.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memcfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_options.h (100%)
 rename lib/{librte_eal => eal}/common/eal_private.h (100%)
 rename lib/{librte_eal => eal}/common/eal_thread.h (100%)
 rename lib/{librte_eal => eal}/common/eal_trace.h (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.c (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.h (100%)
 create mode 100644 lib/eal/common/meson.build
 rename lib/{librte_eal => eal}/common/rte_keepalive.c (100%)
 rename lib/{librte_eal => eal}/common/rte_malloc.c (100%)
 rename lib/{librte_eal => eal}/common/rte_random.c (100%)
 rename lib/{librte_eal => eal}/common/rte_reciprocal.c (100%)
 rename lib/{librte_eal => eal}/common/rte_service.c (100%)
 rename lib/{librte_eal => eal}/common/rte_version.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm_private.h (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/freebsd/include/meson.build (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os_shim.h (100%)
 create mode 100644 lib/eal/freebsd/meson.build
 rename lib/{librte_eal => eal}/include/generic/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_io.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_vect.h (100%)
 create mode 100644 lib/eal/include/meson.build
 rename lib/{librte_eal => eal}/include/rte_alarm.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitmap.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitops.h (100%)
 rename lib/{librte_eal => eal}/include/rte_branch_prediction.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bus.h (100%)
 rename lib/{librte_eal => eal}/include/rte_class.h (100%)
 rename lib/{librte_eal => eal}/include/rte_common.h (100%)
 rename lib/{librte_eal => eal}/include/rte_compat.h (100%)
 rename lib/{librte_eal => eal}/include/rte_debug.h (100%)
 rename lib/{librte_eal => eal}/include/rte_dev.h (100%)
 rename lib/{librte_eal => eal}/include/rte_devargs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_memconfig.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_paging.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_errno.h (100%)
 rename lib/{librte_eal => eal}/include/rte_fbarray.h (100%)
 rename lib/{librte_eal => eal}/include/rte_function_versioning.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hexdump.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hypervisor.h (100%)
 rename lib/{librte_eal => eal}/include/rte_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_keepalive.h (100%)
 rename lib/{librte_eal => eal}/include/rte_launch.h (100%)
 rename lib/{librte_eal => eal}/include/rte_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_log.h (100%)
 rename lib/{librte_eal => eal}/include/rte_malloc.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memory.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memzone.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_feature_defs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_features.h (100%)
 rename lib/{librte_eal => eal}/include/rte_per_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_random.h (100%)
 rename lib/{librte_eal => eal}/include/rte_reciprocal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service_component.h (100%)
 rename lib/{librte_eal => eal}/include/rte_string_fns.h (100%)
 rename lib/{librte_eal => eal}/include/rte_tailq.h (100%)
 rename lib/{librte_eal => eal}/include/rte_test.h (100%)
 rename lib/{librte_eal => eal}/include/rte_thread.h (100%)
 rename lib/{librte_eal => eal}/include/rte_time.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point_register.h (100%)
 rename lib/{librte_eal => eal}/include/rte_uuid.h (100%)
 rename lib/{librte_eal => eal}/include/rte_version.h (100%)
 rename lib/{librte_eal => eal}/include/rte_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_log.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio_mp_sync.c (100%)
 rename lib/{librte_eal => eal}/linux/include/meson.build (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os_shim.h (100%)
 create mode 100644 lib/eal/linux/meson.build
 rename lib/{librte_eal => eal}/meson.build (78%)
 create mode 100644 lib/eal/ppc/include/meson.build
 rename lib/{librte_eal => eal}/ppc/include/rte_altivec.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/ppc/meson.build (54%)
 rename lib/{librte_eal => eal}/ppc/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_file.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_memory.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_timer.c (100%)
 create mode 100644 lib/eal/unix/meson.build
 rename lib/{librte_eal => eal}/unix/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/version.map (100%)
 rename lib/{librte_eal => eal}/windows/eal.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_file.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_hugepages.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_log.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_mp.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/fnmatch.c (100%)
 rename lib/{librte_eal => eal}/windows/getopt.c (100%)
 rename lib/{librte_eal => eal}/windows/include/dirent.h (100%)
 rename lib/{librte_eal => eal}/windows/include/fnmatch.h (100%)
 rename lib/{librte_eal => eal}/windows/include/getopt.h (100%)
 rename lib/{librte_eal => eal}/windows/include/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/include/pthread.h (100%)
 rename lib/{librte_eal => eal}/windows/include/regex.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_virt2phys.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sched.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/queue.h (100%)
 rename lib/{librte_eal => eal}/windows/include/unistd.h (100%)
 create mode 100644 lib/eal/windows/meson.build
 rename lib/{librte_eal => eal}/windows/rte_thread.c (100%)
 create mode 100644 lib/eal/x86/include/meson.build
 rename lib/{librte_eal => eal}/x86/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rtm.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_vect.h (100%)
 create mode 100644 lib/eal/x86/meson.build
 rename lib/{librte_eal => eal}/x86/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuid.h (100%)
 rename lib/{librte_eal => eal}/x86/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_spinlock.c (100%)
 rename lib/{librte_efd => efd}/meson.build (100%)
 rename lib/{librte_efd => efd}/rte_efd.c (100%)
 rename lib/{librte_efd => efd}/rte_efd.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_arm64.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_x86.h (100%)
 rename lib/{librte_efd => efd}/version.map (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_pci.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_trace_points.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_vdev.h (100%)
 create mode 100644 lib/ethdev/meson.build
 rename lib/{librte_ethdev => ethdev}/rte_class_eth.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_dev_info.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_core.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace_fp.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/version.map (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_pci.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_vdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_trace_points.c (100%)
 create mode 100644 lib/eventdev/meson.build
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace_fp.h (100%)
 rename lib/{librte_eventdev => eventdev}/version.map (100%)
 rename lib/{librte_fib => fib}/dir24_8.c (100%)
 rename lib/{librte_fib => fib}/dir24_8.h (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.c (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.h (100%)
 create mode 100644 lib/fib/meson.build
 rename lib/{librte_fib => fib}/rte_fib.c (100%)
 rename lib/{librte_fib => fib}/rte_fib.h (100%)
 rename lib/{librte_fib => fib}/rte_fib6.c (100%)
 rename lib/{librte_fib => fib}/rte_fib6.h (100%)
 rename lib/{librte_fib => fib}/trie.c (100%)
 rename lib/{librte_fib => fib}/trie.h (100%)
 rename lib/{librte_fib => fib}/trie_avx512.c (100%)
 rename lib/{librte_fib => fib}/trie_avx512.h (100%)
 rename lib/{librte_fib => fib}/version.map (100%)
 rename lib/{librte_flow_classify => flow_classify}/meson.build (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/version.map (100%)
 rename lib/{librte_graph => graph}/graph.c (100%)
 rename lib/{librte_graph => graph}/graph_debug.c (100%)
 rename lib/{librte_graph => graph}/graph_ops.c (100%)
 rename lib/{librte_graph => graph}/graph_populate.c (100%)
 rename lib/{librte_graph => graph}/graph_private.h (100%)
 rename lib/{librte_graph => graph}/graph_stats.c (100%)
 rename lib/{librte_graph => graph}/meson.build (50%)
 rename lib/{librte_graph => graph}/node.c (100%)
 rename lib/{librte_graph => graph}/rte_graph.h (100%)
 rename lib/{librte_graph => graph}/rte_graph_worker.h (100%)
 rename lib/{librte_graph => graph}/version.map (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_udp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.h (100%)
 create mode 100644 lib/gro/meson.build
 rename lib/{librte_gro => gro}/rte_gro.c (100%)
 rename lib/{librte_gro => gro}/rte_gro.h (100%)
 rename lib/{librte_gro => gro}/version.map (100%)
 rename lib/{librte_gso => gso}/gso_common.c (100%)
 rename lib/{librte_gso => gso}/gso_common.h (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.h (100%)
 rename lib/{librte_gso => gso}/gso_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_udp4.h (100%)
 create mode 100644 lib/gso/meson.build
 rename lib/{librte_gso => gso}/rte_gso.c (100%)
 rename lib/{librte_gso => gso}/rte_gso.h (100%)
 rename lib/{librte_gso => gso}/version.map (100%)
 rename lib/{librte_hash => hash}/meson.build (60%)
 rename lib/{librte_hash => hash}/rte_cmp_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cmp_x86.h (100%)
 rename lib/{librte_hash => hash}/rte_crc_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash_crc.h (100%)
 rename lib/{librte_hash => hash}/rte_jhash.h (100%)
 rename lib/{librte_hash => hash}/rte_thash.h (100%)
 rename lib/{librte_hash => hash}/version.map (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_common.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_internal.c (100%)
 create mode 100644 lib/ip_frag/meson.build
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag_common.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/version.map (100%)
 rename lib/{librte_ipsec => ipsec}/crypto.h (100%)
 rename lib/{librte_ipsec => ipsec}/esp_inb.c (100%)
 rename lib/{librte_ipsec => ipsec}/esp_outb.c (100%)
 rename lib/{librte_ipsec => ipsec}/iph.h (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sad.c (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sqn.h (100%)
 rename lib/{librte_ipsec => ipsec}/meson.build (100%)
 rename lib/{librte_ipsec => ipsec}/misc.h (100%)
 rename lib/{librte_ipsec => ipsec}/pad.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_group.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h (100%)
 rename lib/{librte_ipsec => ipsec}/sa.c (100%)
 rename lib/{librte_ipsec => ipsec}/sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/ses.c (100%)
 rename lib/{librte_ipsec => ipsec}/version.map (100%)
 rename lib/{librte_jobstats => jobstats}/meson.build (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.c (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.h (100%)
 rename lib/{librte_jobstats => jobstats}/version.map (100%)
 rename lib/{librte_kni => kni}/meson.build (79%)
 rename lib/{librte_kni => kni}/rte_kni.c (100%)
 rename lib/{librte_kni => kni}/rte_kni.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_common.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_fifo.h (100%)
 rename lib/{librte_kni => kni}/version.map (100%)
 rename lib/{librte_kvargs => kvargs}/meson.build (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.c (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.h (100%)
 rename lib/{librte_kvargs => kvargs}/version.map (100%)
 rename lib/{librte_latencystats => latencystats}/meson.build (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.c (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.h (100%)
 rename lib/{librte_latencystats => latencystats}/version.map (100%)
 delete mode 100644 lib/librte_acl/meson.build
 delete mode 100644 lib/librte_cmdline/meson.build
 delete mode 100644 lib/librte_eal/arm/include/meson.build
 delete mode 100644 lib/librte_eal/common/meson.build
 delete mode 100644 lib/librte_eal/freebsd/meson.build
 delete mode 100644 lib/librte_eal/include/meson.build
 delete mode 100644 lib/librte_eal/linux/meson.build
 delete mode 100644 lib/librte_eal/ppc/include/meson.build
 delete mode 100644 lib/librte_eal/unix/meson.build
 delete mode 100644 lib/librte_eal/windows/meson.build
 delete mode 100644 lib/librte_eal/x86/include/meson.build
 delete mode 100644 lib/librte_eal/x86/meson.build
 delete mode 100644 lib/librte_ethdev/meson.build
 delete mode 100644 lib/librte_eventdev/meson.build
 delete mode 100644 lib/librte_fib/meson.build
 delete mode 100644 lib/librte_gro/meson.build
 delete mode 100644 lib/librte_gso/meson.build
 delete mode 100644 lib/librte_ip_frag/meson.build
 delete mode 100644 lib/librte_mbuf/meson.build
 delete mode 100644 lib/librte_mempool/meson.build
 delete mode 100644 lib/librte_net/meson.build
 delete mode 100644 lib/librte_pipeline/meson.build
 delete mode 100644 lib/librte_port/meson.build
 delete mode 100644 lib/librte_power/meson.build
 delete mode 100644 lib/librte_ring/meson.build
 delete mode 100644 lib/librte_table/meson.build
 delete mode 100644 lib/librte_vhost/meson.build
 rename lib/{librte_lpm => lpm}/meson.build (71%)
 rename lib/{librte_lpm => lpm}/rte_lpm.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_altivec.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_neon.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sse.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sve.h (100%)
 rename lib/{librte_lpm => lpm}/version.map (100%)
 create mode 100644 lib/mbuf/meson.build
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_core.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h (100%)
 rename lib/{librte_mbuf => mbuf}/version.map (100%)
 rename lib/{librte_member => member}/meson.build (100%)
 rename lib/{librte_member => member}/rte_member.c (100%)
 rename lib/{librte_member => member}/rte_member.h (100%)
 rename lib/{librte_member => member}/rte_member_ht.c (100%)
 rename lib/{librte_member => member}/rte_member_ht.h (100%)
 rename lib/{librte_member => member}/rte_member_vbf.c (100%)
 rename lib/{librte_member => member}/rte_member_vbf.h (100%)
 rename lib/{librte_member => member}/rte_member_x86.h (100%)
 rename lib/{librte_member => member}/version.map (100%)
 rename lib/{librte_mempool => mempool}/mempool_trace_points.c (100%)
 create mode 100644 lib/mempool/meson.build
 rename lib/{librte_mempool => mempool}/rte_mempool.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops_default.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace_fp.h (100%)
 rename lib/{librte_mempool => mempool}/version.map (100%)
 rename lib/{librte_meter => meter}/meson.build (100%)
 rename lib/{librte_meter => meter}/rte_meter.c (100%)
 rename lib/{librte_meter => meter}/rte_meter.h (100%)
 rename lib/{librte_meter => meter}/version.map (100%)
 rename lib/{librte_metrics => metrics}/meson.build (83%)
 rename lib/{librte_metrics => metrics}/rte_metrics.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.h (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.h (100%)
 rename lib/{librte_metrics => metrics}/version.map (100%)
 create mode 100644 lib/net/meson.build
 rename lib/{librte_net => net}/net_crc.h (100%)
 rename lib/{librte_net => net}/net_crc_avx512.c (100%)
 rename lib/{librte_net => net}/net_crc_neon.c (100%)
 rename lib/{librte_net => net}/net_crc_sse.c (100%)
 rename lib/{librte_net => net}/rte_arp.c (100%)
 rename lib/{librte_net => net}/rte_arp.h (100%)
 rename lib/{librte_net => net}/rte_ecpri.h (100%)
 rename lib/{librte_net => net}/rte_esp.h (100%)
 rename lib/{librte_net => net}/rte_ether.c (100%)
 rename lib/{librte_net => net}/rte_ether.h (100%)
 rename lib/{librte_net => net}/rte_geneve.h (100%)
 rename lib/{librte_net => net}/rte_gre.h (100%)
 rename lib/{librte_net => net}/rte_gtp.h (100%)
 rename lib/{librte_net => net}/rte_higig.h (100%)
 rename lib/{librte_net => net}/rte_icmp.h (100%)
 rename lib/{librte_net => net}/rte_ip.h (100%)
 rename lib/{librte_net => net}/rte_mpls.h (100%)
 rename lib/{librte_net => net}/rte_net.c (100%)
 rename lib/{librte_net => net}/rte_net.h (100%)
 rename lib/{librte_net => net}/rte_net_crc.c (100%)
 rename lib/{librte_net => net}/rte_net_crc.h (100%)
 rename lib/{librte_net => net}/rte_sctp.h (100%)
 rename lib/{librte_net => net}/rte_tcp.h (100%)
 rename lib/{librte_net => net}/rte_udp.h (100%)
 rename lib/{librte_net => net}/rte_vxlan.h (100%)
 rename lib/{librte_net => net}/version.map (100%)
 rename lib/{librte_node => node}/ethdev_ctrl.c (100%)
 rename lib/{librte_node => node}/ethdev_rx.c (100%)
 rename lib/{librte_node => node}/ethdev_rx_priv.h (100%)
 rename lib/{librte_node => node}/ethdev_tx.c (100%)
 rename lib/{librte_node => node}/ethdev_tx_priv.h (100%)
 rename lib/{librte_node => node}/ip4_lookup.c (100%)
 rename lib/{librte_node => node}/ip4_lookup_neon.h (100%)
 rename lib/{librte_node => node}/ip4_lookup_sse.h (100%)
 rename lib/{librte_node => node}/ip4_rewrite.c (100%)
 rename lib/{librte_node => node}/ip4_rewrite_priv.h (100%)
 rename lib/{librte_node => node}/log.c (100%)
 rename lib/{librte_node => node}/meson.build (59%)
 rename lib/{librte_node => node}/node_private.h (100%)
 rename lib/{librte_node => node}/null.c (100%)
 rename lib/{librte_node => node}/pkt_cls.c (100%)
 rename lib/{librte_node => node}/pkt_cls_priv.h (100%)
 rename lib/{librte_node => node}/pkt_drop.c (100%)
 rename lib/{librte_node => node}/rte_node_eth_api.h (100%)
 rename lib/{librte_node => node}/rte_node_ip4_api.h (100%)
 rename lib/{librte_node => node}/version.map (100%)
 rename lib/{librte_pci => pci}/meson.build (100%)
 rename lib/{librte_pci => pci}/rte_pci.c (100%)
 rename lib/{librte_pci => pci}/rte_pci.h (100%)
 rename lib/{librte_pci => pci}/version.map (100%)
 rename lib/{librte_pdump => pdump}/meson.build (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.c (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.h (100%)
 rename lib/{librte_pdump => pdump}/version.map (100%)
 create mode 100644 lib/pipeline/meson.build
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_extern.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline_spec.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/version.map (100%)
 create mode 100644 lib/port/meson.build
 rename lib/{librte_port => port}/rte_port.h (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.c (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.h (100%)
 rename lib/{librte_port => port}/rte_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_port_frag.c (100%)
 rename lib/{librte_port => port}/rte_port_frag.h (100%)
 rename lib/{librte_port => port}/rte_port_kni.c (100%)
 rename lib/{librte_port => port}/rte_port_kni.h (100%)
 rename lib/{librte_port => port}/rte_port_ras.c (100%)
 rename lib/{librte_port => port}/rte_port_ras.h (100%)
 rename lib/{librte_port => port}/rte_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_port_sched.c (100%)
 rename lib/{librte_port => port}/rte_port_sched.h (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.h (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.c (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.h (100%)
 rename lib/{librte_port => port}/rte_swx_port.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.h (100%)
 rename lib/{librte_port => port}/version.map (100%)
 rename lib/{librte_power => power}/guest_channel.c (100%)
 rename lib/{librte_power => power}/guest_channel.h (100%)
 create mode 100644 lib/power/meson.build
 rename lib/{librte_power => power}/power_acpi_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.h (100%)
 rename lib/{librte_power => power}/power_common.c (100%)
 rename lib/{librte_power => power}/power_common.h (100%)
 rename lib/{librte_power => power}/power_kvm_vm.c (100%)
 rename lib/{librte_power => power}/power_kvm_vm.h (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.h (100%)
 rename lib/{librte_power => power}/rte_power.c (100%)
 rename lib/{librte_power => power}/rte_power.h (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.c (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.h (100%)
 rename lib/{librte_power => power}/rte_power_guest_channel.h (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.c (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.h (100%)
 rename lib/{librte_power => power}/version.map (100%)
 rename lib/{librte_rawdev => rawdev}/meson.build (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.c (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.h (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev_pmd.h (100%)
 rename lib/{librte_rawdev => rawdev}/version.map (100%)
 rename lib/{librte_rcu => rcu}/meson.build (100%)
 rename lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.c (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.h (100%)
 rename lib/{librte_rcu => rcu}/version.map (100%)
 rename lib/{librte_regexdev => regexdev}/meson.build (75%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.c (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_core.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_driver.h (100%)
 rename lib/{librte_regexdev => regexdev}/version.map (100%)
 rename lib/{librte_reorder => reorder}/meson.build (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.c (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.h (100%)
 rename lib/{librte_reorder => reorder}/version.map (100%)
 rename lib/{librte_rib => rib}/meson.build (100%)
 rename lib/{librte_rib => rib}/rte_rib.c (100%)
 rename lib/{librte_rib => rib}/rte_rib.h (100%)
 rename lib/{librte_rib => rib}/rte_rib6.c (100%)
 rename lib/{librte_rib => rib}/rte_rib6.h (100%)
 rename lib/{librte_rib => rib}/version.map (100%)
 create mode 100644 lib/ring/meson.build
 rename lib/{librte_ring => ring}/rte_ring.c (100%)
 rename lib/{librte_ring => ring}/rte_ring.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_c11_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_core.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_generic_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_zc.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/version.map (100%)
 rename lib/{librte_sched => sched}/meson.build (58%)
 rename lib/{librte_sched => sched}/rte_approx.c (100%)
 rename lib/{librte_sched => sched}/rte_approx.h (100%)
 rename lib/{librte_sched => sched}/rte_red.c (100%)
 rename lib/{librte_sched => sched}/rte_red.h (100%)
 rename lib/{librte_sched => sched}/rte_sched.c (100%)
 rename lib/{librte_sched => sched}/rte_sched.h (100%)
 rename lib/{librte_sched => sched}/rte_sched_common.h (100%)
 rename lib/{librte_sched => sched}/version.map (100%)
 rename lib/{librte_security => security}/meson.build (100%)
 rename lib/{librte_security => security}/rte_security.c (100%)
 rename lib/{librte_security => security}/rte_security.h (100%)
 rename lib/{librte_security => security}/rte_security_driver.h (100%)
 rename lib/{librte_security => security}/version.map (100%)
 rename lib/{librte_stack => stack}/meson.build (67%)
 rename lib/{librte_stack => stack}/rte_stack.c (100%)
 rename lib/{librte_stack => stack}/rte_stack.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_c11.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_generic.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_stubs.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.h (100%)
 rename lib/{librte_stack => stack}/stack_pvt.h (100%)
 rename lib/{librte_stack => stack}/version.map (100%)
 create mode 100644 lib/table/meson.build
 rename lib/{librte_table => table}/rte_lru.h (100%)
 rename lib/{librte_table => table}/rte_lru_arm64.h (100%)
 rename lib/{librte_table => table}/rte_lru_x86.h (100%)
 rename lib/{librte_table => table}/rte_swx_table.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.h (100%)
 rename lib/{librte_table => table}/rte_table.h (100%)
 rename lib/{librte_table => table}/rte_table_acl.c (100%)
 rename lib/{librte_table => table}/rte_table_acl.h (100%)
 rename lib/{librte_table => table}/rte_table_array.c (100%)
 rename lib/{librte_table => table}/rte_table_array.h (100%)
 rename lib/{librte_table => table}/rte_table_hash.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_ext.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_func.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_func_arm64.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_key16.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key32.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key8.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_lru.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.h (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.h (100%)
 rename lib/{librte_table => table}/rte_table_stub.c (100%)
 rename lib/{librte_table => table}/rte_table_stub.h (100%)
 rename lib/{librte_table => table}/version.map (100%)
 rename lib/{librte_telemetry => telemetry}/meson.build (80%)
 rename lib/{librte_telemetry => telemetry}/rte_telemetry.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_internal.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_json.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_legacy.c (100%)
 rename lib/{librte_telemetry => telemetry}/version.map (100%)
 rename lib/{librte_timer => timer}/meson.build (100%)
 rename lib/{librte_timer => timer}/rte_timer.c (100%)
 rename lib/{librte_timer => timer}/rte_timer.h (100%)
 rename lib/{librte_timer => timer}/version.map (100%)
 rename lib/{librte_vhost => vhost}/fd_man.c (100%)
 rename lib/{librte_vhost => vhost}/fd_man.h (100%)
 rename lib/{librte_vhost => vhost}/iotlb.c (100%)
 rename lib/{librte_vhost => vhost}/iotlb.h (100%)
 create mode 100644 lib/vhost/meson.build
 rename lib/{librte_vhost => vhost}/rte_vdpa.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa_dev.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_async.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/socket.c (100%)
 rename lib/{librte_vhost => vhost}/vdpa.c (100%)
 rename lib/{librte_vhost => vhost}/version.map (100%)
 rename lib/{librte_vhost => vhost}/vhost.c (100%)
 rename lib/{librte_vhost => vhost}/vhost.h (100%)
 rename lib/{librte_vhost => vhost}/vhost_crypto.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_net.c (100%)

--
2.27.0

[dpdk-dev] [PATCH v2 01/16] build: simplify library build file

[Bruce Richardson]

Two simplifications can be made to the build file which reduce indentation
levels and make it easier to read:

1. When meson build support was first added, the compat library existed in
DPDK as a single header file. Since that header has been merged into EAL,
we no longer need to support header-only libraries, so can shorten the
code.

2. From meson 0.49 onwards we have the "continue" keyword available to
break out of one loop iteration and begin the next. This allows us to
remove blocks in the build configuration file which were conditional on the
"build" variable being true. Instead we can use "continue" to abort
processing at the point where the "build" value becomes false.

Since this patch changes the indentation level of large parts of the
meson.build file, we use the opportunity to adjust the whitespace used to
the meson-standard 4-spec indentation level.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build | 303 +++++++++++++++++++++++-------------------------
 1 file changed, 147 insertions(+), 156 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 4eed83e57c..95fcd01896 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -54,165 +54,156 @@ 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
 
 enabled_libs = [] # used to print summary at the end
 
 foreach l:libraries
-	build = true
-	reason = '<unknown reason>' # set if build == false to explain why
-	name = l
-	use_function_versioning = false
-	sources = []
-	headers = []
-	indirect_headers = [] # public headers not directly included by apps
-	driver_sdk_headers = [] # public headers included by drivers
-	includes = []
-	cflags = default_cflags
-	objs = [] # other object files to link against, used e.g. for
-	          # instruction-set optimized versions of code
-
-	# use "deps" for internal DPDK dependencies, and "ext_deps" for
-	# external package/library requirements
-	ext_deps = []
-	deps = []
-	# eal is standard dependency once built
-	if dpdk_conf.has('RTE_LIB_EAL')
-		deps += ['eal']
-	endif
-
-	dir_name = 'librte_' + l
-	subdir(dir_name)
-
-	if build
-		shared_deps = ext_deps
-		static_deps = ext_deps
-		foreach d:deps
-			if not is_variable('shared_rte_' + d)
-				error('Missing internal dependency "@0@" for @1@ [@2@]'
-						.format(d, name, 'lib/' + dir_name))
-			endif
-			shared_deps += [get_variable('shared_rte_' + d)]
-			static_deps += [get_variable('static_rte_' + d)]
-		endforeach
-	endif
-
-	if not build
-		dpdk_libs_disabled += name
-		set_variable(name.underscorify() + '_disable_reason', reason)
-	else
-		enabled_libs += name
-		dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
-		install_headers(headers)
-		install_headers(indirect_headers)
-		if get_option('enable_driver_sdk')
-			install_headers(driver_sdk_headers)
-		endif
-		dpdk_chkinc_headers += headers
-
-		libname = 'rte_' + name
-		includes += include_directories(dir_name)
-
-		if sources.length() == 0
-			# if no C files, just set a dependency on header path
-			shared_dep = declare_dependency(include_directories: includes)
-			static_dep = shared_dep
-		else
-			if is_windows and use_function_versioning and developer_mode
-				message('@0@: Function versioning is not supported by Windows.'
-						.format(name))
-			endif
-
-			if use_function_versioning
-				cflags += '-DRTE_USE_FUNCTION_VERSIONING'
-			endif
-
-			# first build static lib
-			static_lib = static_library(libname,
-					sources,
-					objects: objs,
-					c_args: cflags,
-					dependencies: static_deps,
-					include_directories: includes,
-					install: true)
-			static_dep = declare_dependency(
-					include_directories: includes,
-					dependencies: static_deps)
-
-			if not use_function_versioning or is_windows
-				# use pre-build objects to build shared lib
-				sources = []
-				objs += static_lib.extract_all_objects(recursive: false)
-			else
-				# for compat we need to rebuild with
-				# RTE_BUILD_SHARED_LIB defined
-				cflags += '-DRTE_BUILD_SHARED_LIB'
-			endif
-			version_map = '@0@/@1@/version.map'.format(
-					meson.current_source_dir(), dir_name)
-			implib = dir_name + '.dll.a'
-
-			def_file = custom_target(libname + '_def',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_exports.def'.format(libname))
-
-			mingw_map = custom_target(libname + '_mingw',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_mingw.map'.format(libname))
-
-			if is_ms_linker
-				lk_args = ['-Wl,/def:' + def_file.full_path()]
-				if meson.version().version_compare('<0.54.0')
-					lk_args += ['-Wl,/implib:lib\\' + implib]
-				endif
-			else
-				if is_windows
-					lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
-				else
-					lk_args = ['-Wl,--version-script=' + version_map]
-				endif
-			endif
-
-			lk_deps = [version_map, def_file, mingw_map]
-			if developer_mode and not is_windows
-				# on unix systems check the output of the
-				# check-symbols.sh script, using it as a
-				# dependency of the .so build
-				lk_deps += custom_target(name + '.sym_chk',
-					command: [check_symbols,
-						version_map, '@INPUT@'],
-					capture: true,
-					input: static_lib,
-					output: name + '.sym_chk')
-			endif
-
-			shared_lib = shared_library(libname,
-					sources,
-					objects: objs,
-					c_args: cflags,
-					dependencies: shared_deps,
-					include_directories: includes,
-					link_args: lk_args,
-					link_depends: lk_deps,
-					version: abi_version,
-					soversion: so_version,
-					install: true)
-			shared_dep = declare_dependency(link_with: shared_lib,
-					include_directories: includes,
-					dependencies: shared_deps)
-
-			dpdk_libraries = [shared_lib] + dpdk_libraries
-			dpdk_static_libraries = [static_lib] + dpdk_static_libraries
-		endif # sources.length() > 0
-
-		set_variable('shared_rte_' + name, shared_dep)
-		set_variable('static_rte_' + name, static_dep)
-		if developer_mode
-			message('lib/@0@: Defining dependency "@1@"'.format(
-					dir_name, name))
-		endif
-	endif # if build
+    build = true
+    reason = '<unknown reason>' # set if build == false to explain why
+    name = l
+    use_function_versioning = false
+    sources = []
+    headers = []
+    indirect_headers = [] # public headers not directly included by apps
+    driver_sdk_headers = [] # public headers included by drivers
+    includes = []
+    cflags = default_cflags
+    objs = [] # other object files to link against, used e.g. for
+              # instruction-set optimized versions of code
+
+    # use "deps" for internal DPDK dependencies, and "ext_deps" for
+    # external package/library requirements
+    ext_deps = []
+    deps = []
+    # eal is standard dependency once built
+    if dpdk_conf.has('RTE_LIB_EAL')
+        deps += ['eal']
+    endif
+
+    dir_name = 'librte_' + l
+    subdir(dir_name)
+
+    if not build
+        dpdk_libs_disabled += name
+        set_variable(name.underscorify() + '_disable_reason', reason)
+        continue
+    endif
+
+    shared_deps = ext_deps
+    static_deps = ext_deps
+    foreach d:deps
+        if not is_variable('shared_rte_' + d)
+            error('Missing internal dependency "@0@" for @1@ [@2@]'
+                    .format(d, name, 'lib/' + dir_name))
+        endif
+        shared_deps += [get_variable('shared_rte_' + d)]
+        static_deps += [get_variable('static_rte_' + d)]
+    endforeach
+
+    enabled_libs += name
+    dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
+    install_headers(headers)
+    install_headers(indirect_headers)
+    if get_option('enable_driver_sdk')
+        install_headers(driver_sdk_headers)
+    endif
+    dpdk_chkinc_headers += headers
+
+    libname = 'rte_' + name
+    includes += include_directories(dir_name)
+
+    if is_windows and use_function_versioning
+        message('@0@: Function versioning is not supported by Windows.'.format(name))
+    endif
+
+    if use_function_versioning
+        cflags += '-DRTE_USE_FUNCTION_VERSIONING'
+    endif
+
+    # first build static lib
+    static_lib = static_library(libname,
+            sources,
+            objects: objs,
+            c_args: cflags,
+            dependencies: static_deps,
+            include_directories: includes,
+            install: true)
+    static_dep = declare_dependency(
+            include_directories: includes,
+            dependencies: static_deps)
+
+    if not use_function_versioning or is_windows
+        # use pre-build objects to build shared lib
+        sources = []
+        objs += static_lib.extract_all_objects(recursive: false)
+    else
+        # for compat we need to rebuild with
+        # RTE_BUILD_SHARED_LIB defined
+        cflags += '-DRTE_BUILD_SHARED_LIB'
+    endif
+    version_map = '@0@/@1@/version.map'.format(
+            meson.current_source_dir(), dir_name)
+    implib = dir_name + '.dll.a'
+
+    def_file = custom_target(libname + '_def',
+            command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+            input: version_map,
+            output: '@0@_exports.def'.format(libname))
+
+    mingw_map = custom_target(libname + '_mingw',
+            command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+            input: version_map,
+            output: '@0@_mingw.map'.format(libname))
+
+    if is_ms_linker
+        lk_args = ['-Wl,/def:' + def_file.full_path()]
+        if meson.version().version_compare('<0.54.0')
+            lk_args += ['-Wl,/implib:lib\\' + implib]
+        endif
+    else
+        if is_windows
+            lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
+        else
+            lk_args = ['-Wl,--version-script=' + version_map]
+        endif
+    endif
+
+    lk_deps = [version_map, def_file, mingw_map]
+    if not is_windows
+        # on unix systems check the output of the
+        # check-symbols.sh script, using it as a
+        # dependency of the .so build
+        lk_deps += custom_target(name + '.sym_chk',
+                command: [check_symbols,
+                    version_map, '@INPUT@'],
+                capture: true,
+                input: static_lib,
+                output: name + '.sym_chk')
+    endif
+
+    shared_lib = shared_library(libname,
+            sources,
+            objects: objs,
+            c_args: cflags,
+            dependencies: shared_deps,
+            include_directories: includes,
+            link_args: lk_args,
+            link_depends: lk_deps,
+            version: abi_version,
+            soversion: so_version,
+            install: true)
+    shared_dep = declare_dependency(link_with: shared_lib,
+            include_directories: includes,
+            dependencies: shared_deps)
+
+    dpdk_libraries = [shared_lib] + dpdk_libraries
+    dpdk_static_libraries = [static_lib] + dpdk_static_libraries
+
+    set_variable('shared_rte_' + name, shared_dep)
+    set_variable('static_rte_' + name, static_dep)
+    if developer_mode
+        message('lib/@0@: Defining dependency "@1@"'.format(dir_name, name))
+    endif
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH v2 02/16] build: tidy up list of libraries to build

[Bruce Richardson]

With the lib/meson.build file changed from C-style indentation to
python-style indentation, we need to correct the indentation of the lists
of libraries, since these libs were not modified in the previous patches.
For ease of management of the list and working with patches for adding
to the list, put each library on it's own line.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build | 104 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 95fcd01896..9b99aa0be0 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -9,44 +9,76 @@
 # given as a dep, no need to mention ring. This is especially true for the
 # core libs which are widely reused, so their deps are kept to a minimum.
 libraries = [
-	'kvargs', # eal depends on kvargs
-	'telemetry', # basic info querying
-	'eal', # everything depends on eal
-	'ring',
-	'rcu', # rcu depends on ring
-	'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
-	'cmdline',
-	'metrics', # bitrate/latency stats depends on this
-	'hash',    # efd depends on this
-	'timer',   # eventdev depends on this
-	'acl', 'bbdev', 'bitratestats', 'cfgfile',
-	'compressdev', 'cryptodev',
-	'distributor', 'efd', 'eventdev',
-	'gro', 'gso', 'ip_frag', 'jobstats',
-	'kni', 'latencystats', 'lpm', 'member',
-	'power', 'pdump', 'rawdev', 'regexdev',
-	'rib', 'reorder', 'sched', 'security', 'stack', 'vhost',
-	# ipsec lib depends on net, crypto and security
-	'ipsec',
-	#fib lib depends on rib
-	'fib',
-	# add pkt framework libs which use other libs from above
-	'port', 'table', 'pipeline',
-	# flow_classify lib depends on pkt framework table lib
-	'flow_classify', 'bpf', 'graph', 'node']
+        'kvargs', # eal depends on kvargs
+        'telemetry', # basic info querying
+        'eal', # everything depends on eal
+        'ring',
+        'rcu', # rcu depends on ring
+        'mempool',
+        'mbuf',
+        'net',
+        'meter',
+        'ethdev',
+        'pci', # core
+        'cmdline',
+        'metrics', # bitrate/latency stats depends on this
+        'hash',    # efd depends on this
+        'timer',   # eventdev depends on this
+        'acl',
+        'bbdev',
+        'bitratestats',
+        'cfgfile',
+        'compressdev',
+        'cryptodev',
+        'distributor',
+        'efd',
+        'eventdev',
+        'gro',
+        'gso',
+        'ip_frag',
+        'jobstats',
+        'kni',
+        'latencystats',
+        'lpm',
+        'member',
+        'power',
+        'pdump',
+        'rawdev',
+        'regexdev',
+        'rib',
+        'reorder',
+        'sched',
+        'security',
+        'stack',
+        'vhost',
+        'ipsec', # ipsec lib depends on net, crypto and security
+        'fib', #fib lib depends on rib
+        'port', # pkt framework libs which use other libs from above
+        'table',
+        'pipeline',
+        'flow_classify', # flow_classify lib depends on pkt framework table lib
+        'bpf',
+        'graph',
+        'node',
+]
 
 if is_windows
-	libraries = [
-		'kvargs',
-		'telemetry',
-		'eal',
-		'ring',
-		'rcu',
-		'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
-		'cmdline',
-		'hash',
-		'cfgfile',
-	] # only supported libraries for windows
+    libraries = [
+            'kvargs',
+            'telemetry',
+            'eal',
+            'ring',
+            'rcu',
+            'mempool',
+            'mbuf',
+            'net',
+            'meter',
+            'ethdev',
+            'pci',
+            'cmdline',
+            'hash',
+            'cfgfile',
+    ] # only supported libraries for windows
 endif
 
 default_cflags = machine_args
-- 
2.27.0

[dpdk-dev] [PATCH v2 03/16] build: simplify the driver build configuration file

[Bruce Richardson]

As with the library meson.build file, we can use the "continue" keyword to
reduce the level of indentation used for the majority of the build file.
Since we are changing the whitespace indentation level, we also update the
body of the foreach loop to use the meson standard, 4-space indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/meson.build | 384 ++++++++++++++++++++++----------------------
 1 file changed, 189 insertions(+), 195 deletions(-)

diff --git a/drivers/meson.build b/drivers/meson.build
index 9aa86e7ed6..f90330b5a3 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -49,199 +49,193 @@ if cc.has_argument('-Wno-format-truncation')
 endif
 
 foreach subpath:subdirs
-	drivers = []
-	std_deps = []
-
-	# subpath can be either "class" or "class/driver"
-	if subpath.contains('/')
-		driver_path = subpath.split('/')
-		class = driver_path[0]
-		drivers += driver_path[1]
-	else
-		class = subpath
-		subdir(class)
-	endif
-
-	# save class name on first occurrence
-	if not dpdk_driver_classes.contains(class)
-		dpdk_driver_classes += class
-	endif
-	# get already enabled drivers of the same class
-	enabled_drivers = get_variable(class + '_drivers', [])
-
-	foreach drv:drivers
-		drv_path = join_paths(class, drv)
-
-		# set up empty variables used for build
-		build = true # set to false to disable, e.g. missing deps
-		reason = '<unknown reason>' # set if build == false to explain
-		name = drv
-		sources = []
-		headers = []
-		objs = []
-		cflags = default_cflags
-		includes = [include_directories(drv_path)]
-		# set up internal deps. Drivers can append/override as necessary
-		deps = std_deps
-		# ext_deps: Stores external library dependency got
-		# using dependency() (preferred) or find_library().
-		# For the find_library() case (but not with dependency()) we also
-		# need to specify the "-l" flags in pkgconfig_extra_libs variable
-		# too, so that it can be reflected in the pkgconfig output for
-		# static builds.
-		ext_deps = []
-		pkgconfig_extra_libs = []
-
-		if not enable_drivers.contains(drv_path)
-			build = false
-			reason = 'not in enabled drivers build config'
-		elif disable_drivers.contains(drv_path)
-			if always_enable.contains(drv_path)
-				message('Driver @0@ cannot be disabled, not disabling.'.format(drv_path))
-			else
-				build = false
-				reason = 'explicitly disabled via build config'
-			endif
-		else
-			# pull in driver directory which should update all the local variables
-			subdir(drv_path)
-		endif
-
-		if build
-			# get dependency objs from strings
-			shared_deps = ext_deps
-			static_deps = ext_deps
-			foreach d:deps
-				if not is_variable('shared_rte_' + d)
-					build = false
-					reason = 'missing internal dependency, "@0@"'.format(d)
-					message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
-							.format(d, name, 'drivers/' + drv_path))
-				else
-					shared_deps += [get_variable('shared_rte_' + d)]
-					static_deps += [get_variable('static_rte_' + d)]
-				endif
-			endforeach
-		endif
-
-		if not build
-			# some driver directories are placeholders which
-			# are never built, so we allow suppression of the
-			# component disable printout in those cases
-			if reason != ''
-				dpdk_drvs_disabled += drv_path
-				set_variable(drv_path.underscorify() +
-						'_disable_reason', reason)
-			endif
-		else
-			enabled_drivers += name
-			lib_name = '_'.join(['rte', class, name])
-			dpdk_conf.set(lib_name.to_upper(), 1)
-
-			dpdk_extra_ldflags += pkgconfig_extra_libs
-
-			install_headers(headers)
-
-			# generate pmdinfo sources by building a temporary
-			# lib and then running pmdinfogen on the contents of
-			# that lib. The final lib reuses the object files and
-			# adds in the new source file.
-			out_filename = lib_name + '.pmd.c'
-			tmp_lib = static_library('tmp_' + lib_name,
-					sources,
-					include_directories: includes,
-					dependencies: static_deps,
-					c_args: cflags)
-			objs += tmp_lib.extract_all_objects()
-			sources = custom_target(out_filename,
-					command: [pmdinfo, tmp_lib.full_path(),
-						'@OUTPUT@', pmdinfogen],
-					output: out_filename,
-					depends: [tmp_lib])
-
-			# now build the static driver
-			static_lib = static_library(lib_name,
-				sources,
-				objects: objs,
-				include_directories: includes,
-				dependencies: static_deps,
-				c_args: cflags,
-				install: true)
-
-			# now build the shared driver
-			version_map = '@0@/@1@/version.map'.format(
-					meson.current_source_dir(),
-					drv_path)
-			implib = 'lib' + lib_name + '.dll.a'
-
-			def_file = custom_target(lib_name + '_def',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_exports.def'.format(lib_name))
-
-			mingw_map = custom_target(lib_name + '_mingw',
-				command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
-				input: version_map,
-				output: '@0@_mingw.map'.format(lib_name))
-
-			lk_deps = [version_map, def_file, mingw_map]
-			if is_windows
-				if is_ms_linker
-					lk_args = ['-Wl,/def:' + def_file.full_path()]
-					if meson.version().version_compare('<0.54.0')
-						lk_args += ['-Wl,/implib:drivers\\' + implib]
-					endif
-				else
-					lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
-				endif
-			else
-				lk_args = ['-Wl,--version-script=' + version_map]
-				if developer_mode
-					# on unix systems check the output of the
-					# check-symbols.sh script, using it as a
-					# dependency of the .so build
-					lk_deps += custom_target(lib_name + '.sym_chk',
-						command: [check_symbols,
-							version_map, '@INPUT@'],
-						capture: true,
-						input: static_lib,
-						output: lib_name + '.sym_chk')
-				endif
-			endif
-
-			shared_lib = shared_library(lib_name,
-				sources,
-				objects: objs,
-				include_directories: includes,
-				dependencies: shared_deps,
-				c_args: cflags,
-				link_args: lk_args,
-				link_depends: lk_deps,
-				version: abi_version,
-				soversion: so_version,
-				install: true,
-				install_dir: driver_install_path)
-
-			# create a dependency object and add it to the global dictionary so
-			# testpmd or other built-in apps can find it if necessary
-			shared_dep = declare_dependency(link_with: shared_lib,
-					include_directories: includes,
-					dependencies: shared_deps)
-			static_dep = declare_dependency(
-					include_directories: includes,
-					dependencies: static_deps)
-
-			dpdk_drivers += static_lib
-
-			set_variable('shared_@0@'.format(lib_name), shared_dep)
-			set_variable('static_@0@'.format(lib_name), static_dep)
-			dependency_name = ''.join(lib_name.split('rte_'))
-			if developer_mode
-				message('drivers/@0@: Defining dependency "@1@"'.format(
-						drv_path, dependency_name))
-			endif
-		endif # build
-	endforeach
-
-	set_variable(class + '_drivers', enabled_drivers)
+    drivers = []
+    std_deps = []
+
+    # subpath can be either "class" or "class/driver"
+    if subpath.contains('/')
+        driver_path = subpath.split('/')
+        class = driver_path[0]
+        drivers += driver_path[1]
+    else
+        class = subpath
+        subdir(class)
+    endif
+
+    # save class name on first occurrence
+    if not dpdk_driver_classes.contains(class)
+        dpdk_driver_classes += class
+    endif
+    # get already enabled drivers of the same class
+    enabled_drivers = get_variable(class + '_drivers', [])
+
+    foreach drv:drivers
+        drv_path = join_paths(class, drv)
+
+        # set up empty variables used for build
+        build = true # set to false to disable, e.g. missing deps
+        reason = '<unknown reason>' # set if build == false to explain
+        name = drv
+        sources = []
+        headers = []
+        objs = []
+        cflags = default_cflags
+        includes = [include_directories(drv_path)]
+        # set up internal deps. Drivers can append/override as necessary
+        deps = std_deps
+        # ext_deps: Stores external library dependency got
+        # using dependency() (preferred) or find_library().
+        # For the find_library() case (but not with dependency()) we also
+        # need to specify the "-l" flags in pkgconfig_extra_libs variable
+        # too, so that it can be reflected in the pkgconfig output for
+        # static builds.
+        ext_deps = []
+        pkgconfig_extra_libs = []
+
+        if not enable_drivers.contains(drv_path)
+            build = false
+            reason = 'not in enabled drivers build config'
+        elif disable_drivers.contains(drv_path)
+            if always_enable.contains(drv_path)
+                message('Driver @0@ cannot be disabled, not disabling.'.format(drv_path))
+            else
+                build = false
+                reason = 'explicitly disabled via build config'
+            endif
+        else
+            # pull in driver directory which should update all the local variables
+            subdir(drv_path)
+        endif
+
+        if build
+            # get dependency objs from strings
+            shared_deps = ext_deps
+            static_deps = ext_deps
+            foreach d:deps
+                if not is_variable('shared_rte_' + d)
+                    build = false
+                    reason = 'missing internal dependency, "@0@"'.format(d)
+                    message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
+                            .format(d, name, 'drivers/' + drv_path))
+                else
+                    shared_deps += [get_variable('shared_rte_' + d)]
+                    static_deps += [get_variable('static_rte_' + d)]
+                endif
+            endforeach
+        endif
+
+        if not build
+            # some driver directories are placeholders which
+            # are never built, so we allow suppression of the
+            # component disable printout in those cases
+            if reason != ''
+                dpdk_drvs_disabled += drv_path
+                set_variable(drv_path.underscorify() + '_disable_reason', reason)
+            endif
+            continue
+        endif
+
+        enabled_drivers += name
+        lib_name = '_'.join(['rte', class, name])
+        dpdk_conf.set(lib_name.to_upper(), 1)
+
+        dpdk_extra_ldflags += pkgconfig_extra_libs
+
+        install_headers(headers)
+
+        # generate pmdinfo sources by building a temporary
+        # lib and then running pmdinfogen on the contents of
+        # that lib. The final lib reuses the object files and
+        # adds in the new source file.
+        out_filename = lib_name + '.pmd.c'
+        tmp_lib = static_library('tmp_' + lib_name, sources,
+                include_directories: includes,
+                dependencies: static_deps,
+                c_args: cflags)
+        objs += tmp_lib.extract_all_objects()
+        sources = custom_target(out_filename,
+                command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
+                output: out_filename,
+                depends: [tmp_lib])
+
+        # now build the static driver
+        static_lib = static_library(lib_name,
+                sources,
+                objects: objs,
+                include_directories: includes,
+                dependencies: static_deps,
+                c_args: cflags,
+                install: true)
+
+        # now build the shared driver
+        version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path)
+        implib = 'lib' + lib_name + '.dll.a'
+
+        def_file = custom_target(lib_name + '_def',
+                command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+                input: version_map,
+                output: '@0@_exports.def'.format(lib_name))
+
+        mingw_map = custom_target(lib_name + '_mingw',
+                command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+                input: version_map,
+                output: '@0@_mingw.map'.format(lib_name))
+
+        lk_deps = [version_map, def_file, mingw_map]
+        if is_windows
+            if is_ms_linker
+                lk_args = ['-Wl,/def:' + def_file.full_path()]
+                if meson.version().version_compare('<0.54.0')
+                    lk_args += ['-Wl,/implib:drivers\\' + implib]
+                endif
+            else
+                lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
+            endif
+        else
+            lk_args = ['-Wl,--version-script=' + version_map]
+            if developer_mode
+                # on unix systems check the output of the
+                # check-symbols.sh script, using it as a
+                # dependency of the .so build
+                lk_deps += custom_target(lib_name + '.sym_chk',
+                        command: [check_symbols, version_map, '@INPUT@'],
+                        capture: true,
+                        input: static_lib,
+                        output: lib_name + '.sym_chk')
+            endif
+        endif
+
+        shared_lib = shared_library(lib_name, sources,
+                objects: objs,
+                include_directories: includes,
+                dependencies: shared_deps,
+                c_args: cflags,
+                link_args: lk_args,
+                link_depends: lk_deps,
+                version: abi_version,
+                soversion: so_version,
+                install: true,
+                install_dir: driver_install_path)
+
+        # create a dependency object and add it to the global dictionary so
+        # testpmd or other built-in apps can find it if necessary
+        shared_dep = declare_dependency(link_with: shared_lib,
+                include_directories: includes,
+                dependencies: shared_deps)
+        static_dep = declare_dependency(
+                include_directories: includes,
+                dependencies: static_deps)
+
+        dpdk_drivers += static_lib
+
+        set_variable('shared_@0@'.format(lib_name), shared_dep)
+        set_variable('static_@0@'.format(lib_name), static_dep)
+        dependency_name = ''.join(lib_name.split('rte_'))
+        if developer_mode
+            message('drivers/@0@: Defining dependency "@1@"'.format(
+                    drv_path, dependency_name))
+        endif
+    endforeach
+
+    set_variable(class + '_drivers', enabled_drivers)
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH v2 04/16] build: clean up driver lists

[Bruce Richardson]

Ensure all lists of drivers are standardized:
* one driver per line
* lists double-indented with spaces (as they are line continuations)
* elements in alphabetical order
* opening and closing list brackets "[" & "]" on own lines
* last element has trailing comma

Any code snippets in the list files is adjusted to single-indent using
whitespace to correspond to the new style also.

The lists of standard library dependencies per class, and other short
lists are not formatted one-per-line as these lists are not expected to
grow beyond 2 or 3 entries.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/baseband/meson.build |  10 +++-
 drivers/bus/meson.build      |   9 ++-
 drivers/common/meson.build   |   9 ++-
 drivers/compress/meson.build |   9 ++-
 drivers/crypto/meson.build   |  42 +++++++-------
 drivers/event/meson.build    |  18 ++++--
 drivers/mempool/meson.build  |  12 +++-
 drivers/meson.build          |  38 ++++++------
 drivers/net/meson.build      | 108 ++++++++++++++++++-----------------
 drivers/raw/meson.build      |  17 ++++--
 drivers/regex/meson.build    |   5 +-
 drivers/vdpa/meson.build     |   8 ++-
 12 files changed, 171 insertions(+), 114 deletions(-)

diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build
index 920e3b02ee..c98ebd9024 100644
--- a/drivers/baseband/meson.build
+++ b/drivers/baseband/meson.build
@@ -2,7 +2,13 @@
 # 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 = [
+        'acc100',
+        'fpga_5gnr_fec',
+        'fpga_lte_fec',
+        'null',
+        'turbo_sw',
+]
diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build
index 2e7727af08..c770c6ba1e 100644
--- a/drivers/bus/meson.build
+++ b/drivers/bus/meson.build
@@ -1,5 +1,12 @@
 # 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 9fdfc2451f..4acbad60b1 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -2,4 +2,11 @@
 # Copyright(c) 2018 Cavium, Inc
 
 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..abe043ab94 100644
--- a/drivers/compress/meson.build
+++ b/drivers/compress/meson.build
@@ -2,9 +2,14 @@
 # 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..b9fdf9392f 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -2,27 +2,29 @@
 # 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']
+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',
+]
 
 std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index b7f9bf7c6f..539c5aeb9f 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -2,13 +2,21 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	subdir_done()
+    subdir_done()
 endif
 
-drivers = ['dlb2', 'dpaa', 'dpaa2', 'octeontx2', 'opdl', 'skeleton', 'sw',
-	   'dsw']
+drivers = [
+        'dlb2',
+        'dpaa',
+        'dpaa2',
+        'dsw',
+        'octeontx2',
+        'opdl',
+        'skeleton',
+        'sw',
+]
 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 a2814c1dfa..caaffc3806 100644
--- a/drivers/mempool/meson.build
+++ b/drivers/mempool/meson.build
@@ -1,6 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['bucket', 'cnxk', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring',
-	   'stack']
+drivers = [
+        'bucket',
+        'cnxk',
+        'dpaa',
+        'dpaa2',
+        'octeontx',
+        'octeontx2',
+        'ring',
+        'stack',
+]
 std_deps = ['mempool']
diff --git a/drivers/meson.build b/drivers/meson.build
index f90330b5a3..b78cac3897 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -3,26 +3,26 @@
 
 # Defines the order of dependencies evaluation
 subdirs = [
-	'common',
-	'bus',
-	'common/cnxk', # depends on 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/cnxk',    # depends on 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.
 ]
 
 if meson.is_cross_build()
-	disable_drivers += ',' + meson.get_cross_property('disable_drivers', '')
-	enable_drivers += ',' + meson.get_cross_property('enable_drivers', '')
+    disable_drivers += ',' + meson.get_cross_property('disable_drivers', '')
+    enable_drivers += ',' + meson.get_cross_property('enable_drivers', '')
 endif
 
 # add cmdline disabled drivers and meson disabled drivers together
@@ -33,7 +33,7 @@ disable_drivers = run_command(list_dir_globs, disable_drivers).stdout().split()
 enable_drivers = ',' + get_option('enable_drivers')
 enable_drivers = run_command(list_dir_globs, enable_drivers).stdout().split()
 if enable_drivers.length() == 0
-	enable_drivers = run_command(list_dir_globs, '*/*').stdout().split()
+    enable_drivers = run_command(list_dir_globs, '*/*').stdout().split()
 endif
 
 # these drivers must always be enabled, otherwise the build breaks
@@ -45,7 +45,7 @@ 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..c8b5ce2980 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -2,58 +2,62 @@
 # Copyright(c) 2017 Intel Corporation
 
 
-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',
+drivers = [
+        'af_packet',
+        'af_xdp',
+        'ark',
+        'atlantic',
+        'avp',
+        'axgbe',
+        'bnx2x',
+        'bnxt',
+        'bonding',
+        'cxgbe',
+        'dpaa',
+        'dpaa2',
+        'e1000',
+        'ena',
+        'enetc',
+        'enic',
+        'failsafe',
+        'fm10k',
+        'hinic',
+        'hns3',
+        'i40e',
+        '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..c33a7c5f3e 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -2,12 +2,17 @@
 # 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..94222e55fe 100644
--- a/drivers/regex/meson.build
+++ b/drivers/regex/meson.build
@@ -1,5 +1,8 @@
 # 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..f765fe3980 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -2,10 +2,12 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if is_windows
-	subdir_done()
+    subdir_done()
 endif
 
-drivers = ['ifc',
-	   'mlx5',]
+drivers = [
+        'ifc',
+        'mlx5',
+]
 std_deps = ['bus_pci', 'kvargs']
 std_deps += ['vhost']
-- 
2.27.0

[dpdk-dev] [PATCH v2 05/16] build: reduce indentation in app build spec

[Bruce Richardson]

As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/meson.build | 101 ++++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/app/meson.build b/app/meson.build
index 50a53dbde8..35e53861bb 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -2,71 +2,72 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 if is_windows
-	subdir_done()
+    subdir_done()
 endif
 
 apps = [
-	'pdump',
-	'proc-info',
-	'test-acl',
-	'test-bbdev',
-	'test-cmdline',
-	'test-compress-perf',
-	'test-crypto-perf',
-	'test-eventdev',
-	'test-fib',
-	'test-flow-perf',
-	'test-pipeline',
-	'test-pmd',
-	'test-regex',
-	'test-sad']
+        'pdump',
+        'proc-info',
+        'test-acl',
+        'test-bbdev',
+        'test-cmdline',
+        'test-compress-perf',
+        'test-crypto-perf',
+        'test-eventdev',
+        'test-fib',
+        'test-flow-perf',
+        'test-pipeline',
+        'test-pmd',
+        'test-regex',
+        'test-sad',
+]
 
 default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
 default_ldflags = []
 if get_option('default_library') == 'static' and not is_windows
-	default_ldflags += ['-Wl,--export-dynamic']
+    default_ldflags += ['-Wl,--export-dynamic']
 endif
 
 foreach app:apps
-	build = true
-	name = app
-	sources = []
-	includes = []
-	cflags = default_cflags
-	ldflags = default_ldflags
-	objs = [] # other object files to link against, used e.g. for
-	          # instruction-set optimized versions of code
+    build = true
+    name = app
+    sources = []
+    includes = []
+    cflags = default_cflags
+    ldflags = default_ldflags
+    objs = [] # other object files to link against, used e.g. for
+              # instruction-set optimized versions of code
 
-	# use "deps" for internal DPDK dependencies, and "ext_deps" for
-	# external package/library requirements
-	ext_deps = []
-	deps = []
+    # use "deps" for internal DPDK dependencies, and "ext_deps" for
+    # external package/library requirements
+    ext_deps = []
+    deps = []
 
-	subdir(name)
+    subdir(name)
 
-	if build
-		dep_objs = []
-		foreach d:deps
-			dep_objs += get_variable(get_option('default_library')
-				 + '_rte_' + d)
-		endforeach
+    if not build
+        continue
+    endif
 
-		link_libs = []
-		if get_option('default_library') == 'static'
-			link_libs = dpdk_static_libraries + dpdk_drivers
-		endif
+    dep_objs = []
+    foreach d:deps
+        dep_objs += get_variable(get_option('default_library') + '_rte_' + d)
+    endforeach
 
-		executable('dpdk-' + name,
-				sources,
-				c_args: cflags,
-				link_args: ldflags,
-				link_whole: link_libs,
-				dependencies: dep_objs,
-				include_directories: includes,
-				install_rpath: join_paths(get_option('prefix'),
-						 driver_install_path),
-				install: true)
-	endif
+    link_libs = []
+    if get_option('default_library') == 'static'
+        link_libs = dpdk_static_libraries + dpdk_drivers
+    endif
+
+    executable('dpdk-' + name,
+            sources,
+            c_args: cflags,
+            link_args: ldflags,
+            link_whole: link_libs,
+            dependencies: dep_objs,
+            include_directories: includes,
+            install_rpath: join_paths(get_option('prefix'), driver_install_path),
+            install: true)
 endforeach
 
 # special case the autotests
-- 
2.27.0

[dpdk-dev] [PATCH v2 06/16] build: reduce indentation in examples build spec

[Bruce Richardson]

As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/meson.build | 177 ++++++++++++++++++++++++-------------------
 1 file changed, 99 insertions(+), 78 deletions(-)

diff --git a/examples/meson.build b/examples/meson.build
index d065a6a08b..07e682401b 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -3,109 +3,130 @@
 
 link_whole_libs = []
 if get_option('default_library') == 'static'
-	link_whole_libs = dpdk_static_libraries + dpdk_drivers
+    link_whole_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 # list of all example apps. Keep 1-3 per line, in alphabetical order.
 all_examples = [
-	'bbdev_app', 'bond',
-	'cmdline',
-	'distributor', 'ethtool',
-	'eventdev_pipeline',
-	'fips_validation', 'flow_classify',
-	'flow_filtering', 'helloworld',
-	'ioat',
-	'ip_fragmentation', 'ip_pipeline',
-	'ip_reassembly', 'ipsec-secgw',
-	'ipv4_multicast', 'kni',
-	'l2fwd', 'l2fwd-cat', 'l2fwd-event',
-	'l2fwd-crypto', 'l2fwd-jobstats',
-	'l2fwd-keepalive', 'l3fwd',
-	'l3fwd-acl', 'l3fwd-power', 'l3fwd-graph',
-	'link_status_interrupt',
-	'multi_process/client_server_mp/mp_client',
-	'multi_process/client_server_mp/mp_server',
-	'multi_process/hotplug_mp',
-	'multi_process/simple_mp',
-	'multi_process/symmetric_mp',
-	'ntb', 'packet_ordering',
-	'performance-thread/l3fwd-thread',
-	'performance-thread/pthread_shim',
-	'pipeline',
-	'ptpclient',
-	'qos_meter', 'qos_sched',
-	'rxtx_callbacks',
-	'server_node_efd/node',
-	'server_node_efd/server',
-	'service_cores',
-	'skeleton',
-	'timer', 'vdpa',
-	'vhost', 'vhost_crypto',
-	'vhost_blk', 'vm_power_manager',
-	'vm_power_manager/guest_cli',
-	'vmdq', 'vmdq_dcb',
+        'bbdev_app',
+        'bond',
+        'cmdline',
+        'distributor',
+        'ethtool',
+        'eventdev_pipeline',
+        'fips_validation',
+        'flow_classify',
+        'flow_filtering',
+        'helloworld',
+        'ioat',
+        'ip_fragmentation',
+        'ip_pipeline',
+        'ip_reassembly',
+        'ipsec-secgw',
+        'ipv4_multicast',
+        'kni',
+        'l2fwd',
+        'l2fwd-cat',
+        'l2fwd-crypto',
+        'l2fwd-event',
+        'l2fwd-jobstats',
+        'l2fwd-keepalive',
+        'l3fwd',
+        'l3fwd-acl',
+        'l3fwd-graph',
+        'l3fwd-power',
+        'link_status_interrupt',
+        'multi_process/client_server_mp/mp_client',
+        'multi_process/client_server_mp/mp_server',
+        'multi_process/hotplug_mp',
+        'multi_process/simple_mp',
+        'multi_process/symmetric_mp',
+        'ntb',
+        'packet_ordering',
+        'performance-thread/l3fwd-thread',
+        'performance-thread/pthread_shim',
+        'pipeline',
+        'ptpclient',
+        'qos_meter',
+        'qos_sched',
+        'rxtx_callbacks',
+        'server_node_efd/node',
+        'server_node_efd/server',
+        'service_cores',
+        'skeleton',
+        'timer',
+        'vdpa',
+        'vhost',
+        'vhost_blk',
+        'vhost_crypto',
+        'vm_power_manager',
+        'vm_power_manager/guest_cli',
+        'vmdq',
+        'vmdq_dcb',
 ]
 
 # on install, skip copying all meson.build files
 ex_file_excludes = ['meson.build']
 foreach ex:all_examples
-	ex_file_excludes += [ex + '/meson.build']
+    ex_file_excludes += [ex + '/meson.build']
 endforeach
 
 if get_option('examples') == ''
-	subdir_done()
+    subdir_done()
 endif
 
 if get_option('examples').to_lower() == 'all'
-	examples = all_examples
-	allow_skips = true # don't flag an error if we can't build an app
+    examples = all_examples
+    allow_skips = true # don't flag an error if we can't build an app
 else
-	examples = get_option('examples').split(',')
-	allow_skips = false # error out if we can't build a requested app
+    examples = get_option('examples').split(',')
+    allow_skips = false # error out if we can't build a requested app
 endif
 default_cflags = machine_args
 if cc.has_argument('-Wno-format-truncation')
-	default_cflags += '-Wno-format-truncation'
+    default_cflags += '-Wno-format-truncation'
 endif
 default_ldflags = dpdk_extra_ldflags
 if get_option('default_library') == 'static' and not is_windows
-	default_ldflags += ['-Wl,--export-dynamic']
+    default_ldflags += ['-Wl,--export-dynamic']
 endif
 
 foreach example: examples
-	name = example.split('/')[-1]
-	build = true
-	sources = []
-	allow_experimental_apis = false
-	cflags = default_cflags
-	ldflags = default_ldflags
+    name = example.split('/')[-1]
+    build = true
+    sources = []
+    allow_experimental_apis = false
+    cflags = default_cflags
+    ldflags = default_ldflags
 
-	ext_deps = []
-	includes = [include_directories(example)]
-	deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
-	subdir(example)
+    ext_deps = []
+    includes = [include_directories(example)]
+    deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
+    subdir(example)
 
-	if build
-		dep_objs = ext_deps
-		foreach d:deps
-			var_name = get_option('default_library') + '_rte_' + d
-			if not is_variable(var_name)
-				error('Missing dependency "@0@" for example "@1@"'.format(d, name))
-			endif
-			dep_objs += [get_variable(var_name)]
-		endforeach
-		if allow_experimental_apis
-			cflags += '-DALLOW_EXPERIMENTAL_API'
-		endif
-		executable('dpdk-' + name, sources,
-			include_directories: includes,
-			link_whole: link_whole_libs,
-			link_args: ldflags,
-			c_args: cflags,
-			dependencies: dep_objs)
-	elif not allow_skips
-		error('Cannot build requested example "' + name + '"')
-	else
-		message('Skipping example "' + name + '"')
-	endif
+    if not build
+        if not allow_skips
+            error('Cannot build requested example "' + name + '"')
+        endif
+        message('Skipping example "' + name + '"')
+        continue
+    endif
+
+    dep_objs = ext_deps
+    foreach d:deps
+        var_name = get_option('default_library') + '_rte_' + d
+        if not is_variable(var_name)
+            error('Missing dependency "@0@" for example "@1@"'.format(d, name))
+        endif
+        dep_objs += [get_variable(var_name)]
+    endforeach
+    if allow_experimental_apis
+        cflags += '-DALLOW_EXPERIMENTAL_API'
+    endif
+    executable('dpdk-' + name, sources,
+            include_directories: includes,
+            link_whole: link_whole_libs,
+            link_args: ldflags,
+            c_args: cflags,
+            dependencies: dep_objs)
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH v2 07/16] build: change infrastructure file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation, for the
basic infrastructure and tooling files, as well as doc and kernel
directories.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 buildtools/chkincs/meson.build    |  24 +-
 buildtools/meson.build            |  34 +-
 buildtools/pkg-config/meson.build |  34 +-
 config/arm/meson.build            | 704 +++++++++++++++---------------
 config/meson.build                | 286 ++++++------
 config/ppc/meson.build            |   8 +-
 config/x86/meson.build            |  64 +--
 doc/api/meson.build               |  36 +-
 doc/guides/meson.build            |  25 +-
 doc/meson.build                   |   6 +-
 kernel/freebsd/meson.build        |  32 +-
 kernel/linux/kni/meson.build      |  41 +-
 kernel/linux/meson.build          | 111 +++--
 meson.build                       |  94 ++--
 meson_options.txt                 |  84 ++--
 usertools/meson.build             |  11 +-
 16 files changed, 796 insertions(+), 798 deletions(-)

diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index f28cfd3cd4..34dcd81ce1 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2021 Intel Corporation
 
 if not get_option('check_includes')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 if is_windows
-	# for windows, the shebang line in the script won't work.
-	error('option "check_includes" is not supported on windows')
+    # for windows, the shebang line in the script won't work.
+    error('option "check_includes" is not supported on windows')
 endif
 
 gen_c_file_for_header = find_program('gen_c_file_for_header.py')
 gen_c_files = generator(gen_c_file_for_header,
-	output: '@BASENAME@.c',
-	arguments: ['@INPUT@', '@OUTPUT@'])
+        output: '@BASENAME@.c',
+        arguments: ['@INPUT@', '@OUTPUT@'])
 
 cflags = machine_args
 cflags += '-DALLOW_EXPERIMENTAL_API'
@@ -24,12 +24,12 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
 
 deps = []
 foreach l:enabled_libs
-	deps += get_variable('static_rte_' + l)
+    deps += get_variable('static_rte_' + l)
 endforeach
 
 executable('chkincs', sources,
-	c_args: cflags,
-	include_directories: includes,
-	dependencies: deps,
-	link_whole: dpdk_static_libraries + dpdk_drivers,
-	install: false)
+        c_args: cflags,
+        include_directories: includes,
+        dependencies: deps,
+        link_whole: dpdk_static_libraries + dpdk_drivers,
+        install: false)
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 9c9347457a..c520896b4b 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -10,9 +10,9 @@ binutils_avx512_check = find_program('binutils-avx512-check.sh')
 # set up map-to-win script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
 if python3.found()
-	py3 = [python3]
+    py3 = [python3]
 else
-	py3 = ['meson', 'runpython']
+    py3 = ['meson', 'runpython']
 endif
 map_to_win_cmd = py3 + files('map_to_win.py')
 sphinx_wrapper = py3 + files('call-sphinx-build.py')
@@ -21,27 +21,27 @@ sphinx_wrapper = py3 + files('call-sphinx-build.py')
 pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
 pmdinfogen = py3 + files('pmdinfogen.py')
 if host_machine.system() == 'windows'
-	if cc.get_id() == 'gcc'
-		pmdinfo += 'ar'
-	else
-		pmdinfo += 'llvm-ar'
-	endif
-	pmdinfogen += 'coff'
+    if cc.get_id() == 'gcc'
+        pmdinfo += 'ar'
+    else
+        pmdinfo += 'llvm-ar'
+    endif
+    pmdinfogen += 'coff'
 else
-	pmdinfo += 'ar'
-	pmdinfogen += 'elf'
+    pmdinfo += 'ar'
+    pmdinfogen += 'elf'
 endif
 
 # TODO: starting from Meson 0.51.0 use
-# 	python3 = import('python').find_installation('python',
-#		modules : python3_required_modules)
+#     python3 = import('python').find_installation('python',
+#        modules : python3_required_modules)
 python3_required_modules = []
 if host_machine.system() != 'windows'
-	python3_required_modules = ['elftools']
+    python3_required_modules = ['elftools']
 endif
 foreach module : python3_required_modules
-	script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
-	if run_command(py3, '-c', script.format(module)).returncode() != 0
-		error('missing python module: @0@'.format(module))
-	endif
+    script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
+    if run_command(py3, '-c', script.format(module)).returncode() != 0
+        error('missing python module: @0@'.format(module))
+    endif
 endforeach
diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
index 39a8fd1c8e..0412883c8f 100644
--- a/buildtools/pkg-config/meson.build
+++ b/buildtools/pkg-config/meson.build
@@ -4,7 +4,7 @@
 pkg = import('pkgconfig')
 pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
 if is_freebsd
-	pkg_extra_cflags += ['-D__BSD_VISIBLE']
+    pkg_extra_cflags += ['-D__BSD_VISIBLE']
 endif
 
 # When calling pkg-config --static --libs, pkg-config will always output the
@@ -28,30 +28,30 @@ endif
 
 
 pkg.generate(name: 'dpdk-libs',
-	filebase: 'libdpdk-libs',
-	description: '''Internal-only DPDK pkgconfig file. Not for direct use.
+        filebase: 'libdpdk-libs',
+        description: '''Internal-only DPDK pkgconfig file. Not for direct use.
 Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
-	version: meson.project_version(),
-	subdirs: [get_option('include_subdir_arch'), '.'],
-	extra_cflags: pkg_extra_cflags,
-	libraries: ['-Wl,--as-needed'] + dpdk_libraries,
-	libraries_private: dpdk_extra_ldflags)
+        version: meson.project_version(),
+        subdirs: [get_option('include_subdir_arch'), '.'],
+        extra_cflags: pkg_extra_cflags,
+        libraries: ['-Wl,--as-needed'] + dpdk_libraries,
+        libraries_private: dpdk_extra_ldflags)
 
 platform_flags = []
 if not is_windows
-	platform_flags += ['-Wl,--export-dynamic'] # ELF only
+    platform_flags += ['-Wl,--export-dynamic'] # ELF only
 endif
 pkg.generate(name: 'DPDK', # main DPDK pkgconfig file
-	filebase: 'libdpdk',
-	version: meson.project_version(),
-	description: '''The Data Plane Development Kit (DPDK).
+        filebase: 'libdpdk',
+        version: meson.project_version(),
+        description: '''The Data Plane Development Kit (DPDK).
 Note that CFLAGS might contain an -march flag higher than typical baseline.
 This is required for a number of static inline functions in the public headers.''',
-	requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
-	                  # if libbsd is not enabled, then this is blank
-	libraries_private: ['-Wl,--whole-archive'] +
-			dpdk_drivers + dpdk_static_libraries +
-			['-Wl,--no-whole-archive'] + platform_flags
+        requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
+                      # if libbsd is not enabled, then this is blank
+        libraries_private: ['-Wl,--whole-archive'] +
+            dpdk_drivers + dpdk_static_libraries +
+            ['-Wl,--no-whole-archive'] + platform_flags
 )
 
 # For static linking with dependencies as shared libraries,
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 86cdb9b53b..400b80eafc 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -5,22 +5,22 @@
 
 # common flags to all aarch64 builds, with lowest priority
 flags_common = [
-	# Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
-	# to determine the best threshold in code. Refer to notes in source file
-	# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
-	['RTE_ARCH_ARM64_MEMCPY', false],
-	#	['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
-	#	['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
-	# Leave below RTE_ARM64_MEMCPY_xxx options commented out,
-	# unless there are strong reasons.
-	#	['RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK', false],
-	#	['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
-	#	['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
-
-	['RTE_SCHED_VECTOR', false],
-	['RTE_ARM_USE_WFE', false],
-	['RTE_ARCH_ARM64', true],
-	['RTE_CACHE_LINE_SIZE', 128]
+        # Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
+        # to determine the best threshold in code. Refer to notes in source file
+        # (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
+        ['RTE_ARCH_ARM64_MEMCPY', false],
+        #    ['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
+        #    ['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
+        # Leave below RTE_ARM64_MEMCPY_xxx options commented out,
+        # unless there are strong reasons.
+        #    ['RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK', false],
+        #    ['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
+        #    ['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
+
+        ['RTE_SCHED_VECTOR', false],
+        ['RTE_ARM_USE_WFE', false],
+        ['RTE_ARCH_ARM64', true],
+        ['RTE_CACHE_LINE_SIZE', 128]
 ]
 
 ## Part numbers are specific to Arm implementers
@@ -29,427 +29,427 @@ flags_common = [
 # part number specific aarch64 flags have higher priority
 #     (will overwrite both common and implementer specific flags)
 implementer_generic = {
-	'description': 'Generic armv8',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_MAX_LCORE', 256],
-		['RTE_MAX_NUMA_NODES', 4]
-	],
-	'part_number_config': {
-		'generic': {'machine_args': ['-march=armv8-a+crc',
-					     '-moutline-atomics']}
-	}
+    'description': 'Generic armv8',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_MAX_LCORE', 256],
+        ['RTE_MAX_NUMA_NODES', 4]
+    ],
+    'part_number_config': {
+        'generic': {'machine_args': ['-march=armv8-a+crc',
+                         '-moutline-atomics']}
+    }
 }
 
 part_number_config_arm = {
-	'0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
-	'0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
-	'0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
-	'0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
-	'0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
-	'0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
-	'0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
-	'0xd0c': {
-		'machine_args':  ['-march=armv8.2-a+crypto',
-				  '-mcpu=neoverse-n1'],
-		'flags': [
-			['RTE_MACHINE', '"neoverse-n1"'],
-			['RTE_ARM_FEATURE_ATOMICS', true],
-			['RTE_MAX_MEM_MB', 1048576],
-			['RTE_MAX_LCORE', 160],
-			['RTE_MAX_NUMA_NODES', 2]
-		]
-	},
-	'0xd49': {
-		'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
-		'flags': [
-			['RTE_MACHINE', '"neoverse-n2"'],
-			['RTE_ARM_FEATURE_ATOMICS', true],
-			['RTE_MAX_LCORE', 64],
-			['RTE_MAX_NUMA_NODES', 1]
-		]
-	}
+    '0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
+    '0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
+    '0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
+    '0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
+    '0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
+    '0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
+    '0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
+    '0xd0c': {
+        'machine_args':  ['-march=armv8.2-a+crypto',
+                  '-mcpu=neoverse-n1'],
+        'flags': [
+            ['RTE_MACHINE', '"neoverse-n1"'],
+            ['RTE_ARM_FEATURE_ATOMICS', true],
+            ['RTE_MAX_MEM_MB', 1048576],
+            ['RTE_MAX_LCORE', 160],
+            ['RTE_MAX_NUMA_NODES', 2]
+        ]
+    },
+    '0xd49': {
+        'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
+        'flags': [
+            ['RTE_MACHINE', '"neoverse-n2"'],
+            ['RTE_ARM_FEATURE_ATOMICS', true],
+            ['RTE_MAX_LCORE', 64],
+            ['RTE_MAX_NUMA_NODES', 1]
+        ]
+    }
 }
 implementer_arm = {
-	'description': 'Arm',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 64],
-		['RTE_MAX_NUMA_NODES', 4]
-	],
-	'part_number_config': part_number_config_arm
+    'description': 'Arm',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 64],
+        ['RTE_MAX_NUMA_NODES', 4]
+    ],
+    'part_number_config': part_number_config_arm
 }
 
 flags_part_number_thunderx = [
-	['RTE_MACHINE', '"thunderx"'],
-	['RTE_USE_C11_MEM_MODEL', false]
+    ['RTE_MACHINE', '"thunderx"'],
+    ['RTE_USE_C11_MEM_MODEL', false]
 ]
 implementer_cavium = {
-	'description': 'Cavium',
-	'flags': [
-		['RTE_MAX_VFIO_GROUPS', 128],
-		['RTE_MAX_LCORE', 96],
-		['RTE_MAX_NUMA_NODES', 2]
-	],
-	'part_number_config': {
-		'0xa1': {
-			'machine_args': ['-mcpu=thunderxt88'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xa2': {
-			'machine_args': ['-mcpu=thunderxt81'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xa3': {
-			'machine_args': ['-mcpu=thunderxt83'],
-			'flags': flags_part_number_thunderx
-		},
-		'0xaf': {
-			'machine_args': ['-march=armv8.1-a+crc+crypto',
-					 '-mcpu=thunderx2t99'],
-			'flags': [
-				['RTE_MACHINE', '"thunderx2"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_USE_C11_MEM_MODEL', true],
-				['RTE_CACHE_LINE_SIZE', 64],
-				['RTE_MAX_LCORE', 256]
-			]
-		},
-		'0xb2': {
-			'machine_args': ['-march=armv8.2-a+crc+crypto+lse',
-					 '-mcpu=octeontx2'],
-			'flags': [
-				['RTE_MACHINE', '"octeontx2"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_USE_C11_MEM_MODEL', true],
-				['RTE_MAX_LCORE', 36],
-				['RTE_MAX_NUMA_NODES', 1]
-			]
-		}
-	}
+    'description': 'Cavium',
+    'flags': [
+        ['RTE_MAX_VFIO_GROUPS', 128],
+        ['RTE_MAX_LCORE', 96],
+        ['RTE_MAX_NUMA_NODES', 2]
+    ],
+    'part_number_config': {
+        '0xa1': {
+            'machine_args': ['-mcpu=thunderxt88'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xa2': {
+            'machine_args': ['-mcpu=thunderxt81'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xa3': {
+            'machine_args': ['-mcpu=thunderxt83'],
+            'flags': flags_part_number_thunderx
+        },
+        '0xaf': {
+            'machine_args': ['-march=armv8.1-a+crc+crypto',
+                     '-mcpu=thunderx2t99'],
+            'flags': [
+                ['RTE_MACHINE', '"thunderx2"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_USE_C11_MEM_MODEL', true],
+                ['RTE_CACHE_LINE_SIZE', 64],
+                ['RTE_MAX_LCORE', 256]
+            ]
+        },
+        '0xb2': {
+            'machine_args': ['-march=armv8.2-a+crc+crypto+lse',
+                     '-mcpu=octeontx2'],
+            'flags': [
+                ['RTE_MACHINE', '"octeontx2"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_USE_C11_MEM_MODEL', true],
+                ['RTE_MAX_LCORE', 36],
+                ['RTE_MAX_NUMA_NODES', 1]
+            ]
+        }
+    }
 }
 
 implementer_ampere = {
-	'description': 'Ampere Computing',
-	'flags': [
-		['RTE_MACHINE', '"emag"'],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 32],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': {
-		'0x0': {'machine_args':  ['-march=armv8-a+crc+crypto',
-					  '-mtune=emag']}
-	}
+    'description': 'Ampere Computing',
+    'flags': [
+        ['RTE_MACHINE', '"emag"'],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 32],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': {
+        '0x0': {'machine_args':  ['-march=armv8-a+crc+crypto',
+                      '-mtune=emag']}
+    }
 }
 
 implementer_hisilicon = {
-	'description': 'HiSilicon',
-	'flags': [
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 128]
-	],
-	'part_number_config': {
-		'0xd01': {
-			'machine_args': ['-march=armv8.2-a+crypto',
-					 '-mtune=tsv110'],
-			'flags': [
-				['RTE_MACHINE', '"Kunpeng 920"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_MAX_LCORE', 256],
-				['RTE_MAX_NUMA_NODES', 8]
-			]
-		},
-		'0xd02': {
-			'machine_args': ['-march=armv8.2-a+crypto+sve'],
-			'flags': [
-				['RTE_MACHINE', '"Kunpeng 930"'],
-				['RTE_ARM_FEATURE_ATOMICS', true],
-				['RTE_MAX_LCORE', 1280],
-				['RTE_MAX_NUMA_NODES', 16]
-			]
-		}
-	}
+    'description': 'HiSilicon',
+    'flags': [
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 128]
+    ],
+    'part_number_config': {
+        '0xd01': {
+            'machine_args': ['-march=armv8.2-a+crypto',
+                     '-mtune=tsv110'],
+            'flags': [
+                ['RTE_MACHINE', '"Kunpeng 920"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_MAX_LCORE', 256],
+                ['RTE_MAX_NUMA_NODES', 8]
+            ]
+        },
+        '0xd02': {
+            'machine_args': ['-march=armv8.2-a+crypto+sve'],
+            'flags': [
+                ['RTE_MACHINE', '"Kunpeng 930"'],
+                ['RTE_ARM_FEATURE_ATOMICS', true],
+                ['RTE_MAX_LCORE', 1280],
+                ['RTE_MAX_NUMA_NODES', 16]
+            ]
+        }
+    }
 }
 
 implementer_qualcomm = {
-	'description': 'Qualcomm',
-	'flags': [
-		['RTE_MACHINE', '"armv8a"'],
-		['RTE_USE_C11_MEM_MODEL', true],
-		['RTE_CACHE_LINE_SIZE', 64],
-		['RTE_MAX_LCORE', 64],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number_config': {
-		'0xc00': {'machine_args':  ['-march=armv8-a+crc']}
-	}
+    'description': 'Qualcomm',
+    'flags': [
+        ['RTE_MACHINE', '"armv8a"'],
+        ['RTE_USE_C11_MEM_MODEL', true],
+        ['RTE_CACHE_LINE_SIZE', 64],
+        ['RTE_MAX_LCORE', 64],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number_config': {
+        '0xc00': {'machine_args':  ['-march=armv8-a+crc']}
+    }
 }
 
 ## Arm implementers (ID from MIDR in Arm Architecture Reference Manual)
 implementers = {
-	'generic': implementer_generic,
-	'0x41': implementer_arm,
-	'0x43': implementer_cavium,
-	'0x48': implementer_hisilicon,
-	'0x50': implementer_ampere,
-	'0x51': implementer_qualcomm
+    'generic': implementer_generic,
+    '0x41': implementer_arm,
+    '0x43': implementer_cavium,
+    '0x48': implementer_hisilicon,
+    '0x50': implementer_ampere,
+    '0x51': implementer_qualcomm
 }
 
 # SoC specific aarch64 flags have the highest priority
 #     (will overwrite all other flags)
 soc_generic = {
-	'description': 'Generic un-optimized build for all aarch64 machines',
-	'implementer': 'generic',
-	'part_number': 'generic'
+    'description': 'Generic un-optimized build for all aarch64 machines',
+    'implementer': 'generic',
+    'part_number': 'generic'
 }
 
 soc_armada = {
-	'description': 'Marvell ARMADA',
-	'implementer': '0x41',
-	'part_number': '0xd08',
-	'flags': [
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'numa': false
+    'description': 'Marvell ARMADA',
+    'implementer': '0x41',
+    'part_number': '0xd08',
+    'flags': [
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'numa': false
 }
 
 soc_bluefield = {
-	'description': 'NVIDIA BlueField',
-	'implementer': '0x41',
-	'part_number': '0xd08',
-	'flags': [
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'numa': false
+    'description': 'NVIDIA BlueField',
+    'implementer': '0x41',
+    'part_number': '0xd08',
+    'flags': [
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'numa': false
 }
 
 soc_dpaa = {
-	'description': 'NXP DPAA',
-	'implementer': '0x41',
-	'part_number': '0xd08',
-	'flags': [
-		['RTE_MACHINE', '"dpaa"'],
-		['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false],
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'numa': false
+    'description': 'NXP DPAA',
+    'implementer': '0x41',
+    'part_number': '0xd08',
+    'flags': [
+        ['RTE_MACHINE', '"dpaa"'],
+        ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false],
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'numa': false
 }
 
 soc_emag = {
-	'description': 'Ampere eMAG',
-	'implementer': '0x50',
-	'part_number': '0x0'
+    'description': 'Ampere eMAG',
+    'implementer': '0x50',
+    'part_number': '0x0'
 }
 
 soc_graviton2 = {
-	'description': 'AWS Graviton2',
-	'implementer': '0x41',
-	'part_number': '0xd0c',
-	'numa': false
+    'description': 'AWS Graviton2',
+    'implementer': '0x41',
+    'part_number': '0xd0c',
+    'numa': false
 }
 
 soc_kunpeng920 = {
-	'description': 'HiSilicon Kunpeng 920',
-	'implementer': '0x48',
-	'part_number': '0xd01',
-	'numa': true
+    'description': 'HiSilicon Kunpeng 920',
+    'implementer': '0x48',
+    'part_number': '0xd01',
+    'numa': true
 }
 
 soc_kunpeng930 = {
-	'description': 'HiSilicon Kunpeng 930',
-	'implementer': '0x48',
-	'part_number': '0xd02',
-	'numa': true
+    'description': 'HiSilicon Kunpeng 930',
+    'implementer': '0x48',
+    'part_number': '0xd02',
+    'numa': true
 }
 
 soc_n1sdp = {
-	'description': 'Arm Neoverse N1SDP',
-	'implementer': '0x41',
-	'part_number': '0xd0c',
-	'flags': [
-		['RTE_MAX_LCORE', 4]
-	],
-	'numa': false
+    'description': 'Arm Neoverse N1SDP',
+    'implementer': '0x41',
+    'part_number': '0xd0c',
+    'flags': [
+        ['RTE_MAX_LCORE', 4]
+    ],
+    'numa': false
 }
 
 soc_n2 = {
-	'description': 'Arm Neoverse N2',
-	'implementer': '0x41',
-	'part_number': '0xd49',
-	'numa': false
+    'description': 'Arm Neoverse N2',
+    'implementer': '0x41',
+    'part_number': '0xd49',
+    'numa': false
 }
 
 soc_octeontx2 = {
-	'description': 'Marvell OCTEON TX2',
-	'implementer': '0x43',
-	'part_number': '0xb2',
-	'numa': false
+    'description': 'Marvell OCTEON TX2',
+    'implementer': '0x43',
+    'part_number': '0xb2',
+    'numa': false
 }
 
 soc_stingray = {
-	'description': 'Broadcom Stingray',
-	'implementer': '0x41',
-	'flags': [
-		['RTE_MAX_LCORE', 16],
-		['RTE_MAX_NUMA_NODES', 1]
-	],
-	'part_number': '0xd08',
-	'numa': false
+    'description': 'Broadcom Stingray',
+    'implementer': '0x41',
+    'flags': [
+        ['RTE_MAX_LCORE', 16],
+        ['RTE_MAX_NUMA_NODES', 1]
+    ],
+    'part_number': '0xd08',
+    'numa': false
 }
 
 soc_thunderx2 = {
-	'description': 'Marvell ThunderX2 T99',
-	'implementer': '0x43',
-	'part_number': '0xaf'
+    'description': 'Marvell ThunderX2 T99',
+    'implementer': '0x43',
+    'part_number': '0xaf'
 }
 
 soc_thunderxt88 = {
-	'description': 'Marvell ThunderX T88',
-	'implementer': '0x43',
-	'part_number': '0xa1'
+    'description': 'Marvell ThunderX T88',
+    'implementer': '0x43',
+    'part_number': '0xa1'
 }
 
 socs = {
-	'generic': soc_generic,
-	'armada': soc_armada,
-	'bluefield': soc_bluefield,
-	'dpaa': soc_dpaa,
-	'emag': soc_emag,
-	'graviton2': soc_graviton2,
-	'kunpeng920': soc_kunpeng920,
-	'kunpeng930': soc_kunpeng930,
-	'n1sdp': soc_n1sdp,
-	'n2': soc_n2,
-	'octeontx2': soc_octeontx2,
-	'stingray': soc_stingray,
-	'thunderx2': soc_thunderx2,
-	'thunderxt88': soc_thunderxt88
+    'generic': soc_generic,
+    'armada': soc_armada,
+    'bluefield': soc_bluefield,
+    'dpaa': soc_dpaa,
+    'emag': soc_emag,
+    'graviton2': soc_graviton2,
+    'kunpeng920': soc_kunpeng920,
+    'kunpeng930': soc_kunpeng930,
+    'n1sdp': soc_n1sdp,
+    'n2': soc_n2,
+    'octeontx2': soc_octeontx2,
+    'stingray': soc_stingray,
+    'thunderx2': soc_thunderx2,
+    'thunderxt88': soc_thunderxt88
 }
 
 dpdk_conf.set('RTE_ARCH_ARM', 1)
 dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
 
 if dpdk_conf.get('RTE_ARCH_32')
-	# armv7 build
-	dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
-	dpdk_conf.set('RTE_ARCH_ARMv7', 1)
-	# the minimum architecture supported, armv7-a, needs the following,
-	machine_args += '-mfpu=neon'
+    # armv7 build
+    dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
+    dpdk_conf.set('RTE_ARCH_ARMv7', 1)
+    # the minimum architecture supported, armv7-a, needs the following,
+    machine_args += '-mfpu=neon'
 else
-	# aarch64 build
-	soc = get_option('platform')
-	soc_config = {}
-	if not meson.is_cross_build()
-		if machine == 'generic'
-			# generic build
-			if soc != ''
-				error('Building for a particular platform is ' +
-				      'unsupported with generic build.')
-			endif
-			implementer_id = 'generic'
-			part_number = 'generic'
-		elif soc != ''
-			soc_config = socs.get(soc, {'not_supported': true})
-		else
-			# native build
-			# The script returns ['Implementer', 'Variant', 'Architecture',
-			# 'Primary Part number', 'Revision']
-			detect_vendor = find_program(join_paths(
-					meson.current_source_dir(), 'armv8_machine.py'))
-			cmd = run_command(detect_vendor.path())
-			if cmd.returncode() == 0
-				cmd_output = cmd.stdout().to_lower().strip().split(' ')
-				implementer_id = cmd_output[0]
-				part_number = cmd_output[3]
-			else
-				error('Error when getting Arm Implementer ID and part number.')
-			endif
-		endif
-	else
-		# cross build
-		soc = meson.get_cross_property('platform', '')
-		if soc == ''
-			error('Arm SoC must be specified in the cross file.')
-		endif
-		soc_config = socs.get(soc, {'not_supported': true})
-	endif
-
-	soc_flags = []
-	if soc_config.has_key('not_supported')
-		error('SoC @0@ not supported.'.format(soc))
-	elif soc_config != {}
-		implementer_id = soc_config['implementer']
-		implementer_config = implementers[implementer_id]
-		part_number = soc_config['part_number']
-		soc_flags = soc_config.get('flags', [])
-		if not soc_config.get('numa', true)
-			has_libnuma = 0
-		endif
-
-		disable_drivers += ',' + soc_config.get('disable_drivers', '')
-		enable_drivers += ',' + soc_config.get('enable_drivers', '')
-	endif
-
-	if implementers.has_key(implementer_id)
-		implementer_config = implementers[implementer_id]
-	else
-		error('Unsupported Arm implementer: @0@. '.format(implementer_id) +
-		      'Please add support for it or use the generic ' +
-		      '(-Dmachine=generic) build.')
-	endif
-
-	message('Arm implementer: ' + implementer_config['description'])
-	message('Arm part number: ' + part_number)
-
-	part_number_config = implementer_config['part_number_config']
-	if part_number_config.has_key(part_number)
-		# use the specified part_number machine args if found
-		part_number_config = part_number_config[part_number]
-	else
-		# unknown part number
-		error('Unsupported part number @0@ of implementer @1@. '
-		      .format(part_number, implementer_id) +
-		      'Please add support for it or use the generic ' +
-		      '(-Dmachine=generic) build.')
-	endif
-
-	# add/overwrite flags in the proper order
-	dpdk_flags = flags_common + implementer_config['flags'] + part_number_config.get('flags', []) + soc_flags
-
-	# apply supported machine args
-	machine_args = [] # Clear previous machine args
-	foreach flag: part_number_config['machine_args']
-		if cc.has_argument(flag)
-			machine_args += flag
-		endif
-	endforeach
-
-	# apply flags
-	foreach flag: dpdk_flags
-		if flag.length() > 0
-			dpdk_conf.set(flag[0], flag[1])
-		endif
-	endforeach
+    # aarch64 build
+    soc = get_option('platform')
+    soc_config = {}
+    if not meson.is_cross_build()
+        if machine == 'generic'
+            # generic build
+            if soc != ''
+                error('Building for a particular platform is unsupported with generic build.')
+            endif
+            implementer_id = 'generic'
+            part_number = 'generic'
+        elif soc != ''
+            soc_config = socs.get(soc, {'not_supported': true})
+        else
+            # native build
+            # The script returns ['Implementer', 'Variant', 'Architecture',
+            # 'Primary Part number', 'Revision']
+            detect_vendor = find_program(join_paths(meson.current_source_dir(), 'armv8_machine.py'))
+            cmd = run_command(detect_vendor.path())
+            if cmd.returncode() == 0
+                cmd_output = cmd.stdout().to_lower().strip().split(' ')
+                implementer_id = cmd_output[0]
+                part_number = cmd_output[3]
+            else
+                error('Error when getting Arm Implementer ID and part number.')
+            endif
+        endif
+    else
+        # cross build
+        soc = meson.get_cross_property('platform', '')
+        if soc == ''
+            error('Arm SoC must be specified in the cross file.')
+        endif
+        soc_config = socs.get(soc, {'not_supported': true})
+    endif
+
+    soc_flags = []
+    if soc_config.has_key('not_supported')
+        error('SoC @0@ not supported.'.format(soc))
+    elif soc_config != {}
+        implementer_id = soc_config['implementer']
+        implementer_config = implementers[implementer_id]
+        part_number = soc_config['part_number']
+        soc_flags = soc_config.get('flags', [])
+        if not soc_config.get('numa', true)
+            has_libnuma = 0
+        endif
+
+        disable_drivers += ',' + soc_config.get('disable_drivers', '')
+        enable_drivers += ',' + soc_config.get('enable_drivers', '')
+    endif
+
+    if implementers.has_key(implementer_id)
+        implementer_config = implementers[implementer_id]
+    else
+        error('Unsupported Arm implementer: @0@. '.format(implementer_id) +
+              'Please add support for it or use the generic ' +
+              '(-Dmachine=generic) build.')
+    endif
+
+    message('Arm implementer: ' + implementer_config['description'])
+    message('Arm part number: ' + part_number)
+
+    part_number_config = implementer_config['part_number_config']
+    if part_number_config.has_key(part_number)
+        # use the specified part_number machine args if found
+        part_number_config = part_number_config[part_number]
+    else
+        # unknown part number
+        error('Unsupported part number @0@ of implementer @1@. '
+              .format(part_number, implementer_id) +
+              'Please add support for it or use the generic ' +
+              '(-Dmachine=generic) build.')
+    endif
+
+    # add/overwrite flags in the proper order
+    dpdk_flags = flags_common + implementer_config['flags'] + part_number_config.get('flags', []) + soc_flags
+
+    # apply supported machine args
+    machine_args = [] # Clear previous machine args
+    foreach flag: part_number_config['machine_args']
+        if cc.has_argument(flag)
+            machine_args += flag
+        endif
+    endforeach
+
+    # apply flags
+    foreach flag: dpdk_flags
+        if flag.length() > 0
+            dpdk_conf.set(flag[0], flag[1])
+        endif
+    endforeach
 endif
 message('Using machine args: @0@'.format(machine_args))
 
 if (cc.get_define('__ARM_NEON', args: machine_args) != '' or
-    cc.get_define('__aarch64__', args: machine_args) != '')
-	compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
+        cc.get_define('__aarch64__', args: machine_args) != '')
+    compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
 endif
 
 if cc.get_define('__ARM_FEATURE_CRC32', args: machine_args) != ''
-	compile_time_cpuflags += ['RTE_CPUFLAG_CRC32']
+    compile_time_cpuflags += ['RTE_CPUFLAG_CRC32']
 endif
 
 if cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != ''
-	compile_time_cpuflags += ['RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',
-	'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2']
+    compile_time_cpuflags += [
+           'RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',
+           'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2',
+    ]
 endif
diff --git a/config/meson.build b/config/meson.build
index 6e6ef8c0e1..9e49abc0f8 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -5,13 +5,13 @@
 supported_exec_envs = ['freebsd', 'linux', 'windows']
 exec_env = host_machine.system()
 if not supported_exec_envs.contains(exec_env)
-	error('unsupported system type "@0@"'.format(exec_env))
+    error('unsupported system type "@0@"'.format(exec_env))
 endif
 
 # define a handy variable for checking which OS we have.
 # gives us "is_windows", "is_freebsd" and "is_linux"
 foreach env:supported_exec_envs
-	set_variable('is_' + env, exec_env == env)
+    set_variable('is_' + env, exec_env == env)
 endforeach
 
 # MS linker requires special treatment.
@@ -22,8 +22,7 @@ is_ms_linker = is_windows and (cc.get_id() == 'clang')
 # depending on the configuration options
 pver = meson.project_version().split('.')
 major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
-abi_version = run_command(find_program('cat', 'more'),
-	abi_version_file).stdout().strip()
+abi_version = run_command(find_program('cat', 'more'), abi_version_file).stdout().strip()
 
 # Libraries have the abi_version as the filename extension
 # and have the soname be all but the final part of the abi_version.
@@ -35,21 +34,21 @@ so_version = abi_version.split('.')[0]
 dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
 dpdk_conf.set('RTE_VER_MONTH', pver.get(1).to_int())
 if pver.get(2).contains('-rc')
-	rc_ver = pver.get(2).split('-rc')
-	dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0).to_int())
-	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
-	dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1).to_int())
+    rc_ver = pver.get(2).split('-rc')
+    dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0).to_int())
+    dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
+    dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1).to_int())
 else
-	dpdk_conf.set('RTE_VER_MINOR', pver.get(2).to_int())
-	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
+    dpdk_conf.set('RTE_VER_MINOR', pver.get(2).to_int())
+    dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
 # for actual, non-rc releases, set the release value to 99 to ensure releases
 # have higher version numbers than their respective release candidates
-	dpdk_conf.set('RTE_VER_RELEASE', 99)
+    dpdk_conf.set('RTE_VER_RELEASE', 99)
 endif
 
 pmd_subdir_opt = get_option('drivers_install_subdir')
 if pmd_subdir_opt.contains('<VERSION>')
-	pmd_subdir_opt = abi_version.join(pmd_subdir_opt.split('<VERSION>'))
+    pmd_subdir_opt = abi_version.join(pmd_subdir_opt.split('<VERSION>'))
 endif
 driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
 eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
@@ -58,9 +57,8 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
 # to be in the library path, so symlink the drivers from the main lib directory.
 if not is_windows
-	meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
-			get_option('libdir'),
-			pmd_subdir_opt)
+    meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
+            get_option('libdir'), pmd_subdir_opt)
 endif
 
 # init disable/enable driver lists that will be populated in different places
@@ -69,9 +67,9 @@ enable_drivers = ''
 
 # set the machine type and cflags for it
 if meson.is_cross_build()
-	machine = host_machine.cpu()
+    machine = host_machine.cpu()
 else
-	machine = get_option('machine')
+    machine = get_option('machine')
 endif
 
 # machine type 'generic' is special, it selects the per arch agreed common
@@ -82,17 +80,17 @@ endif
 # This can be bumped up by the DPDK project, but it can never be an
 # invariant like 'native'
 if machine == 'default' or machine == 'generic'
-	if host_machine.cpu_family().startswith('x86')
-		# matches the old pre-meson build systems generic machine
-		machine = 'corei7'
-	elif host_machine.cpu_family().startswith('arm')
-		machine = 'armv7-a'
-	elif host_machine.cpu_family().startswith('aarch')
-		# arm64 manages generic config in config/arm/meson.build
-		machine = 'generic'
-	elif host_machine.cpu_family().startswith('ppc')
-		machine = 'power8'
-	endif
+    if host_machine.cpu_family().startswith('x86')
+        # matches the old pre-meson build systems generic machine
+        machine = 'corei7'
+    elif host_machine.cpu_family().startswith('arm')
+        machine = 'armv7-a'
+    elif host_machine.cpu_family().startswith('aarch')
+        # arm64 manages generic config in config/arm/meson.build
+        machine = 'generic'
+    elif host_machine.cpu_family().startswith('ppc')
+        machine = 'power8'
+    endif
 endif
 
 dpdk_conf.set('RTE_MACHINE', machine)
@@ -100,10 +98,10 @@ machine_args = []
 
 # ppc64 does not support -march= at all, use -mcpu and -mtune for that
 if host_machine.cpu_family().startswith('ppc')
-	machine_args += '-mcpu=' + machine
-	machine_args += '-mtune=' + machine
+    machine_args += '-mcpu=' + machine
+    machine_args += '-mtune=' + machine
 else
-	machine_args += '-march=' + machine
+    machine_args += '-march=' + machine
 endif
 
 toolchain = cc.get_id()
@@ -114,88 +112,88 @@ dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8)
 dpdk_conf.set('RTE_ARCH_32', cc.sizeof('void *') == 4)
 
 if not is_windows
-	add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
+    add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
 endif
 
 # use pthreads if available for the platform
 if not is_windows
-	add_project_link_arguments('-pthread', language: 'c')
-	dpdk_extra_ldflags += '-pthread'
+    add_project_link_arguments('-pthread', language: 'c')
+    dpdk_extra_ldflags += '-pthread'
 endif
 
 # on some OS, maths functions are in a separate library
 if cc.find_library('m', required : false).found()
-	# some libs depend on maths lib
-	add_project_link_arguments('-lm', language: 'c')
-	dpdk_extra_ldflags += '-lm'
+    # some libs depend on maths lib
+    add_project_link_arguments('-lm', language: 'c')
+    dpdk_extra_ldflags += '-lm'
 endif
 
 if is_linux
-	link_lib = 'dl'
+    link_lib = 'dl'
 else
-	link_lib = ''
+    link_lib = ''
 endif
 
 # if link_lib is empty, do not add it to project properties
 if link_lib != ''
-	add_project_link_arguments('-l' + link_lib, language: 'c')
-	dpdk_extra_ldflags += '-l' + link_lib
+    add_project_link_arguments('-l' + link_lib, language: 'c')
+    dpdk_extra_ldflags += '-l' + link_lib
 endif
 
 # check for libraries used in multiple places in DPDK
 has_libnuma = 0
 find_libnuma = true
 if meson.is_cross_build() and not meson.get_cross_property('numa', true)
-	# don't look for libnuma if explicitly disabled in cross build
-	find_libnuma = false
+    # don't look for libnuma if explicitly disabled in cross build
+    find_libnuma = false
 endif
 if find_libnuma
-	numa_dep = cc.find_library('numa', required: false)
-	if numa_dep.found() and cc.has_header('numaif.h')
-		dpdk_conf.set10('RTE_HAS_LIBNUMA', true)
-		has_libnuma = 1
-		add_project_link_arguments('-lnuma', language: 'c')
-		dpdk_extra_ldflags += '-lnuma'
-	endif
+    numa_dep = cc.find_library('numa', required: false)
+    if numa_dep.found() and cc.has_header('numaif.h')
+        dpdk_conf.set10('RTE_HAS_LIBNUMA', true)
+        has_libnuma = 1
+        add_project_link_arguments('-lnuma', language: 'c')
+        dpdk_extra_ldflags += '-lnuma'
+    endif
 endif
 
 has_libfdt = 0
 fdt_dep = cc.find_library('libfdt', required: false)
 if fdt_dep.found() and cc.has_header('fdt.h')
-	dpdk_conf.set10('RTE_HAS_LIBFDT', true)
-	has_libfdt = 1
-	add_project_link_arguments('-lfdt', language: 'c')
-	dpdk_extra_ldflags += '-lfdt'
+    dpdk_conf.set10('RTE_HAS_LIBFDT', true)
+    has_libfdt = 1
+    add_project_link_arguments('-lfdt', language: 'c')
+    dpdk_extra_ldflags += '-lfdt'
 endif
 
 libexecinfo = cc.find_library('libexecinfo', required: false)
 if libexecinfo.found() and cc.has_header('execinfo.h')
-	add_project_link_arguments('-lexecinfo', language: 'c')
-	dpdk_extra_ldflags += '-lexecinfo'
+    add_project_link_arguments('-lexecinfo', language: 'c')
+    dpdk_extra_ldflags += '-lexecinfo'
 endif
 
 # check for libbsd
 libbsd = dependency('libbsd', required: false, method: 'pkg-config')
 if libbsd.found()
-	dpdk_conf.set('RTE_USE_LIBBSD', 1)
+    dpdk_conf.set('RTE_USE_LIBBSD', 1)
 endif
 
 # check for pcap
 pcap_dep = dependency('libpcap', required: false, method: 'pkg-config')
 if not pcap_dep.found()
-	# pcap got a pkg-config file only in 1.9.0
-	pcap_dep = cc.find_library('pcap', required: false)
+    # pcap got a pkg-config file only in 1.9.0
+    pcap_dep = cc.find_library('pcap', required: false)
 endif
 if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)
-	dpdk_conf.set('RTE_PORT_PCAP', 1)
-	dpdk_extra_ldflags += '-lpcap'
+    dpdk_conf.set('RTE_PORT_PCAP', 1)
+    dpdk_extra_ldflags += '-lpcap'
 endif
 
 # for clang 32-bit compiles we need libatomic for 64-bit atomic ops
 if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false
-	atomic_dep = cc.find_library('atomic', required: true)
-	add_project_link_arguments('-latomic', language: 'c')
-	dpdk_extra_ldflags += '-latomic'
+    atomic_dep = cc.find_library('atomic', required: true)
+    add_project_link_arguments('-latomic', language: 'c')
+    dpdk_extra_ldflags += '-latomic'
 endif
 
 # add -include rte_config to cflags
@@ -203,48 +201,48 @@ add_project_arguments('-include', 'rte_config.h', language: 'c')
 
 # enable extra warnings and disable any unwanted warnings
 warning_flags = [
-	# -Wall is added by meson by default, so add -Wextra only
-	'-Wextra',
-
-	# additional warnings in alphabetical order
-	'-Wcast-qual',
-	'-Wdeprecated',
-	'-Wformat',
-	'-Wformat-nonliteral',
-	'-Wformat-security',
-	'-Wmissing-declarations',
-	'-Wmissing-prototypes',
-	'-Wnested-externs',
-	'-Wold-style-definition',
-	'-Wpointer-arith',
-	'-Wsign-compare',
-	'-Wstrict-prototypes',
-	'-Wundef',
-	'-Wwrite-strings',
-
-	# globally disabled warnings
-	'-Wno-address-of-packed-member',
-	'-Wno-packed-not-aligned',
-	'-Wno-missing-field-initializers'
+        # -Wall is added by meson by default, so add -Wextra only
+        '-Wextra',
+
+        # additional warnings in alphabetical order
+        '-Wcast-qual',
+        '-Wdeprecated',
+        '-Wformat',
+        '-Wformat-nonliteral',
+        '-Wformat-security',
+        '-Wmissing-declarations',
+        '-Wmissing-prototypes',
+        '-Wnested-externs',
+        '-Wold-style-definition',
+        '-Wpointer-arith',
+        '-Wsign-compare',
+        '-Wstrict-prototypes',
+        '-Wundef',
+        '-Wwrite-strings',
+
+        # globally disabled warnings
+        '-Wno-address-of-packed-member',
+        '-Wno-packed-not-aligned',
+        '-Wno-missing-field-initializers',
 ]
 if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0')
 # FIXME: Bugzilla 396
-	warning_flags += '-Wno-zero-length-bounds'
+    warning_flags += '-Wno-zero-length-bounds'
 endif
 if not dpdk_conf.get('RTE_ARCH_64')
 # for 32-bit, don't warn about casting a 32-bit pointer to 64-bit int - it's fine!!
-	warning_flags += '-Wno-pointer-to-int-cast'
+    warning_flags += '-Wno-pointer-to-int-cast'
 endif
 if cc.get_id() == 'intel'
-	warning_ids = [181, 188, 2203, 2279, 2557, 3179, 3656]
-	foreach i:warning_ids
-		warning_flags += '-diag-disable=@0@'.format(i)
-	endforeach
+    warning_ids = [181, 188, 2203, 2279, 2557, 3179, 3656]
+    foreach i:warning_ids
+        warning_flags += '-diag-disable=@0@'.format(i)
+    endforeach
 endif
 foreach arg: warning_flags
-	if cc.has_argument(arg)
-		add_project_arguments(arg, language: 'c')
-	endif
+    if cc.has_argument(arg)
+        add_project_arguments(arg, language: 'c')
+    endif
 endforeach
 
 # set other values pulled from the build options
@@ -258,9 +256,9 @@ dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
 dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
 dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
 if dpdk_conf.get('RTE_ARCH_64')
-	dpdk_conf.set('RTE_MAX_MEM_MB', 524288)
+    dpdk_conf.set('RTE_MAX_MEM_MB', 524288)
 else # for 32-bit we need smaller reserved memory areas
-	dpdk_conf.set('RTE_MAX_MEM_MB', 2048)
+    dpdk_conf.set('RTE_MAX_MEM_MB', 2048)
 endif
 
 
@@ -270,24 +268,24 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 
 # apply cross-specific options
 if meson.is_cross_build()
-	# configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
-	cross_max_lcores = meson.get_cross_property('max_lcores', 0)
-	if cross_max_lcores != 0
-		message('Setting RTE_MAX_LCORE from cross file')
-		dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
-	endif
-	cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
-	if cross_max_numa_nodes != 0
-		message('Setting RTE_MAX_NUMA_NODES from cross file')
-		dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
-	endif
+    # configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
+    cross_max_lcores = meson.get_cross_property('max_lcores', 0)
+    if cross_max_lcores != 0
+        message('Setting RTE_MAX_LCORE from cross file')
+        dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
+    endif
+    cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
+    if cross_max_numa_nodes != 0
+        message('Setting RTE_MAX_NUMA_NODES from cross file')
+        dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
+    endif
 endif
 
 # set the install path for the drivers
 dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
 
 install_headers(['rte_config.h'],
-		subdir: get_option('include_subdir_arch'))
+        subdir: get_option('include_subdir_arch'))
 
 # enable VFIO only if it is linux OS
 dpdk_conf.set('RTE_EAL_VFIO', is_linux)
@@ -297,53 +295,53 @@ add_project_arguments('-D_GNU_SOURCE', language: 'c')
 
 # specify -D__BSD_VISIBLE for FreeBSD
 if is_freebsd
-	add_project_arguments('-D__BSD_VISIBLE', language: 'c')
+    add_project_arguments('-D__BSD_VISIBLE', language: 'c')
 endif
 
 if is_windows
-	# VirtualAlloc2() is available since Windows 10 / Server 2016.
-	add_project_arguments('-D_WIN32_WINNT=0x0A00', language: 'c')
+    # VirtualAlloc2() is available since Windows 10 / Server 2016.
+    add_project_arguments('-D_WIN32_WINNT=0x0A00', language: 'c')
 
-	# Use MinGW-w64 stdio, because DPDK assumes ANSI-compliant formatting.
-	if cc.get_id() == 'gcc'
-		add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
-	endif
+    # Use MinGW-w64 stdio, because DPDK assumes ANSI-compliant formatting.
+    if cc.get_id() == 'gcc'
+        add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
+    endif
 
-	# Disable secure CRT deprecated warnings for clang
-	if cc.get_id() == 'clang'
-		add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
-	endif
+    # Disable secure CRT deprecated warnings for clang
+    if cc.get_id() == 'clang'
+        add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
+    endif
 
-	add_project_link_arguments('-lws2_32', language: 'c')
+    add_project_link_arguments('-lws2_32', language: 'c')
 
-	# Contrary to docs, VirtualAlloc2() is exported by mincore.lib
-	# in Windows SDK, while MinGW exports it by advapi32.a.
-	if is_ms_linker
-		add_project_link_arguments('-lmincore', language: 'c')
-	endif
+    # Contrary to docs, VirtualAlloc2() is exported by mincore.lib
+    # in Windows SDK, while MinGW exports it by advapi32.a.
+    if is_ms_linker
+        add_project_link_arguments('-lmincore', language: 'c')
+    endif
 
-	add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
-	add_project_link_arguments('-ldbghelp', language: 'c')
+    add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
+    add_project_link_arguments('-ldbghelp', language: 'c')
 endif
 
 if get_option('b_lto')
-	if cc.has_argument('-ffat-lto-objects')
-		add_project_arguments('-ffat-lto-objects', language: 'c')
-	else
-		error('compiler does not support fat LTO objects - please turn LTO off')
-	endif
-	# workaround for gcc bug 81440
-	if cc.get_id() == 'gcc' and cc.version().version_compare('<8.0')
-		add_project_arguments('-Wno-lto-type-mismatch', language: 'c')
-		add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c')
-	endif
+    if cc.has_argument('-ffat-lto-objects')
+        add_project_arguments('-ffat-lto-objects', language: 'c')
+    else
+        error('compiler does not support fat LTO objects - please turn LTO off')
+    endif
+    # workaround for gcc bug 81440
+    if cc.get_id() == 'gcc' and cc.version().version_compare('<8.0')
+        add_project_arguments('-Wno-lto-type-mismatch', language: 'c')
+        add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c')
+    endif
 endif
 
 if get_option('default_library') == 'both'
-	error( '''
-    Unsupported value "both" for "default_library" option.
+    error( '''
+ Unsupported value "both" for "default_library" option.
 
-    NOTE: DPDK always builds both shared and static libraries.  Please set
-    "default_library" to either "static" or "shared" to select default linkage
-    for apps and any examples.''')
+ NOTE: DPDK always builds both shared and static libraries.  Please set
+ "default_library" to either "static" or "shared" to select default linkage
+ for apps and any examples.''')
 endif
diff --git a/config/ppc/meson.build b/config/ppc/meson.build
index 0d8da87e6f..1c196b8db5 100644
--- a/config/ppc/meson.build
+++ b/config/ppc/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	error('Only 64-bit compiles are supported for this platform type')
+    error('Only 64-bit compiles are supported for this platform type')
 endif
 dpdk_conf.set('RTE_ARCH', 'ppc_64')
 dpdk_conf.set('RTE_ARCH_PPC_64', 1)
@@ -12,9 +12,9 @@ dpdk_conf.set('RTE_ARCH_PPC_64', 1)
 # is used, resulting in a build failure.
 power9_supported = cc.has_argument('-mcpu=power9')
 if not power9_supported
-	machine = 'power8'
-	machine_args = ['-mcpu=power8', '-mtune=power8']
-	dpdk_conf.set('RTE_MACHINE','power8')
+    machine = 'power8'
+    machine_args = ['-mcpu=power8', '-mtune=power8']
+    dpdk_conf.set('RTE_MACHINE','power8')
 endif
 
 # overrides specific to ppc64
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 31bfa63b1c..34b1164810 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -3,57 +3,57 @@
 
 # get binutils version for the workaround of Bug 97
 if not is_windows
-	binutils_ok = run_command(binutils_avx512_check)
-	if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
-		machine_args += '-mno-avx512f'
-		warning('Binutils error with AVX512 assembly, disabling AVX512 support')
-	endif
+    binutils_ok = run_command(binutils_avx512_check)
+    if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
+        machine_args += '-mno-avx512f'
+        warning('Binutils error with AVX512 assembly, disabling AVX512 support')
+    endif
 endif
 
 # we require SSE4.2 for DPDK
 if cc.get_define('__SSE4_2__', args: machine_args) == ''
-	message('SSE 4.2 not enabled by default, explicitly enabling')
-	machine_args += '-msse4'
+    message('SSE 4.2 not enabled by default, explicitly enabling')
+    machine_args += '-msse4'
 endif
 
 base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2']
 foreach f:base_flags
-	compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
 endforeach
 
 optional_flags = [
-	'AES',
-	'AVX',
-	'AVX2',
-	'AVX512BW',
-	'AVX512CD',
-	'AVX512DQ',
-	'AVX512F',
-	'AVX512VL',
-	'PCLMUL',
-	'RDRND',
-	'RDSEED',
-	'VPCLMULQDQ',
+    'AES',
+    'AVX',
+    'AVX2',
+    'AVX512BW',
+    'AVX512CD',
+    'AVX512DQ',
+    'AVX512F',
+    'AVX512VL',
+    'PCLMUL',
+    'RDRND',
+    'RDSEED',
+    'VPCLMULQDQ',
 ]
 foreach f:optional_flags
-	if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
-		if f == 'PCLMUL' # special case flags with different defines
-			f = 'PCLMULQDQ'
-		elif f == 'RDRND'
-			f = 'RDRAND'
-		endif
-		compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
-	endif
+    if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
+        if f == 'PCLMUL' # special case flags with different defines
+            f = 'PCLMULQDQ'
+        elif f == 'RDRND'
+            f = 'RDRAND'
+        endif
+        compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    endif
 endforeach
 
 
 dpdk_conf.set('RTE_ARCH_X86', 1)
 if dpdk_conf.get('RTE_ARCH_64')
-	dpdk_conf.set('RTE_ARCH_X86_64', 1)
-	dpdk_conf.set('RTE_ARCH', 'x86_64')
+    dpdk_conf.set('RTE_ARCH_X86_64', 1)
+    dpdk_conf.set('RTE_ARCH', 'x86_64')
 else
-	dpdk_conf.set('RTE_ARCH_I686', 1)
-	dpdk_conf.set('RTE_ARCH', 'i686')
+    dpdk_conf.set('RTE_ARCH_I686', 1)
+    dpdk_conf.set('RTE_ARCH', 'i686')
 endif
 
 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index dfdefdc924..d34c383694 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -23,12 +23,12 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 # false it would be impossible to install the docs.
 # So use a configure option for now.
 example = custom_target('examples.dox',
-	output: 'examples.dox',
-	command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
-	depfile: 'examples.dox.d',
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+        output: 'examples.dox',
+        command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
+        depfile: 'examples.dox.d',
+        install: get_option('enable_docs'),
+        install_dir: htmldir,
+        build_by_default: get_option('enable_docs'))
 
 cdata = configuration_data()
 cdata.set('VERSION', meson.project_version())
@@ -39,23 +39,23 @@ cdata.set('TOPDIR', meson.source_root())
 cdata.set('STRIP_FROM_PATH', meson.source_root())
 cdata.set('WARN_AS_ERROR', 'NO')
 if get_option('werror')
-	cdata.set('WARN_AS_ERROR', 'YES')
+    cdata.set('WARN_AS_ERROR', 'YES')
 endif
 
 doxy_conf = configure_file(input: 'doxy-api.conf.in',
-	output: 'doxy-api.conf',
-	configuration: cdata)
+        output: 'doxy-api.conf',
+        configuration: cdata)
 
 doxy_build = custom_target('doxygen',
-	depends: example,
-	depend_files: 'doxy-api-index.md',
-	input: doxy_conf,
-	output: 'html',
-	depfile: 'html.d',
-	command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+        depends: example,
+        depend_files: 'doxy-api-index.md',
+        input: doxy_conf,
+        output: 'html',
+        depfile: 'html.d',
+        command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
+        install: get_option('enable_docs'),
+        install_dir: htmldir,
+        build_by_default: get_option('enable_docs'))
 
 doc_targets += doxy_build
 doc_target_names += 'Doxygen_API'
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
index 9c35efb5b2..03b8bee567 100644
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -4,28 +4,27 @@
 sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
 
 if not sphinx.found()
-	subdir_done()
+    subdir_done()
 endif
 
 extra_sphinx_args = []
 if get_option('werror')
-	extra_sphinx_args += '-W'
+    extra_sphinx_args += '-W'
 endif
 
 htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 html_guides = custom_target('html_guides',
-	input: files('index.rst'),
-	output: 'html',
-	command: [sphinx_wrapper, sphinx, meson.project_version(),
-		meson.current_source_dir(), meson.current_build_dir(),
-		extra_sphinx_args],
-	depfile: '.html.d',
-	build_by_default: get_option('enable_docs'),
-	install: get_option('enable_docs'),
-	install_dir: htmldir)
+        input: files('index.rst'),
+        output: 'html',
+        command: [sphinx_wrapper, sphinx, meson.project_version(),
+            meson.current_source_dir(), meson.current_build_dir(),
+            extra_sphinx_args],
+        depfile: '.html.d',
+        build_by_default: get_option('enable_docs'),
+        install: get_option('enable_docs'),
+        install_dir: htmldir)
 
-install_data(files('custom.css'),
-			install_dir: join_paths(htmldir,'_static', 'css'))
+install_data(files('custom.css'), install_dir: join_paths(htmldir,'_static', 'css'))
 
 doc_targets += html_guides
 doc_target_names += 'HTML_Guides'
diff --git a/doc/meson.build b/doc/meson.build
index c5410d85d6..959606b965 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -7,9 +7,9 @@ subdir('api')
 subdir('guides')
 
 if doc_targets.length() == 0
-	message = 'No docs targets found'
+    message = 'No docs targets found'
 else
-	message = 'Building docs:'
+    message = 'Building docs:'
 endif
 run_target('doc', command: ['echo', message, doc_target_names],
-	depends: doc_targets)
+    depends: doc_targets)
diff --git a/kernel/freebsd/meson.build b/kernel/freebsd/meson.build
index dc156a43fd..bf5aa20a55 100644
--- a/kernel/freebsd/meson.build
+++ b/kernel/freebsd/meson.build
@@ -10,26 +10,26 @@ kmods = ['contigmem', 'nic_uio']
 # files from the individual meson.build files, and then use a custom
 # target to call make, passing in the values as env parameters.
 kmod_cflags = ['-I' + meson.build_root(),
-		'-I' + join_paths(meson.source_root(), 'config'),
-		'-include rte_config.h']
+        '-I' + join_paths(meson.source_root(), 'config'),
+        '-include rte_config.h']
 
 # to avoid warnings due to race conditions with creating the dev_if.h, etc.
 # files, serialize the kernel module builds. Each module will depend on
 # previous ones
 built_kmods = []
 foreach k:kmods
-	subdir(k)
-	built_kmods += custom_target(k,
-		input: [files('BSDmakefile.meson'), sources],
-		output: k + '.ko',
-		command: ['make', '-f', '@INPUT0@',
-			'KMOD_OBJDIR=@OUTDIR@',
-			'KMOD_SRC=@INPUT1@',
-			'KMOD=' + k,
-			'KMOD_CFLAGS=' + ' '.join(kmod_cflags),
-			'CC=clang'],
-		depends: built_kmods, # make each module depend on prev
-		build_by_default: get_option('enable_kmods'),
-		install: get_option('enable_kmods'),
-		install_dir: '/boot/modules/')
+    subdir(k)
+    built_kmods += custom_target(k,
+            input: [files('BSDmakefile.meson'), sources],
+            output: k + '.ko',
+            command: ['make', '-f', '@INPUT0@',
+                'KMOD_OBJDIR=@OUTDIR@',
+                'KMOD_SRC=@INPUT1@',
+                'KMOD=' + k,
+                'KMOD_CFLAGS=' + ' '.join(kmod_cflags),
+                'CC=clang'],
+            depends: built_kmods, # make each module depend on prev
+            build_by_default: get_option('enable_kmods'),
+            install: get_option('enable_kmods'),
+            install_dir: '/boot/modules/')
 endforeach
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index 46b71c7418..f43860bcbb 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -2,27 +2,28 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 kni_mkfile = custom_target('rte_kni_makefile',
-	output: 'Makefile',
-	command: ['touch', '@OUTPUT@'])
+        output: 'Makefile',
+        command: ['touch', '@OUTPUT@'])
 
 kni_sources = files(
-	'kni_misc.c',
-	'kni_net.c',
-	'Kbuild')
+        'kni_misc.c',
+        'kni_net.c',
+        'Kbuild',
+)
 
 custom_target('rte_kni',
-	input: kni_sources,
-	output: 'rte_kni.ko',
-	command: ['make', '-j4', '-C', kernel_build_dir,
-		'M=' + meson.current_build_dir(),
-		'src=' + meson.current_source_dir(),
-		'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
-		' -I' + meson.source_root() + '/lib/librte_eal/include' +
-		' -I' + meson.source_root() + '/lib/librte_kni' +
-		' -I' + meson.build_root() +
-		' -I' + meson.current_source_dir(),
-		'modules'] + cross_args,
-	depends: kni_mkfile,
-	install: install,
-	install_dir: kernel_install_dir,
-	build_by_default: get_option('enable_kmods'))
+        input: kni_sources,
+        output: 'rte_kni.ko',
+        command: ['make', '-j4', '-C', kernel_build_dir,
+            'M=' + meson.current_build_dir(),
+            'src=' + meson.current_source_dir(),
+            'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
+            ' -I' + meson.source_root() + '/lib/librte_eal/include' +
+            ' -I' + meson.source_root() + '/lib/librte_kni' +
+            ' -I' + meson.build_root() +
+            ' -I' + meson.current_source_dir(),
+            'modules'] + cross_args,
+        depends: kni_mkfile,
+        install: install,
+        install_dir: kernel_install_dir,
+        build_by_default: get_option('enable_kmods'))
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index b434706796..3a00ea954c 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -9,84 +9,83 @@ install = not meson.is_cross_build()
 cross_args = []
 
 if not meson.is_cross_build()
-	# native build
-	kernel_version = run_command('uname', '-r').stdout().strip()
-	kernel_install_dir = '/lib/modules/' + kernel_version + '/extra/dpdk'
-	if kernel_build_dir == ''
-		# use default path for native builds
-		kernel_build_dir = '/lib/modules/' + kernel_version + '/build'
-	endif
+    # native build
+    kernel_version = run_command('uname', '-r').stdout().strip()
+    kernel_install_dir = '/lib/modules/' + kernel_version + '/extra/dpdk'
+    if kernel_build_dir == ''
+        # use default path for native builds
+        kernel_build_dir = '/lib/modules/' + kernel_version + '/build'
+    endif
 
-	# test running make in kernel directory, using "make kernelversion"
-	make_returncode = run_command('make', '-sC', kernel_build_dir,
-			'kernelversion').returncode()
-	if make_returncode != 0
-		# backward compatibility:
-		# the headers could still be in the 'build' subdir
-		if not kernel_build_dir.endswith('build') and not kernel_build_dir.endswith('build/')
-			kernel_build_dir = join_paths(kernel_build_dir, 'build')
-			make_returncode = run_command('make', '-sC', kernel_build_dir,
-					'kernelversion').returncode()
-		endif
-	endif
+    # test running make in kernel directory, using "make kernelversion"
+    make_returncode = run_command('make', '-sC', kernel_build_dir,
+            'kernelversion').returncode()
+    if make_returncode != 0
+        # backward compatibility:
+        # the headers could still be in the 'build' subdir
+        if not kernel_build_dir.endswith('build') and not kernel_build_dir.endswith('build/')
+            kernel_build_dir = join_paths(kernel_build_dir, 'build')
+            make_returncode = run_command('make', '-sC', kernel_build_dir,
+                    'kernelversion').returncode()
+        endif
+    endif
 
-	if make_returncode != 0
-		error('Cannot compile kernel modules as requested - are kernel headers installed?')
-	endif
+    if make_returncode != 0
+        error('Cannot compile kernel modules as requested - are kernel headers installed?')
+    endif
 
-	# DO ACTUAL MODULE BUILDING
-	foreach d:subdirs
-		subdir(d)
-	endforeach
+    # DO ACTUAL MODULE BUILDING
+    foreach d:subdirs
+        subdir(d)
+    endforeach
 
-	subdir_done()
+    subdir_done()
 endif
 
 # cross build
 # if we are cross-compiling we need kernel_build_dir specified
 if kernel_build_dir == ''
-	error('Need "kernel_dir" option for kmod compilation when cross-compiling')
+    error('Need "kernel_dir" option for kmod compilation when cross-compiling')
 endif
 cross_compiler = find_program('c').path()
 if cross_compiler.endswith('gcc')
-	cross_prefix = run_command([py3, '-c', 'print("' + cross_compiler + '"[:-3])']).stdout().strip()
+    cross_prefix = run_command([py3, '-c', 'print("' + cross_compiler + '"[:-3])']).stdout().strip()
 elif cross_compiler.endswith('clang')
-	cross_prefix = ''
-	found_target = false
-	# search for '-target' and use the arg that follows
-	# (i.e. the value of '-target') as cross_prefix
-	foreach cross_c_arg : meson.get_cross_property('c_args')
-		if found_target and cross_prefix == ''
-			cross_prefix = cross_c_arg
-		endif
-		if cross_c_arg == '-target'
-			found_target = true
-		endif
-	endforeach
-	if cross_prefix == ''
-		error('Didn\'t find -target and its value in' +
-		      ' c_args in input cross-file.')
-	endif
-	linker = 'lld'
-	foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
-		if cross_c_link_arg.startswith('-fuse-ld')
-			linker = cross_c_link_arg.split('=')[1]
-		endif
-	endforeach
-	cross_args += ['CC=@0@'.format(cross_compiler), 'LD=ld.@0@'.format(linker)]
+    cross_prefix = ''
+    found_target = false
+    # search for '-target' and use the arg that follows
+    # (i.e. the value of '-target') as cross_prefix
+    foreach cross_c_arg : meson.get_cross_property('c_args')
+        if found_target and cross_prefix == ''
+            cross_prefix = cross_c_arg
+        endif
+        if cross_c_arg == '-target'
+            found_target = true
+        endif
+    endforeach
+    if cross_prefix == ''
+        error('Did not find -target and its value in c_args in input cross-file.')
+    endif
+    linker = 'lld'
+    foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
+        if cross_c_link_arg.startswith('-fuse-ld')
+            linker = cross_c_link_arg.split('=')[1]
+        endif
+    endforeach
+    cross_args += ['CC=@0@'.format(cross_compiler), 'LD=ld.@0@'.format(linker)]
 else
-	error('Unsupported cross compiler: @0@'.format(cross_compiler))
+    error('Unsupported cross compiler: @0@'.format(cross_compiler))
 endif
 
 cross_arch = host_machine.cpu_family()
 if host_machine.cpu_family() == 'aarch64'
-	cross_arch = 'arm64'
+    cross_arch = 'arm64'
 endif
 
 cross_args += ['ARCH=@0@'.format(cross_arch),
-	'CROSS_COMPILE=@0@'.format(cross_prefix)]
+        'CROSS_COMPILE=@0@'.format(cross_prefix)]
 
 # DO ACTUAL MODULE BUILDING
 foreach d:subdirs
-	subdir(d)
+    subdir(d)
 endforeach
diff --git a/meson.build b/meson.build
index 6289a6839b..13412780cd 100644
--- a/meson.build
+++ b/meson.build
@@ -2,27 +2,27 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 project('DPDK', 'C',
-	# Get version number from file.
-	# Fallback to "more" for Windows compatibility.
-	version: run_command(find_program('cat', 'more'),
-		files('VERSION')).stdout().strip(),
-	license: 'BSD',
-	default_options: ['buildtype=release', 'default_library=static'],
-	meson_version: '>= 0.49.2'
+        # Get version number from file.
+        # Fallback to "more" for Windows compatibility.
+        version: run_command(find_program('cat', 'more'),
+            files('VERSION')).stdout().strip(),
+        license: 'BSD',
+        default_options: ['buildtype=release', 'default_library=static'],
+        meson_version: '>= 0.49.2'
 )
 
 # check for developer mode
 developer_mode = false
 if get_option('developer_mode').auto()
-	if meson.version().version_compare('>=0.53') # fs module available
-		fs = import('fs')
-		developer_mode = fs.is_dir('.git')
-	endif
+    if meson.version().version_compare('>=0.53') # fs module available
+        fs = import('fs')
+        developer_mode = fs.is_dir('.git')
+    endif
 else
-	developer_mode = get_option('developer_mode').enabled()
+    developer_mode = get_option('developer_mode').enabled()
 endif
 if developer_mode
-	message('## Building in Developer Mode ##')
+    message('## Building in Developer Mode ##')
 endif
 
 # set up some global vars for compiler, platform, configuration, etc.
@@ -39,20 +39,20 @@ dpdk_drvs_disabled = []
 abi_version_file = files('ABI_VERSION')
 
 if host_machine.cpu_family().startswith('x86')
-	arch_subdir = 'x86'
+    arch_subdir = 'x86'
 elif host_machine.cpu_family().startswith('arm') or host_machine.cpu_family().startswith('aarch')
-	arch_subdir = 'arm'
+    arch_subdir = 'arm'
 elif host_machine.cpu_family().startswith('ppc')
-	arch_subdir = 'ppc'
+    arch_subdir = 'ppc'
 endif
 
 # configure the build, and make sure configs here and in config folder are
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
 global_inc = include_directories('.', 'config',
-	'lib/librte_eal/include',
-	'lib/librte_eal/@0@/include'.format(host_machine.system()),
-	'lib/librte_eal/@0@/include'.format(arch_subdir),
+    'lib/librte_eal/include',
+    'lib/librte_eal/@0@/include'.format(host_machine.system()),
+    'lib/librte_eal/@0@/include'.format(arch_subdir),
 )
 
 # do configuration and get tool paths
@@ -74,25 +74,25 @@ subdir('doc')
 # install any example code into the appropriate install path
 subdir('examples')
 install_subdir('examples',
-	install_dir: get_option('datadir') + '/dpdk',
-	exclude_files: ex_file_excludes)
+        install_dir: get_option('datadir') + '/dpdk',
+        exclude_files: ex_file_excludes)
 
 # build kernel modules if enabled
 if get_option('enable_kmods')
-	subdir('kernel')
+    subdir('kernel')
 endif
 
 # check header includes if requested
 if get_option('check_includes')
-	subdir('buildtools/chkincs')
+    subdir('buildtools/chkincs')
 endif
 
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
-		configuration: dpdk_conf,
-		install_dir: join_paths(get_option('includedir'),
-				get_option('include_subdir_arch')))
+        configuration: dpdk_conf,
+        install_dir: join_paths(get_option('includedir'),
+            get_option('include_subdir_arch')))
 
 # build pkg-config files for dpdk
 subdir('buildtools/pkg-config')
@@ -103,40 +103,40 @@ output_message = '\n=================\nLibraries Enabled\n=================\n'
 output_message += '\nlibs:\n\t'
 output_count = 0
 foreach lib:enabled_libs
-	output_message += lib + ', '
-	output_count += 1
-	if output_count == 8
-		output_message += '\n\t'
-		output_count = 0
-	endif
+    output_message += lib + ', '
+    output_count += 1
+    if output_count == 8
+        output_message += '\n\t'
+        output_count = 0
+    endif
 endforeach
 message(output_message + '\n')
 
 output_message = '\n===============\nDrivers Enabled\n===============\n'
 foreach class:dpdk_driver_classes
-	class_drivers = get_variable(class + '_drivers')
-	output_message += '\n' + class + ':\n\t'
-	output_count = 0
-	foreach drv:class_drivers
-		output_message += drv + ', '
-		output_count += 1
-		if output_count == 8
-			output_message += '\n\t'
-			output_count = 0
-		endif
-	endforeach
+    class_drivers = get_variable(class + '_drivers')
+    output_message += '\n' + class + ':\n\t'
+    output_count = 0
+    foreach drv:class_drivers
+        output_message += drv + ', '
+        output_count += 1
+        if output_count == 8
+            output_message += '\n\t'
+            output_count = 0
+        endif
+    endforeach
 endforeach
 message(output_message + '\n')
 
 output_message = '\n=================\nContent Skipped\n=================\n'
 output_message += '\nlibs:\n\t'
 foreach lib:dpdk_libs_disabled
-	reason = get_variable(lib.underscorify() + '_disable_reason')
-	output_message += lib + ':\t' + reason + '\n\t'
+    reason = get_variable(lib.underscorify() + '_disable_reason')
+    output_message += lib + ':\t' + reason + '\n\t'
 endforeach
 output_message += '\ndrivers:\n\t'
 foreach drv:dpdk_drvs_disabled
-	reason = get_variable(drv.underscorify() + '_disable_reason')
-	output_message += drv + ':\t' + reason + '\n\t'
+    reason = get_variable(drv.underscorify() + '_disable_reason')
+    output_message += drv + ':\t' + reason + '\n\t'
 endforeach
 message(output_message + '\n')
diff --git a/meson_options.txt b/meson_options.txt
index b78f3bd9d5..530fcddfa1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,44 +1,44 @@
 # Please keep these options sorted alphabetically.
 
-option('check_includes', type: 'boolean', value: false,
-	description: 'build "chkincs" to verify each header file can compile alone')
-option('developer_mode', type: 'feature',
-	description: 'turn on additional build checks relevant for DPDK developers')
-option('disable_drivers', type: 'string', value: '',
-	description: 'Comma-separated list of drivers to explicitly disable.')
-option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
-	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
-option('enable_docs', type: 'boolean', value: false,
-	description: 'build documentation')
-option('enable_drivers', type: 'string', value: '',
-	description: 'Comma-separated list of drivers to build. If unspecified, build all drivers.')
-option('enable_driver_sdk', type: 'boolean', value: false,
-	description: 'Install headers to build drivers.')
-option('enable_kmods', type: 'boolean', value: false,
-	description: 'build kernel modules')
-option('examples', type: 'string', value: '',
-	description: 'Comma-separated list of examples to build by default')
-option('flexran_sdk', type: 'string', value: '',
-	description: 'Path to FlexRAN SDK optional Libraries for BBDEV device')
-option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared',
-	description: 'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
-option('include_subdir_arch', type: 'string', value: '',
-	description: 'subdirectory where to install arch-dependent headers')
-option('kernel_dir', type: 'string', value: '',
-	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
-option('machine', type: 'string', value: 'native',
-	description: 'set the target machine type or "generic", a build usable on all machines of the build machine architecture or "native", which lets the compiler pick the architecture of the build machine.')
-option('max_ethports', type: 'integer', value: 32,
-	description: 'maximum number of Ethernet devices')
-option('max_lcores', type: 'integer', value: 128,
-	description: 'maximum number of cores/threads supported by EAL')
-option('max_numa_nodes', type: 'integer', value: 32,
-	description: 'maximum number of NUMA nodes supported by EAL')
-option('platform', type: 'string', value: '',
-	description: 'use configuration for a particular platform (such as a SoC).')
-option('enable_trace_fp', type: 'boolean', value: false,
-	description: 'enable fast path trace points.')
-option('tests', type: 'boolean', value: true,
-	description: 'build unit tests')
-option('use_hpet', type: 'boolean', value: false,
-	description: 'use HPET timer in EAL')
+option('check_includes', type: 'boolean', value: false, description:
+        'build "chkincs" to verify each header file can compile alone')
+option('developer_mode', type: 'feature', description:
+        'turn on additional build checks relevant for DPDK developers')
+option('disable_drivers', type: 'string', value: '', description:
+        'Comma-separated list of drivers to explicitly disable.')
+option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', description:
+        'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
+option('enable_docs', type: 'boolean', value: false, description:
+        'build documentation')
+option('enable_drivers', type: 'string', value: '', description:
+        'Comma-separated list of drivers to build. If unspecified, build all drivers.')
+option('enable_driver_sdk', type: 'boolean', value: false, description:
+        'Install headers to build drivers.')
+option('enable_kmods', type: 'boolean', value: false, description:
+        'build kernel modules')
+option('examples', type: 'string', value: '', description:
+        'Comma-separated list of examples to build by default')
+option('flexran_sdk', type: 'string', value: '', description:
+        'Path to FlexRAN SDK optional Libraries for BBDEV device')
+option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared', description:
+        'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
+option('include_subdir_arch', type: 'string', value: '', description:
+        'subdirectory where to install arch-dependent headers')
+option('kernel_dir', type: 'string', value: '', description:
+        'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
+option('machine', type: 'string', value: 'native', description:
+        'set the target machine type or "generic", a build usable on all machines of the build machine architecture or "native", which lets the compiler pick the architecture of the build machine.')
+option('max_ethports', type: 'integer', value: 32, description:
+        'maximum number of Ethernet devices')
+option('max_lcores', type: 'integer', value: 128, description:
+        'maximum number of cores/threads supported by EAL')
+option('max_numa_nodes', type: 'integer', value: 32, description:
+        'maximum number of NUMA nodes supported by EAL')
+option('platform', type: 'string', value: '', description:
+        'use configuration for a particular platform (such as a SoC).')
+option('enable_trace_fp', type: 'boolean', value: false, description:
+        'enable fast path trace points.')
+option('tests', type: 'boolean', value: true, description:
+        'build unit tests')
+option('use_hpet', type: 'boolean', value: false, description:
+        'use HPET timer in EAL')
diff --git a/usertools/meson.build b/usertools/meson.build
index 596eaefb0e..b6271a207c 100644
--- a/usertools/meson.build
+++ b/usertools/meson.build
@@ -2,8 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 install_data([
-	'dpdk-devbind.py',
-	'dpdk-pmdinfo.py',
-	'dpdk-telemetry.py',
-	'dpdk-hugepages.py'
-],install_dir: 'bin')
+            'dpdk-devbind.py',
+            'dpdk-pmdinfo.py',
+            'dpdk-telemetry.py',
+            'dpdk-hugepages.py',
+        ],
+        install_dir: 'bin')
-- 
2.27.0

Re: [dpdk-dev] [PATCH v2 07/16] build: change infrastructure file tabs to spaces

[David Christensen]

On 4/20/21 3:22 AM, Bruce Richardson wrote:
> Switch from using tabs to 4 spaces for meson.build indentation, for the
> basic infrastructure and tooling files, as well as doc and kernel
> directories.
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>   buildtools/chkincs/meson.build    |  24 +-
>   buildtools/meson.build            |  34 +-
>   buildtools/pkg-config/meson.build |  34 +-
>   config/arm/meson.build            | 704 +++++++++++++++---------------
>   config/meson.build                | 286 ++++++------
>   config/ppc/meson.build            |   8 +-
>   config/x86/meson.build            |  64 +--
>   doc/api/meson.build               |  36 +-
>   doc/guides/meson.build            |  25 +-
>   doc/meson.build                   |   6 +-
>   kernel/freebsd/meson.build        |  32 +-
>   kernel/linux/kni/meson.build      |  41 +-
>   kernel/linux/meson.build          | 111 +++--
>   meson.build                       |  94 ++--
>   meson_options.txt                 |  84 ++--
>   usertools/meson.build             |  11 +-
>   16 files changed, 796 insertions(+), 798 deletions(-)

...

> diff --git a/config/ppc/meson.build b/config/ppc/meson.build
> index 0d8da87e6f..1c196b8db5 100644
> --- a/config/ppc/meson.build
> +++ b/config/ppc/meson.build
> @@ -2,7 +2,7 @@
>   # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
> 
>   if not dpdk_conf.get('RTE_ARCH_64')
> -	error('Only 64-bit compiles are supported for this platform type')
> +    error('Only 64-bit compiles are supported for this platform type')
>   endif
>   dpdk_conf.set('RTE_ARCH', 'ppc_64')
>   dpdk_conf.set('RTE_ARCH_PPC_64', 1)
> @@ -12,9 +12,9 @@ dpdk_conf.set('RTE_ARCH_PPC_64', 1)
>   # is used, resulting in a build failure.
>   power9_supported = cc.has_argument('-mcpu=power9')
>   if not power9_supported
> -	machine = 'power8'
> -	machine_args = ['-mcpu=power8', '-mtune=power8']
> -	dpdk_conf.set('RTE_MACHINE','power8')
> +    machine = 'power8'
> +    machine_args = ['-mcpu=power8', '-mtune=power8']
> +    dpdk_conf.set('RTE_MACHINE','power8')
>   endif
> 
>   # overrides specific to ppc64

Reviewed-by: David Christensen <drc@linux.vnet.ibm.com>

[dpdk-dev] [PATCH v2 08/16] lib: cleanup whitespace in meson build files

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation. Perform
other formating cleanups such as ensure that long lists of files are one
per line, and terminating with a final comma before the closing brace to
make addition/removals easier. In some cases, reorder lists of items
where they were not in alphabetical order.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_acl/meson.build             | 122 +++++++--------
 lib/librte_bbdev/meson.build           |   4 +-
 lib/librte_bpf/meson.build             |  22 +--
 lib/librte_cmdline/meson.build         |  44 +++---
 lib/librte_compressdev/meson.build     |  10 +-
 lib/librte_cryptodev/meson.build       |  12 +-
 lib/librte_distributor/meson.build     |   4 +-
 lib/librte_eal/arm/include/meson.build |  56 +++----
 lib/librte_eal/arm/meson.build         |   8 +-
 lib/librte_eal/common/meson.build      | 146 +++++++++---------
 lib/librte_eal/freebsd/meson.build     |  24 +--
 lib/librte_eal/include/meson.build     | 114 +++++++-------
 lib/librte_eal/linux/meson.build       |  32 ++--
 lib/librte_eal/meson.build             |   8 +-
 lib/librte_eal/ppc/include/meson.build |  32 ++--
 lib/librte_eal/ppc/meson.build         |   8 +-
 lib/librte_eal/unix/meson.build        |   8 +-
 lib/librte_eal/windows/meson.build     |  32 ++--
 lib/librte_eal/x86/include/meson.build |  43 +++---
 lib/librte_eal/x86/meson.build         |  10 +-
 lib/librte_ethdev/meson.build          |  52 ++++---
 lib/librte_eventdev/meson.build        |  40 ++---
 lib/librte_fib/meson.build             |  88 +++++------
 lib/librte_graph/meson.build           |   9 +-
 lib/librte_gro/meson.build             |   8 +-
 lib/librte_gso/meson.build             |  10 +-
 lib/librte_hash/meson.build            |  12 +-
 lib/librte_ip_frag/meson.build         |  14 +-
 lib/librte_kni/meson.build             |   4 +-
 lib/librte_lpm/meson.build             |   7 +-
 lib/librte_mbuf/meson.build            |  18 ++-
 lib/librte_mempool/meson.build         |  21 ++-
 lib/librte_metrics/meson.build         |   4 +-
 lib/librte_net/meson.build             | 201 +++++++++++++------------
 lib/librte_node/meson.build            |  13 +-
 lib/librte_pipeline/meson.build        |  28 ++--
 lib/librte_port/meson.build            |  68 ++++-----
 lib/librte_power/meson.build           |  29 ++--
 lib/librte_regexdev/meson.build        |   3 +-
 lib/librte_ring/meson.build            |  25 +--
 lib/librte_sched/meson.build           |   8 +-
 lib/librte_stack/meson.build           |   9 +-
 lib/librte_table/meson.build           |  66 ++++----
 lib/librte_vhost/meson.build           |  37 +++--
 44 files changed, 808 insertions(+), 705 deletions(-)

diff --git a/lib/librte_acl/meson.build b/lib/librte_acl/meson.build
index ee4e229e59..fbb1318230 100644
--- a/lib/librte_acl/meson.build
+++ b/lib/librte_acl/meson.build
@@ -2,82 +2,82 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
-		'rte_acl.c', 'tb_mem.c')
+        'rte_acl.c', 'tb_mem.c')
 headers = files('rte_acl.h', 'rte_acl_osdep.h')
 
 if dpdk_conf.has('RTE_ARCH_X86')
-	sources += files('acl_run_sse.c')
+    sources += files('acl_run_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	#
-	# in former case, just add avx2 C file to files list
-	# in latter case, compile c file to static lib, using correct compiler
-	# flags, and then have the .o file from static lib linked into main lib.
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		sources += files('acl_run_avx2.c')
-		cflags += '-DCC_AVX2_SUPPORT'
-	elif cc.has_argument('-mavx2')
-		avx2_tmplib = static_library('avx2_tmp',
-				'acl_run_avx2.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx2'])
-		objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
-		cflags += '-DCC_AVX2_SUPPORT'
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    #
+    # in former case, just add avx2 C file to files list
+    # in latter case, compile c file to static lib, using correct compiler
+    # flags, and then have the .o file from static lib linked into main lib.
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        sources += files('acl_run_avx2.c')
+        cflags += '-DCC_AVX2_SUPPORT'
+    elif cc.has_argument('-mavx2')
+        avx2_tmplib = static_library('avx2_tmp',
+                'acl_run_avx2.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx2'])
+        objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
+        cflags += '-DCC_AVX2_SUPPORT'
+    endif
 
-	# compile AVX512 version if:
-	# we are building 64-bit binary AND binutils can generate proper code
+    # compile AVX512 version if:
+    # we are building 64-bit binary AND binutils can generate proper code
 
-	if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
+    if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
 
-		# compile AVX512 version if either:
-		# a. we have AVX512 supported in minimum instruction set
-		#    baseline
-		# b. it's not minimum instruction set, but supported by
-		#    compiler
-		#
-		# in former case, just add avx512 C file to files list
-		# in latter case, compile c file to static lib, using correct
-		# compiler flags, and then have the .o file from static lib
-		# linked into main lib.
+        # compile AVX512 version if either:
+        # a. we have AVX512 supported in minimum instruction set
+        #    baseline
+        # b. it's not minimum instruction set, but supported by
+        #    compiler
+        #
+        # in former case, just add avx512 C file to files list
+        # in latter case, compile c file to static lib, using correct
+        # compiler flags, and then have the .o file from static lib
+        # linked into main lib.
 
-		# check if all required flags already enabled (variant a).
-		acl_avx512_flags = ['__AVX512F__', '__AVX512VL__',
-			'__AVX512CD__', '__AVX512BW__']
+        # check if all required flags already enabled (variant a).
+        acl_avx512_flags = ['__AVX512F__', '__AVX512VL__',
+            '__AVX512CD__', '__AVX512BW__']
 
-		acl_avx512_on = true
-		foreach f:acl_avx512_flags
+        acl_avx512_on = true
+        foreach f:acl_avx512_flags
 
-			if cc.get_define(f, args: machine_args) == ''
-				acl_avx512_on = false
-			endif
-		endforeach
+            if cc.get_define(f, args: machine_args) == ''
+                acl_avx512_on = false
+            endif
+        endforeach
 
-		if acl_avx512_on == true
+        if acl_avx512_on == true
 
-			sources += files('acl_run_avx512.c')
-			cflags += '-DCC_AVX512_SUPPORT'
+            sources += files('acl_run_avx512.c')
+            cflags += '-DCC_AVX512_SUPPORT'
 
-		elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
-					'-mavx512cd', '-mavx512bw')
+        elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
+                    '-mavx512cd', '-mavx512bw')
 
-			avx512_tmplib = static_library('avx512_tmp',
-				'acl_run_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags +
-					['-mavx512f', '-mavx512vl',
-					 '-mavx512cd', '-mavx512bw'])
-			objs += avx512_tmplib.extract_objects(
-					'acl_run_avx512.c')
-			cflags += '-DCC_AVX512_SUPPORT'
-		endif
-	endif
+            avx512_tmplib = static_library('avx512_tmp',
+                'acl_run_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags +
+                    ['-mavx512f', '-mavx512vl',
+                     '-mavx512cd', '-mavx512bw'])
+            objs += avx512_tmplib.extract_objects(
+                    'acl_run_avx512.c')
+            cflags += '-DCC_AVX512_SUPPORT'
+        endif
+    endif
 
 elif dpdk_conf.has('RTE_ARCH_ARM')
-	cflags += '-flax-vector-conversions'
-	sources += files('acl_run_neon.c')
+    cflags += '-flax-vector-conversions'
+    sources += files('acl_run_neon.c')
 elif dpdk_conf.has('RTE_ARCH_PPC_64')
-	sources += files('acl_run_altivec.c')
+    sources += files('acl_run_altivec.c')
 endif
diff --git a/lib/librte_bbdev/meson.build b/lib/librte_bbdev/meson.build
index 1267782203..2969cab26b 100644
--- a/lib/librte_bbdev/meson.build
+++ b/lib/librte_bbdev/meson.build
@@ -3,6 +3,6 @@
 
 sources = files('rte_bbdev.c')
 headers = files('rte_bbdev.h',
-		'rte_bbdev_pmd.h',
-		'rte_bbdev_op.h')
+        'rte_bbdev_pmd.h',
+        'rte_bbdev_op.h')
 deps += ['mbuf']
diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build
index 614277effd..63cbd60185 100644
--- a/lib/librte_bpf/meson.build
+++ b/lib/librte_bpf/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('bpf.c',
-		'bpf_exec.c',
-		'bpf_load.c',
-		'bpf_pkt.c',
-		'bpf_validate.c')
+        'bpf_exec.c',
+        'bpf_load.c',
+        'bpf_pkt.c',
+        'bpf_validate.c')
 
 if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('bpf_jit_x86.c')
+    sources += files('bpf_jit_x86.c')
 elif dpdk_conf.has('RTE_ARCH_ARM64')
-	sources += files('bpf_jit_arm64.c')
+    sources += files('bpf_jit_arm64.c')
 endif
 
 headers = files('bpf_def.h',
-		'rte_bpf.h',
-		'rte_bpf_ethdev.h')
+        'rte_bpf.h',
+        'rte_bpf_ethdev.h')
 
 deps += ['mbuf', 'net', 'ethdev']
 
 dep = dependency('libelf', required: false, method: 'pkg-config')
 if dep.found()
-	dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1)
-	sources += files('bpf_load_elf.c')
-	ext_deps += dep
+    dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1)
+    sources += files('bpf_load_elf.c')
+    ext_deps += dep
 endif
diff --git a/lib/librte_cmdline/meson.build b/lib/librte_cmdline/meson.build
index 5009b33542..63fb69100d 100644
--- a/lib/librte_cmdline/meson.build
+++ b/lib/librte_cmdline/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('cmdline.c',
-	'cmdline_cirbuf.c',
-	'cmdline_parse.c',
-	'cmdline_parse_etheraddr.c',
-	'cmdline_parse_ipaddr.c',
-	'cmdline_parse_num.c',
-	'cmdline_parse_portlist.c',
-	'cmdline_parse_string.c',
-	'cmdline_rdline.c',
-	'cmdline_socket.c',
-	'cmdline_vt100.c')
+    'cmdline_cirbuf.c',
+    'cmdline_parse.c',
+    'cmdline_parse_etheraddr.c',
+    'cmdline_parse_ipaddr.c',
+    'cmdline_parse_num.c',
+    'cmdline_parse_portlist.c',
+    'cmdline_parse_string.c',
+    'cmdline_rdline.c',
+    'cmdline_socket.c',
+    'cmdline_vt100.c')
 
 headers = files('cmdline.h',
-	'cmdline_parse.h',
-	'cmdline_parse_num.h',
-	'cmdline_parse_ipaddr.h',
-	'cmdline_parse_etheraddr.h',
-	'cmdline_parse_string.h',
-	'cmdline_rdline.h',
-	'cmdline_vt100.h',
-	'cmdline_socket.h',
-	'cmdline_cirbuf.h',
-	'cmdline_parse_portlist.h')
+    'cmdline_parse.h',
+    'cmdline_parse_num.h',
+    'cmdline_parse_ipaddr.h',
+    'cmdline_parse_etheraddr.h',
+    'cmdline_parse_string.h',
+    'cmdline_rdline.h',
+    'cmdline_vt100.h',
+    'cmdline_socket.h',
+    'cmdline_cirbuf.h',
+    'cmdline_parse_portlist.h')
 
 if is_windows
-	sources += files('cmdline_os_windows.c')
+    sources += files('cmdline_os_windows.c')
 else
-	sources += files('cmdline_os_unix.c')
+    sources += files('cmdline_os_unix.c')
 endif
 
 deps += ['net']
diff --git a/lib/librte_compressdev/meson.build b/lib/librte_compressdev/meson.build
index 7d95cd4f30..663ceec0b9 100644
--- a/lib/librte_compressdev/meson.build
+++ b/lib/librte_compressdev/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = files('rte_compressdev.c',
-	'rte_compressdev_pmd.c',
-	'rte_comp.c')
+    'rte_compressdev_pmd.c',
+    'rte_comp.c')
 headers = files('rte_compressdev.h',
-	'rte_compressdev_pmd.h',
-	'rte_compressdev_internal.h',
-	'rte_comp.h')
+    'rte_compressdev_pmd.h',
+    'rte_compressdev_internal.h',
+    'rte_comp.h')
 deps += ['kvargs', 'mbuf']
diff --git a/lib/librte_cryptodev/meson.build b/lib/librte_cryptodev/meson.build
index 8c5493f4cf..bec80beab3 100644
--- a/lib/librte_cryptodev/meson.build
+++ b/lib/librte_cryptodev/meson.build
@@ -3,10 +3,10 @@
 
 sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c', 'cryptodev_trace_points.c')
 headers = files('rte_cryptodev.h',
-	'rte_cryptodev_pmd.h',
-	'rte_cryptodev_trace.h',
-	'rte_cryptodev_trace_fp.h',
-	'rte_crypto.h',
-	'rte_crypto_sym.h',
-	'rte_crypto_asym.h')
+        'rte_cryptodev_pmd.h',
+        'rte_cryptodev_trace.h',
+        'rte_cryptodev_trace_fp.h',
+        'rte_crypto.h',
+        'rte_crypto_sym.h',
+        'rte_crypto_asym.h')
 deps += ['kvargs', 'mbuf', 'rcu']
diff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build
index bd12ddb2f1..cefe1b9f19 100644
--- a/lib/librte_distributor/meson.build
+++ b/lib/librte_distributor/meson.build
@@ -3,9 +3,9 @@
 
 sources = files('rte_distributor.c', 'rte_distributor_single.c')
 if arch_subdir == 'x86'
-	sources += files('rte_distributor_match_sse.c')
+    sources += files('rte_distributor_match_sse.c')
 else
-	sources += files('rte_distributor_match_generic.c')
+    sources += files('rte_distributor_match_generic.c')
 endif
 headers = files('rte_distributor.h')
 deps += ['mbuf']
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 2c3cff61be..65c3aec35c 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017 Intel Corporation.
 
 arch_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags_32.h',
-	'rte_cpuflags_64.h',
-	'rte_cpuflags.h',
-	'rte_cycles_32.h',
-	'rte_cycles_64.h',
-	'rte_cycles.h',
-	'rte_io_64.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy_32.h',
-	'rte_memcpy_64.h',
-	'rte_memcpy.h',
-	'rte_pause_32.h',
-	'rte_pause_64.h',
-	'rte_pause.h',
-	'rte_pflock.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch_32.h',
-	'rte_prefetch_64.h',
-	'rte_prefetch.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+        'rte_atomic_32.h',
+        'rte_atomic_64.h',
+        'rte_atomic.h',
+        'rte_byteorder.h',
+        'rte_cpuflags_32.h',
+        'rte_cpuflags_64.h',
+        'rte_cpuflags.h',
+        'rte_cycles_32.h',
+        'rte_cycles_64.h',
+        'rte_cycles.h',
+        'rte_io_64.h',
+        'rte_io.h',
+        'rte_mcslock.h',
+        'rte_memcpy_32.h',
+        'rte_memcpy_64.h',
+        'rte_memcpy.h',
+        'rte_pause_32.h',
+        'rte_pause_64.h',
+        'rte_pause.h',
+        'rte_pflock.h',
+        'rte_power_intrinsics.h',
+        'rte_prefetch_32.h',
+        'rte_prefetch_64.h',
+        'rte_prefetch.h',
+        'rte_rwlock.h',
+        'rte_spinlock.h',
+        'rte_ticketlock.h',
+        'rte_vect.h',
 )
 install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/arm/meson.build b/lib/librte_eal/arm/meson.build
index 6ec53ea03a..dca1106aae 100644
--- a/lib/librte_eal/arm/meson.build
+++ b/lib/librte_eal/arm/meson.build
@@ -4,8 +4,8 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_power_intrinsics.c',
+        'rte_cpuflags.c',
+        'rte_cycles.c',
+        'rte_hypervisor.c',
+        'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 70bd854fec..edfca77779 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -6,83 +6,83 @@ includes += include_directories('.')
 cflags += [ '-DABI_VERSION="@0@"'.format(abi_version) ]
 
 if is_windows
-	sources += files(
-		'eal_common_bus.c',
-		'eal_common_class.c',
-		'eal_common_config.c',
-		'eal_common_debug.c',
-		'eal_common_dev.c',
-		'eal_common_devargs.c',
-		'eal_common_dynmem.c',
-		'eal_common_errno.c',
-		'eal_common_fbarray.c',
-		'eal_common_hexdump.c',
-		'eal_common_launch.c',
-		'eal_common_lcore.c',
-		'eal_common_log.c',
-		'eal_common_mcfg.c',
-		'eal_common_memalloc.c',
-		'eal_common_memory.c',
-		'eal_common_memzone.c',
-		'eal_common_options.c',
-		'eal_common_string_fns.c',
-		'eal_common_tailqs.c',
-		'eal_common_thread.c',
-		'eal_common_trace_points.c',
-		'malloc_elem.c',
-		'malloc_heap.c',
-		'rte_malloc.c',
-		'eal_common_timer.c',
-		'rte_random.c',
-		'rte_reciprocal.c',
-		'rte_service.c',
-		'rte_version.c',
-	)
-	subdir_done()
+    sources += files(
+            'eal_common_bus.c',
+            'eal_common_class.c',
+            'eal_common_config.c',
+            'eal_common_debug.c',
+            'eal_common_dev.c',
+            'eal_common_devargs.c',
+            'eal_common_dynmem.c',
+            'eal_common_errno.c',
+            'eal_common_fbarray.c',
+            'eal_common_hexdump.c',
+            'eal_common_launch.c',
+            'eal_common_lcore.c',
+            'eal_common_log.c',
+            'eal_common_mcfg.c',
+            'eal_common_memalloc.c',
+            'eal_common_memory.c',
+            'eal_common_memzone.c',
+            'eal_common_options.c',
+            'eal_common_string_fns.c',
+            'eal_common_tailqs.c',
+            'eal_common_thread.c',
+            'eal_common_trace_points.c',
+            'malloc_elem.c',
+            'malloc_heap.c',
+            'rte_malloc.c',
+            'eal_common_timer.c',
+            'rte_random.c',
+            'rte_reciprocal.c',
+            'rte_service.c',
+            'rte_version.c',
+    )
+    subdir_done()
 endif
 
 sources += files(
-	'eal_common_bus.c',
-	'eal_common_cpuflags.c',
-	'eal_common_class.c',
-	'eal_common_config.c',
-	'eal_common_debug.c',
-	'eal_common_devargs.c',
-	'eal_common_dev.c',
-	'eal_common_errno.c',
-	'eal_common_fbarray.c',
-	'eal_common_hexdump.c',
-	'eal_common_hypervisor.c',
-	'eal_common_launch.c',
-	'eal_common_lcore.c',
-	'eal_common_log.c',
-	'eal_common_mcfg.c',
-	'eal_common_memalloc.c',
-	'eal_common_memory.c',
-	'eal_common_memzone.c',
-	'eal_common_options.c',
-	'eal_common_proc.c',
-	'eal_common_string_fns.c',
-	'eal_common_tailqs.c',
-	'eal_common_thread.c',
-	'eal_common_timer.c',
-	'eal_common_trace.c',
-	'eal_common_trace_ctf.c',
-	'eal_common_trace_points.c',
-	'eal_common_trace_utils.c',
-	'eal_common_uuid.c',
-	'hotplug_mp.c',
-	'malloc_elem.c',
-	'malloc_heap.c',
-	'malloc_mp.c',
-	'rte_keepalive.c',
-	'rte_malloc.c',
-	'rte_random.c',
-	'rte_reciprocal.c',
-	'rte_service.c',
-	'rte_version.c',
+        'eal_common_bus.c',
+        'eal_common_cpuflags.c',
+        'eal_common_class.c',
+        'eal_common_config.c',
+        'eal_common_debug.c',
+        'eal_common_devargs.c',
+        'eal_common_dev.c',
+        'eal_common_errno.c',
+        'eal_common_fbarray.c',
+        'eal_common_hexdump.c',
+        'eal_common_hypervisor.c',
+        'eal_common_launch.c',
+        'eal_common_lcore.c',
+        'eal_common_log.c',
+        'eal_common_mcfg.c',
+        'eal_common_memalloc.c',
+        'eal_common_memory.c',
+        'eal_common_memzone.c',
+        'eal_common_options.c',
+        'eal_common_proc.c',
+        'eal_common_string_fns.c',
+        'eal_common_tailqs.c',
+        'eal_common_thread.c',
+        'eal_common_timer.c',
+        'eal_common_trace.c',
+        'eal_common_trace_ctf.c',
+        'eal_common_trace_points.c',
+        'eal_common_trace_utils.c',
+        'eal_common_uuid.c',
+        'hotplug_mp.c',
+        'malloc_elem.c',
+        'malloc_heap.c',
+        'malloc_mp.c',
+        'rte_keepalive.c',
+        'rte_malloc.c',
+        'rte_random.c',
+        'rte_reciprocal.c',
+        'rte_service.c',
+        'rte_version.c',
 )
 
 if is_linux
-	sources += files('eal_common_dynmem.c')
+    sources += files('eal_common_dynmem.c')
 endif
diff --git a/lib/librte_eal/freebsd/meson.build b/lib/librte_eal/freebsd/meson.build
index e10fd8a16d..398ceab71d 100644
--- a/lib/librte_eal/freebsd/meson.build
+++ b/lib/librte_eal/freebsd/meson.build
@@ -4,18 +4,18 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_cpuflags.c',
-	'eal_debug.c',
-	'eal_dev.c',
-	'eal_hugepage_info.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_thread.c',
-	'eal_timer.c',
+        'eal.c',
+        'eal_alarm.c',
+        'eal_cpuflags.c',
+        'eal_debug.c',
+        'eal_dev.c',
+        'eal_hugepage_info.c',
+        'eal_interrupts.c',
+        'eal_lcore.c',
+        'eal_memalloc.c',
+        'eal_memory.c',
+        'eal_thread.c',
+        'eal_timer.c',
 )
 
 deps += ['kvargs', 'telemetry']
diff --git a/lib/librte_eal/include/meson.build b/lib/librte_eal/include/meson.build
index 3969cf4ac7..88a9eba12f 100644
--- a/lib/librte_eal/include/meson.build
+++ b/lib/librte_eal/include/meson.build
@@ -4,67 +4,67 @@
 includes += include_directories('.')
 
 headers += files(
-	'rte_alarm.h',
-	'rte_bitmap.h',
-	'rte_bitops.h',
-	'rte_branch_prediction.h',
-	'rte_bus.h',
-	'rte_class.h',
-	'rte_common.h',
-	'rte_compat.h',
-	'rte_debug.h',
-	'rte_dev.h',
-	'rte_devargs.h',
-	'rte_eal.h',
-	'rte_eal_memconfig.h',
-	'rte_eal_trace.h',
-	'rte_errno.h',
-	'rte_fbarray.h',
-	'rte_hexdump.h',
-	'rte_hypervisor.h',
-	'rte_interrupts.h',
-	'rte_keepalive.h',
-	'rte_launch.h',
-	'rte_lcore.h',
-	'rte_log.h',
-	'rte_malloc.h',
-	'rte_memory.h',
-	'rte_memzone.h',
-	'rte_pci_dev_feature_defs.h',
-	'rte_pci_dev_features.h',
-	'rte_per_lcore.h',
-	'rte_random.h',
-	'rte_reciprocal.h',
-	'rte_service.h',
-	'rte_service_component.h',
-	'rte_string_fns.h',
-	'rte_tailq.h',
-	'rte_thread.h',
-	'rte_time.h',
-	'rte_trace.h',
-	'rte_trace_point.h',
-	'rte_trace_point_register.h',
-	'rte_uuid.h',
-	'rte_version.h',
-	'rte_vfio.h',
+        'rte_alarm.h',
+        'rte_bitmap.h',
+        'rte_bitops.h',
+        'rte_branch_prediction.h',
+        'rte_bus.h',
+        'rte_class.h',
+        'rte_common.h',
+        'rte_compat.h',
+        'rte_debug.h',
+        'rte_dev.h',
+        'rte_devargs.h',
+        'rte_eal.h',
+        'rte_eal_memconfig.h',
+        'rte_eal_trace.h',
+        'rte_errno.h',
+        'rte_fbarray.h',
+        'rte_hexdump.h',
+        'rte_hypervisor.h',
+        'rte_interrupts.h',
+        'rte_keepalive.h',
+        'rte_launch.h',
+        'rte_lcore.h',
+        'rte_log.h',
+        'rte_malloc.h',
+        'rte_memory.h',
+        'rte_memzone.h',
+        'rte_pci_dev_feature_defs.h',
+        'rte_pci_dev_features.h',
+        'rte_per_lcore.h',
+        'rte_random.h',
+        'rte_reciprocal.h',
+        'rte_service.h',
+        'rte_service_component.h',
+        'rte_string_fns.h',
+        'rte_tailq.h',
+        'rte_thread.h',
+        'rte_time.h',
+        'rte_trace.h',
+        'rte_trace_point.h',
+        'rte_trace_point_register.h',
+        'rte_uuid.h',
+        'rte_version.h',
+        'rte_vfio.h',
 )
 indirect_headers += files('rte_eal_interrupts.h')
 
 # special case install the generic headers, since they go in a subdir
 generic_headers = files(
-	'generic/rte_atomic.h',
-	'generic/rte_byteorder.h',
-	'generic/rte_cpuflags.h',
-	'generic/rte_cycles.h',
-	'generic/rte_io.h',
-	'generic/rte_mcslock.h',
-	'generic/rte_memcpy.h',
-	'generic/rte_pause.h',
-	'generic/rte_power_intrinsics.h',
-	'generic/rte_prefetch.h',
-	'generic/rte_rwlock.h',
-	'generic/rte_spinlock.h',
-	'generic/rte_ticketlock.h',
-	'generic/rte_vect.h',
+        'generic/rte_atomic.h',
+        'generic/rte_byteorder.h',
+        'generic/rte_cpuflags.h',
+        'generic/rte_cycles.h',
+        'generic/rte_io.h',
+        'generic/rte_mcslock.h',
+        'generic/rte_memcpy.h',
+        'generic/rte_pause.h',
+        'generic/rte_power_intrinsics.h',
+        'generic/rte_prefetch.h',
+        'generic/rte_rwlock.h',
+        'generic/rte_spinlock.h',
+        'generic/rte_ticketlock.h',
+        'generic/rte_vect.h',
 )
 install_headers(generic_headers, subdir: 'generic')
diff --git a/lib/librte_eal/linux/meson.build b/lib/librte_eal/linux/meson.build
index 7742aa4759..65f2ac6b47 100644
--- a/lib/librte_eal/linux/meson.build
+++ b/lib/librte_eal/linux/meson.build
@@ -4,24 +4,24 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_cpuflags.c',
-	'eal_debug.c',
-	'eal_dev.c',
-	'eal_hugepage_info.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_log.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_thread.c',
-	'eal_timer.c',
-	'eal_vfio.c',
-	'eal_vfio_mp_sync.c',
+        'eal.c',
+        'eal_alarm.c',
+        'eal_cpuflags.c',
+        'eal_debug.c',
+        'eal_dev.c',
+        'eal_hugepage_info.c',
+        'eal_interrupts.c',
+        'eal_lcore.c',
+        'eal_log.c',
+        'eal_memalloc.c',
+        'eal_memory.c',
+        'eal_thread.c',
+        'eal_timer.c',
+        'eal_vfio.c',
+        'eal_vfio_mp_sync.c',
 )
 
 deps += ['kvargs', 'telemetry']
 if has_libnuma == 1
-	dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
+    dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
 endif
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 7d6222e781..1722924f67 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -7,7 +7,7 @@ subdir('include')
 subdir('common')
 
 if not is_windows
-	subdir('unix')
+    subdir('unix')
 endif
 
 dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
@@ -17,11 +17,11 @@ subdir(arch_subdir)
 
 deps += ['kvargs']
 if not is_windows
-	deps += ['telemetry']
+    deps += ['telemetry']
 endif
 if dpdk_conf.has('RTE_USE_LIBBSD')
-	ext_deps += libbsd
+    ext_deps += libbsd
 endif
 if cc.has_function('getentropy', prefix : '#include <unistd.h>')
-	cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
+    cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
 endif
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index 7692a531cc..1e1f39c05a 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -2,21 +2,21 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 arch_headers = files(
-	'rte_altivec.h',
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags.h',
-	'rte_cycles.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy.h',
-	'rte_pause.h',
-	'rte_pflock.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+        'rte_altivec.h',
+        'rte_atomic.h',
+        'rte_byteorder.h',
+        'rte_cpuflags.h',
+        'rte_cycles.h',
+        'rte_io.h',
+        'rte_mcslock.h',
+        'rte_memcpy.h',
+        'rte_pause.h',
+        'rte_pflock.h',
+        'rte_power_intrinsics.h',
+        'rte_prefetch.h',
+        'rte_rwlock.h',
+        'rte_spinlock.h',
+        'rte_ticketlock.h',
+        'rte_vect.h',
 )
 install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/ppc/meson.build b/lib/librte_eal/ppc/meson.build
index 43c46542fb..71c7ac870d 100644
--- a/lib/librte_eal/ppc/meson.build
+++ b/lib/librte_eal/ppc/meson.build
@@ -4,8 +4,8 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_power_intrinsics.c',
+        'rte_cpuflags.c',
+        'rte_cycles.c',
+        'rte_hypervisor.c',
+        'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_eal/unix/meson.build b/lib/librte_eal/unix/meson.build
index 71221b84a4..dc711b4240 100644
--- a/lib/librte_eal/unix/meson.build
+++ b/lib/librte_eal/unix/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2020 Dmitry Kozlyuk
 
 sources += files(
-	'eal_file.c',
-	'eal_unix_memory.c',
-	'eal_unix_timer.c',
-	'rte_thread.c',
+        'eal_file.c',
+        'eal_unix_memory.c',
+        'eal_unix_timer.c',
+        'rte_thread.c',
 )
diff --git a/lib/librte_eal/windows/meson.build b/lib/librte_eal/windows/meson.build
index 42ff5c2d59..ff9cbec417 100644
--- a/lib/librte_eal/windows/meson.build
+++ b/lib/librte_eal/windows/meson.build
@@ -4,22 +4,22 @@
 subdir('include')
 
 sources += files(
-	'eal.c',
-	'eal_alarm.c',
-	'eal_debug.c',
-	'eal_file.c',
-	'eal_hugepages.c',
-	'eal_interrupts.c',
-	'eal_lcore.c',
-	'eal_log.c',
-	'eal_memalloc.c',
-	'eal_memory.c',
-	'eal_mp.c',
-	'eal_thread.c',
-	'eal_timer.c',
-	'fnmatch.c',
-	'getopt.c',
-	'rte_thread.c',
+        'eal.c',
+        'eal_alarm.c',
+        'eal_debug.c',
+        'eal_file.c',
+        'eal_hugepages.c',
+        'eal_interrupts.c',
+        'eal_lcore.c',
+        'eal_log.c',
+        'eal_memalloc.c',
+        'eal_memory.c',
+        'eal_mp.c',
+        'eal_thread.c',
+        'eal_timer.c',
+        'fnmatch.c',
+        'getopt.c',
+        'rte_thread.c',
 )
 
 dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index f43645c208..12c2e00035 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -2,29 +2,28 @@
 # Copyright(c) 2017 Intel Corporation
 
 arch_headers = files(
-	'rte_atomic.h',
-	'rte_byteorder.h',
-	'rte_cpuflags.h',
-	'rte_cycles.h',
-	'rte_io.h',
-	'rte_mcslock.h',
-	'rte_memcpy.h',
-	'rte_pause.h',
-	'rte_pflock.h',
-	'rte_power_intrinsics.h',
-	'rte_prefetch.h',
-	'rte_rtm.h',
-	'rte_rwlock.h',
-	'rte_spinlock.h',
-	'rte_ticketlock.h',
-	'rte_vect.h',
+        'rte_atomic.h',
+        'rte_byteorder.h',
+        'rte_cpuflags.h',
+        'rte_cycles.h',
+        'rte_io.h',
+        'rte_mcslock.h',
+        'rte_memcpy.h',
+        'rte_pause.h',
+        'rte_pflock.h',
+        'rte_power_intrinsics.h',
+        'rte_prefetch.h',
+        'rte_rtm.h',
+        'rte_rwlock.h',
+        'rte_spinlock.h',
+        'rte_ticketlock.h',
+        'rte_vect.h',
 )
 arch_indirect_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
-	'rte_byteorder_32.h',
-	'rte_byteorder_64.h',
+        'rte_atomic_32.h',
+        'rte_atomic_64.h',
+        'rte_byteorder_32.h',
+        'rte_byteorder_64.h',
 )
-install_headers(arch_headers + arch_indirect_headers,
-		subdir: get_option('include_subdir_arch'))
+install_headers(arch_headers + arch_indirect_headers, subdir: get_option('include_subdir_arch'))
 dpdk_chkinc_headers += arch_headers
diff --git a/lib/librte_eal/x86/meson.build b/lib/librte_eal/x86/meson.build
index dfd42dee0c..d33a240e1a 100644
--- a/lib/librte_eal/x86/meson.build
+++ b/lib/librte_eal/x86/meson.build
@@ -4,9 +4,9 @@
 subdir('include')
 
 sources += files(
-	'rte_cpuflags.c',
-	'rte_cycles.c',
-	'rte_hypervisor.c',
-	'rte_spinlock.c',
-	'rte_power_intrinsics.c',
+        'rte_cpuflags.c',
+        'rte_cycles.c',
+        'rte_hypervisor.c',
+        'rte_spinlock.c',
+        'rte_power_intrinsics.c',
 )
diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build
index 4353fa6b7f..0205c853df 100644
--- a/lib/librte_ethdev/meson.build
+++ b/lib/librte_ethdev/meson.build
@@ -1,33 +1,39 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('ethdev_private.c',
-	'ethdev_profile.c',
-	'ethdev_trace_points.c',
-	'rte_class_eth.c',
-	'rte_ethdev.c',
-	'rte_flow.c',
-	'rte_mtr.c',
-	'rte_tm.c')
+sources = files(
+        'ethdev_private.c',
+        'ethdev_profile.c',
+        'ethdev_trace_points.c',
+        'rte_class_eth.c',
+        'rte_ethdev.c',
+        'rte_flow.c',
+        'rte_mtr.c',
+        'rte_tm.c',
+)
 
-headers = files('rte_ethdev.h',
-	'rte_ethdev_trace.h',
-	'rte_ethdev_trace_fp.h',
-	'rte_dev_info.h',
-	'rte_flow.h',
-	'rte_flow_driver.h',
-	'rte_mtr.h',
-	'rte_mtr_driver.h',
-	'rte_tm.h',
-	'rte_tm_driver.h')
+headers = files(
+        'rte_ethdev.h',
+        'rte_ethdev_trace.h',
+        'rte_ethdev_trace_fp.h',
+        'rte_dev_info.h',
+        'rte_flow.h',
+        'rte_flow_driver.h',
+        'rte_mtr.h',
+        'rte_mtr_driver.h',
+        'rte_tm.h',
+        'rte_tm_driver.h',
+)
 
 indirect_headers += files(
-	'rte_ethdev_core.h',
-	'rte_eth_ctrl.h')
+        'rte_ethdev_core.h',
+        'rte_eth_ctrl.h',
+)
 
 driver_sdk_headers += files(
-	'ethdev_driver.h',
-	'ethdev_pci.h',
-	'ethdev_vdev.h')
+        'ethdev_driver.h',
+        'ethdev_pci.h',
+        'ethdev_vdev.h',
+)
 
 deps += ['net', 'kvargs', 'meter', 'telemetry']
diff --git a/lib/librte_eventdev/meson.build b/lib/librte_eventdev/meson.build
index 79d36d37bb..32abeba794 100644
--- a/lib/librte_eventdev/meson.build
+++ b/lib/librte_eventdev/meson.build
@@ -2,26 +2,30 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_linux
-	cflags += '-DLINUX'
+    cflags += '-DLINUX'
 else
-	cflags += '-DBSD'
+    cflags += '-DBSD'
 endif
 
-sources = files('rte_eventdev.c',
-		'rte_event_ring.c',
-		'eventdev_trace_points.c',
-		'rte_event_eth_rx_adapter.c',
-		'rte_event_timer_adapter.c',
-		'rte_event_crypto_adapter.c',
-		'rte_event_eth_tx_adapter.c')
-headers = files('rte_eventdev.h',
-		'rte_eventdev_trace.h',
-		'rte_eventdev_trace_fp.h',
-		'rte_event_ring.h',
-		'rte_event_eth_rx_adapter.h',
-		'rte_event_timer_adapter.h',
-		'rte_event_timer_adapter_pmd.h',
-		'rte_event_crypto_adapter.h',
-		'rte_event_eth_tx_adapter.h')
+sources = files(
+        'rte_eventdev.c',
+        'rte_event_ring.c',
+        'eventdev_trace_points.c',
+        'rte_event_eth_rx_adapter.c',
+        'rte_event_timer_adapter.c',
+        'rte_event_crypto_adapter.c',
+        'rte_event_eth_tx_adapter.c',
+)
+headers = files(
+        'rte_eventdev.h',
+        'rte_eventdev_trace.h',
+        'rte_eventdev_trace_fp.h',
+        'rte_event_ring.h',
+        'rte_event_eth_rx_adapter.h',
+        'rte_event_timer_adapter.h',
+        'rte_event_timer_adapter_pmd.h',
+        'rte_event_crypto_adapter.h',
+        'rte_event_eth_tx_adapter.h',
+)
 deps += ['ring', 'ethdev', 'hash', 'mempool', 'mbuf', 'timer', 'cryptodev']
 deps += ['telemetry']
diff --git a/lib/librte_fib/meson.build b/lib/librte_fib/meson.build
index 18eadcc56c..5618c215a7 100644
--- a/lib/librte_fib/meson.build
+++ b/lib/librte_fib/meson.build
@@ -9,50 +9,50 @@ deps += ['rib']
 # compile AVX512 version if:
 # we are building 64-bit binary AND binutils can generate proper code
 if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok.returncode() == 0
-	# compile AVX512 version if either:
-	# a. we have AVX512F supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	#
-	# in former case, just add avx512 C file to files list
-	# in latter case, compile c file to static lib, using correct
-	# compiler flags, and then have the .o file from static lib
-	# linked into main lib.
+    # compile AVX512 version if either:
+    # a. we have AVX512F supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    #
+    # in former case, just add avx512 C file to files list
+    # in latter case, compile c file to static lib, using correct
+    # compiler flags, and then have the .o file from static lib
+    # linked into main lib.
 
-	# check if all required flags already enabled (variant a).
-	acl_avx512_flags = ['__AVX512F__','__AVX512DQ__']
-	acl_avx512_on = true
-	foreach f:acl_avx512_flags
-		if cc.get_define(f, args: machine_args) == ''
-			acl_avx512_on = false
-		endif
-	endforeach
+    # check if all required flags already enabled (variant a).
+    acl_avx512_flags = ['__AVX512F__','__AVX512DQ__']
+    acl_avx512_on = true
+    foreach f:acl_avx512_flags
+        if cc.get_define(f, args: machine_args) == ''
+            acl_avx512_on = false
+        endif
+    endforeach
 
-	if acl_avx512_on == true
-		cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
-		sources += files('dir24_8_avx512.c')
-		# TRIE AVX512 implementation uses avx512bw intrinsics along with
-		# avx512f and avx512dq
-		if cc.get_define('__AVX512BW__', args: machine_args) != ''
-			cflags += ['-DCC_TRIE_AVX512_SUPPORT']
-			sources += files('trie_avx512.c')
-		endif
-	elif cc.has_multi_arguments('-mavx512f', '-mavx512dq')
-		dir24_8_avx512_tmp = static_library('dir24_8_avx512_tmp',
-				'dir24_8_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx512f', '-mavx512dq'])
-		objs += dir24_8_avx512_tmp.extract_objects('dir24_8_avx512.c')
-		cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
-		# TRIE AVX512 implementation uses avx512bw intrinsics along with
-		# avx512f and avx512dq
-		if cc.has_argument('-mavx512bw')
-			trie_avx512_tmp = static_library('trie_avx512_tmp',
-				'trie_avx512.c',
-				dependencies: static_rte_eal,
-				c_args: cflags + ['-mavx512f', \
-					'-mavx512dq', '-mavx512bw'])
-			objs += trie_avx512_tmp.extract_objects('trie_avx512.c')
-			cflags += ['-DCC_TRIE_AVX512_SUPPORT']
-		endif
-	endif
+    if acl_avx512_on == true
+        cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
+        sources += files('dir24_8_avx512.c')
+        # TRIE AVX512 implementation uses avx512bw intrinsics along with
+        # avx512f and avx512dq
+        if cc.get_define('__AVX512BW__', args: machine_args) != ''
+            cflags += ['-DCC_TRIE_AVX512_SUPPORT']
+            sources += files('trie_avx512.c')
+        endif
+    elif cc.has_multi_arguments('-mavx512f', '-mavx512dq')
+        dir24_8_avx512_tmp = static_library('dir24_8_avx512_tmp',
+                'dir24_8_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx512f', '-mavx512dq'])
+        objs += dir24_8_avx512_tmp.extract_objects('dir24_8_avx512.c')
+        cflags += ['-DCC_DIR24_8_AVX512_SUPPORT']
+        # TRIE AVX512 implementation uses avx512bw intrinsics along with
+        # avx512f and avx512dq
+        if cc.has_argument('-mavx512bw')
+            trie_avx512_tmp = static_library('trie_avx512_tmp',
+                'trie_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: cflags + ['-mavx512f', \
+                    '-mavx512dq', '-mavx512bw'])
+            objs += trie_avx512_tmp.extract_objects('trie_avx512.c')
+            cflags += ['-DCC_TRIE_AVX512_SUPPORT']
+        endif
+    endif
 endif
diff --git a/lib/librte_graph/meson.build b/lib/librte_graph/meson.build
index d3ec78ca62..6befb094d2 100644
--- a/lib/librte_graph/meson.build
+++ b/lib/librte_graph/meson.build
@@ -1,7 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2020 Marvell International Ltd.
 
-sources = files('node.c', 'graph.c', 'graph_ops.c', 'graph_debug.c', 'graph_stats.c', 'graph_populate.c')
+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')
 
 deps += ['eal']
diff --git a/lib/librte_gro/meson.build b/lib/librte_gro/meson.build
index ea8b45cc23..e4fa2958bd 100644
--- a/lib/librte_gro/meson.build
+++ b/lib/librte_gro/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_gro.c', 'gro_tcp4.c', 'gro_udp4.c', 'gro_vxlan_tcp4.c', 'gro_vxlan_udp4.c')
+sources = files(
+        'rte_gro.c',
+        'gro_tcp4.c',
+        'gro_udp4.c',
+        'gro_vxlan_tcp4.c',
+        'gro_vxlan_udp4.c',
+)
 headers = files('rte_gro.h')
 deps += ['ethdev']
diff --git a/lib/librte_gso/meson.build b/lib/librte_gso/meson.build
index 05904f2fea..622411df8f 100644
--- a/lib/librte_gso/meson.build
+++ b/lib/librte_gso/meson.build
@@ -1,7 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('gso_common.c', 'gso_tcp4.c', 'gso_udp4.c',
-		'gso_tunnel_tcp4.c', 'gso_tunnel_udp4.c', 'rte_gso.c')
+sources = files(
+        'gso_common.c',
+        'gso_tcp4.c',
+        'gso_udp4.c',
+        'gso_tunnel_tcp4.c',
+        'gso_tunnel_udp4.c',
+        'rte_gso.c',
+)
 headers = files('rte_gso.h')
 deps += ['ethdev']
diff --git a/lib/librte_hash/meson.build b/lib/librte_hash/meson.build
index 242859f5ad..c3c251e2b7 100644
--- a/lib/librte_hash/meson.build
+++ b/lib/librte_hash/meson.build
@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-headers = files('rte_fbk_hash.h',
-	'rte_hash_crc.h',
-	'rte_hash.h',
-	'rte_jhash.h',
-	'rte_thash.h')
+headers = files(
+        'rte_fbk_hash.h',
+        'rte_hash_crc.h',
+        'rte_hash.h',
+        'rte_jhash.h',
+        'rte_thash.h',
+)
 indirect_headers += files('rte_crc_arm64.h')
 
 sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c')
diff --git a/lib/librte_ip_frag/meson.build b/lib/librte_ip_frag/meson.build
index c5b9a45963..ea2de09f75 100644
--- a/lib/librte_ip_frag/meson.build
+++ b/lib/librte_ip_frag/meson.build
@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_ipv4_fragmentation.c',
-		'rte_ipv6_fragmentation.c',
-		'rte_ipv4_reassembly.c',
-		'rte_ipv6_reassembly.c',
-		'rte_ip_frag_common.c',
-		'ip_frag_internal.c')
+sources = files(
+        'rte_ipv4_fragmentation.c',
+        'rte_ipv6_fragmentation.c',
+        'rte_ipv4_reassembly.c',
+        'rte_ipv6_reassembly.c',
+        'rte_ip_frag_common.c',
+        'ip_frag_internal.c',
+)
 headers = files('rte_ip_frag.h')
 deps += ['ethdev', 'hash']
diff --git a/lib/librte_kni/meson.build b/lib/librte_kni/meson.build
index 55e47df413..e2e4e44fc6 100644
--- a/lib/librte_kni/meson.build
+++ b/lib/librte_kni/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
+    build = false
+    reason = 'only supported on 64-bit Linux'
 endif
 sources = files('rte_kni.c')
 headers = files('rte_kni.h', 'rte_kni_common.h')
diff --git a/lib/librte_lpm/meson.build b/lib/librte_lpm/meson.build
index 90cbf8646a..5ca54815e4 100644
--- a/lib/librte_lpm/meson.build
+++ b/lib/librte_lpm/meson.build
@@ -5,6 +5,11 @@ sources = files('rte_lpm.c', 'rte_lpm6.c')
 headers = files('rte_lpm.h', 'rte_lpm6.h')
 # since header files have different names, we can install all vector headers
 # without worrying about which architecture we actually need
-indirect_headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h')
+indirect_headers += files(
+        'rte_lpm_altivec.h',
+        'rte_lpm_neon.h',
+        'rte_lpm_sse.h',
+        'rte_lpm_sve.h',
+)
 deps += ['hash']
 deps += ['rcu']
diff --git a/lib/librte_mbuf/meson.build b/lib/librte_mbuf/meson.build
index e95c770e5a..c8c08220a0 100644
--- a/lib/librte_mbuf/meson.build
+++ b/lib/librte_mbuf/meson.build
@@ -1,9 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_mbuf.c', 'rte_mbuf_ptype.c', 'rte_mbuf_pool_ops.c',
-	'rte_mbuf_dyn.c')
-headers = files('rte_mbuf.h', 'rte_mbuf_core.h',
-		'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h',
-		'rte_mbuf_dyn.h')
+sources = files(
+        'rte_mbuf.c',
+        'rte_mbuf_ptype.c',
+        'rte_mbuf_pool_ops.c',
+        'rte_mbuf_dyn.c',
+)
+headers = files(
+        'rte_mbuf.h',
+        'rte_mbuf_core.h',
+        'rte_mbuf_ptype.h',
+        'rte_mbuf_pool_ops.h',
+        'rte_mbuf_dyn.h'
+)
 deps += ['mempool']
diff --git a/lib/librte_mempool/meson.build b/lib/librte_mempool/meson.build
index a6e861cbfc..e48bd6a14a 100644
--- a/lib/librte_mempool/meson.build
+++ b/lib/librte_mempool/meson.build
@@ -4,13 +4,20 @@
 extra_flags = []
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
-sources = files('rte_mempool.c', 'rte_mempool_ops.c',
-		'rte_mempool_ops_default.c', 'mempool_trace_points.c')
-headers = files('rte_mempool.h', 'rte_mempool_trace.h',
-		'rte_mempool_trace_fp.h')
+sources = files(
+        'rte_mempool.c',
+        'rte_mempool_ops.c',
+        'rte_mempool_ops_default.c',
+        'mempool_trace_points.c',
+)
+headers = files(
+        'rte_mempool.h',
+        'rte_mempool_trace.h',
+        'rte_mempool_trace_fp.h',
+)
 deps += ['ring']
diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build
index d5be6a2145..3cb43d9ee7 100644
--- a/lib/librte_metrics/meson.build
+++ b/lib/librte_metrics/meson.build
@@ -6,8 +6,8 @@ headers = files('rte_metrics.h', 'rte_metrics_telemetry.h')
 
 jansson = dependency('jansson', required: false, method: 'pkg-config')
 if jansson.found()
-	dpdk_conf.set('RTE_HAS_JANSSON', 1)
-	ext_deps += jansson
+    dpdk_conf.set('RTE_HAS_JANSSON', 1)
+    ext_deps += jansson
 endif
 
 deps += ['ethdev', 'telemetry']
diff --git a/lib/librte_net/meson.build b/lib/librte_net/meson.build
index 94d816e79f..a4e395e9c5 100644
--- a/lib/librte_net/meson.build
+++ b/lib/librte_net/meson.build
@@ -1,110 +1,121 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2020 Intel Corporation
 
-headers = files('rte_ip.h',
-	'rte_tcp.h',
-	'rte_udp.h',
-	'rte_esp.h',
-	'rte_sctp.h',
-	'rte_icmp.h',
-	'rte_arp.h',
-	'rte_ether.h',
-	'rte_vxlan.h',
-	'rte_gre.h',
-	'rte_gtp.h',
-	'rte_net.h',
-	'rte_net_crc.h',
-	'rte_mpls.h',
-	'rte_higig.h',
-	'rte_ecpri.h',
-	'rte_geneve.h')
+headers = files(
+        'rte_ip.h',
+        'rte_tcp.h',
+        'rte_udp.h',
+        'rte_esp.h',
+        'rte_sctp.h',
+        'rte_icmp.h',
+        'rte_arp.h',
+        'rte_ether.h',
+        'rte_vxlan.h',
+        'rte_gre.h',
+        'rte_gtp.h',
+        'rte_net.h',
+        'rte_net_crc.h',
+        'rte_mpls.h',
+        'rte_higig.h',
+        'rte_ecpri.h',
+        'rte_geneve.h',
+)
 
-sources = files('rte_arp.c', 'rte_ether.c', 'rte_net.c', 'rte_net_crc.c')
+sources = files(
+        'rte_arp.c',
+        'rte_ether.c',
+        'rte_net.c',
+        'rte_net_crc.c',
+)
 deps += ['mbuf']
 
 if dpdk_conf.has('RTE_ARCH_X86_64')
-	net_crc_sse42_cpu_support = (
-		cc.get_define('__PCLMUL__', args: machine_args) != '')
-	net_crc_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '' and
-		cc.get_define('__AVX512DQ__', args: machine_args) != '' and
-		cc.get_define('__AVX512VL__', args: machine_args) != '' and
-		cc.get_define('__VPCLMULQDQ__', args: machine_args) != '')
+    net_crc_sse42_cpu_support = (cc.get_define('__PCLMUL__', args: machine_args) != '')
+    net_crc_avx512_cpu_support = (
+            cc.get_define('__AVX512F__', args: machine_args) != '' and
+            cc.get_define('__AVX512BW__', args: machine_args) != '' and
+            cc.get_define('__AVX512DQ__', args: machine_args) != '' and
+            cc.get_define('__AVX512VL__', args: machine_args) != '' and
+            cc.get_define('__VPCLMULQDQ__', args: machine_args) != ''
+    )
 
-	net_crc_sse42_cc_support = (
-		cc.has_argument('-mpclmul') and cc.has_argument('-maes'))
-	net_crc_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw') and
-		cc.has_argument('-mavx512dq') and
-		cc.has_argument('-mavx512vl') and
-		cc.has_argument('-mvpclmulqdq') and
-		cc.has_argument('-mavx2') and
-		cc.has_argument('-mavx'))
+    net_crc_sse42_cc_support = (cc.has_argument('-mpclmul') and cc.has_argument('-maes'))
+    net_crc_avx512_cc_support = (
+            not machine_args.contains('-mno-avx512f') and
+            cc.has_argument('-mavx512f') and
+            cc.has_argument('-mavx512bw') and
+            cc.has_argument('-mavx512dq') and
+            cc.has_argument('-mavx512vl') and
+            cc.has_argument('-mvpclmulqdq') and
+            cc.has_argument('-mavx2') and
+            cc.has_argument('-mavx')
+    )
 
-	build_static_net_crc_sse42_lib = 0
-	build_static_net_crc_avx512_lib = 0
+    build_static_net_crc_sse42_lib = 0
+    build_static_net_crc_avx512_lib = 0
 
-	if net_crc_sse42_cpu_support == true
-		sources += files('net_crc_sse.c')
-		cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
-		if net_crc_avx512_cpu_support == true
-			sources += files('net_crc_avx512.c')
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		elif net_crc_avx512_cc_support == true
-			build_static_net_crc_avx512_lib = 1
-			net_crc_avx512_lib_cflags = ['-mavx512f',
-							'-mavx512bw',
-							'-mavx512dq',
-							'-mavx512vl',
-							'-mvpclmulqdq',
-							'-mavx2',
-							'-mavx']
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		endif
-	elif net_crc_sse42_cc_support == true
-		build_static_net_crc_sse42_lib = 1
-		net_crc_sse42_lib_cflags = ['-mpclmul', '-maes']
-		cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
-		if net_crc_avx512_cc_support == true
-			build_static_net_crc_avx512_lib = 1
-			net_crc_avx512_lib_cflags = ['-mpclmul',
-							'-maes',
-							'-mavx512f',
-							'-mavx512bw',
-							'-mavx512dq',
-							'-mavx512vl',
-							'-mvpclmulqdq',
-							'-mavx2',
-							'-mavx']
-			cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
-		endif
-	endif
+    if net_crc_sse42_cpu_support == true
+        sources += files('net_crc_sse.c')
+        cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
+        if net_crc_avx512_cpu_support == true
+            sources += files('net_crc_avx512.c')
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        elif net_crc_avx512_cc_support == true
+            build_static_net_crc_avx512_lib = 1
+            net_crc_avx512_lib_cflags = [
+                    '-mavx512f',
+                    '-mavx512bw',
+                    '-mavx512dq',
+                    '-mavx512vl',
+                    '-mvpclmulqdq',
+                    '-mavx2',
+                    '-mavx',
+            ]
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        endif
+    elif net_crc_sse42_cc_support == true
+        build_static_net_crc_sse42_lib = 1
+        net_crc_sse42_lib_cflags = ['-mpclmul', '-maes']
+        cflags += ['-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT']
+        if net_crc_avx512_cc_support == true
+            build_static_net_crc_avx512_lib = 1
+            net_crc_avx512_lib_cflags = [
+                    '-mpclmul',
+                    '-maes',
+                    '-mavx512f',
+                    '-mavx512bw',
+                    '-mavx512dq',
+                    '-mavx512vl',
+                    '-mvpclmulqdq',
+                    '-mavx2',
+                    '-mavx',
+            ]
+            cflags += ['-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT']
+        endif
+    endif
 
-	if build_static_net_crc_sse42_lib == 1
-		net_crc_sse42_lib = static_library(
-					'net_crc_sse42_lib',
-					'net_crc_sse.c',
-					dependencies: static_rte_eal,
-					c_args: [cflags,
-						net_crc_sse42_lib_cflags])
-		objs += net_crc_sse42_lib.extract_objects('net_crc_sse.c')
-	endif
+    if build_static_net_crc_sse42_lib == 1
+        net_crc_sse42_lib = static_library(
+                'net_crc_sse42_lib',
+                'net_crc_sse.c',
+                dependencies: static_rte_eal,
+                c_args: [cflags,
+                    net_crc_sse42_lib_cflags])
+        objs += net_crc_sse42_lib.extract_objects('net_crc_sse.c')
+    endif
 
-	if build_static_net_crc_avx512_lib == 1
-		net_crc_avx512_lib = static_library(
-					'net_crc_avx512_lib',
-					'net_crc_avx512.c',
-					dependencies: static_rte_eal,
-					c_args: [cflags,
-						net_crc_avx512_lib_cflags])
-		objs += net_crc_avx512_lib.extract_objects('net_crc_avx512.c')
-	endif
+    if build_static_net_crc_avx512_lib == 1
+        net_crc_avx512_lib = static_library(
+                'net_crc_avx512_lib',
+                'net_crc_avx512.c',
+                dependencies: static_rte_eal,
+                c_args: [cflags,
+                    net_crc_avx512_lib_cflags])
+        objs += net_crc_avx512_lib.extract_objects('net_crc_avx512.c')
+    endif
 
 elif (dpdk_conf.has('RTE_ARCH_ARM64') and
-		cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '')
-	sources += files('net_crc_neon.c')
-	cflags += ['-DCC_ARM64_NEON_PMULL_SUPPORT']
+        cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '')
+    sources += files('net_crc_neon.c')
+    cflags += ['-DCC_ARM64_NEON_PMULL_SUPPORT']
 endif
diff --git a/lib/librte_node/meson.build b/lib/librte_node/meson.build
index 3d582f616a..230aa6fa0f 100644
--- a/lib/librte_node/meson.build
+++ b/lib/librte_node/meson.build
@@ -1,8 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(C) 2020 Marvell International Ltd.
 
-sources = files('null.c', 'log.c', 'ethdev_rx.c', 'ethdev_tx.c', 'ip4_lookup.c',
-		'ip4_rewrite.c', 'pkt_drop.c', 'ethdev_ctrl.c', 'pkt_cls.c')
+sources = files(
+        'ethdev_ctrl.c',
+        'ethdev_rx.c',
+        'ethdev_tx.c',
+        'ip4_lookup.c',
+        'ip4_rewrite.c',
+        'log.c',
+        'null.c',
+        'pkt_cls.c',
+        'pkt_drop.c',
+)
 headers = files('rte_node_ip4_api.h', 'rte_node_eth_api.h')
 # Strict-aliasing rules are violated by uint8_t[] to context size casts.
 cflags += '-fno-strict-aliasing'
diff --git a/lib/librte_pipeline/meson.build b/lib/librte_pipeline/meson.build
index 65c1a8d6a9..9132bb517a 100644
--- a/lib/librte_pipeline/meson.build
+++ b/lib/librte_pipeline/meson.build
@@ -1,16 +1,20 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_pipeline.c',
-	'rte_port_in_action.c',
-	'rte_table_action.c',
-	'rte_swx_pipeline.c',
-	'rte_swx_pipeline_spec.c',
-	'rte_swx_ctl.c',)
-headers = files('rte_pipeline.h',
-	'rte_port_in_action.h',
-	'rte_table_action.h',
-	'rte_swx_pipeline.h',
-	'rte_swx_extern.h',
-	'rte_swx_ctl.h',)
+sources = files(
+        'rte_pipeline.c',
+        'rte_port_in_action.c',
+        'rte_table_action.c',
+        'rte_swx_pipeline.c',
+        'rte_swx_pipeline_spec.c',
+        'rte_swx_ctl.c',
+)
+headers = files(
+        'rte_pipeline.h',
+        'rte_port_in_action.h',
+        'rte_table_action.h',
+        'rte_swx_pipeline.h',
+        'rte_swx_extern.h',
+        'rte_swx_ctl.h',
+)
 deps += ['port', 'table', 'meter', 'sched', 'cryptodev']
diff --git a/lib/librte_port/meson.build b/lib/librte_port/meson.build
index 435b64a131..289bc47f6e 100644
--- a/lib/librte_port/meson.build
+++ b/lib/librte_port/meson.build
@@ -2,45 +2,45 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files(
-	'rte_port_ethdev.c',
-	'rte_port_fd.c',
-	'rte_port_frag.c',
-	'rte_port_ras.c',
-	'rte_port_ring.c',
-	'rte_port_sched.c',
-	'rte_port_source_sink.c',
-	'rte_port_sym_crypto.c',
-	'rte_port_eventdev.c',
-	'rte_swx_port_ethdev.c',
-	'rte_swx_port_fd.c',
-	'rte_swx_port_ring.c',
-	'rte_swx_port_source_sink.c',
-	)
+        'rte_port_ethdev.c',
+        'rte_port_fd.c',
+        'rte_port_frag.c',
+        'rte_port_ras.c',
+        'rte_port_ring.c',
+        'rte_port_sched.c',
+        'rte_port_source_sink.c',
+        'rte_port_sym_crypto.c',
+        'rte_port_eventdev.c',
+        'rte_swx_port_ethdev.c',
+        'rte_swx_port_fd.c',
+        'rte_swx_port_ring.c',
+        'rte_swx_port_source_sink.c',
+)
 headers = files(
-	'rte_port_ethdev.h',
-	'rte_port_fd.h',
-	'rte_port_frag.h',
-	'rte_port_ras.h',
-	'rte_port.h',
-	'rte_port_ring.h',
-	'rte_port_sched.h',
-	'rte_port_source_sink.h',
-	'rte_port_sym_crypto.h',
-	'rte_port_eventdev.h',
-	'rte_swx_port.h',
-	'rte_swx_port_ethdev.h',
-	'rte_swx_port_fd.h',
-	'rte_swx_port_ring.h',
-	'rte_swx_port_source_sink.h',
-	)
+        'rte_port_ethdev.h',
+        'rte_port_fd.h',
+        'rte_port_frag.h',
+        'rte_port_ras.h',
+        'rte_port.h',
+        'rte_port_ring.h',
+        'rte_port_sched.h',
+        'rte_port_source_sink.h',
+        'rte_port_sym_crypto.h',
+        'rte_port_eventdev.h',
+        'rte_swx_port.h',
+        'rte_swx_port_ethdev.h',
+        'rte_swx_port_fd.h',
+        'rte_swx_port_ring.h',
+        'rte_swx_port_source_sink.h',
+)
 deps += ['ethdev', 'sched', 'ip_frag', 'cryptodev', 'eventdev']
 
 if dpdk_conf.has('RTE_PORT_PCAP')
-	ext_deps += pcap_dep # dependency provided in config/meson.build
+    ext_deps += pcap_dep # dependency provided in config/meson.build
 endif
 
 if dpdk_conf.has('RTE_LIB_KNI')
-	sources += files('rte_port_kni.c')
-	headers += files('rte_port_kni.h')
-	deps += 'kni'
+    sources += files('rte_port_kni.c')
+    headers += files('rte_port_kni.h')
+    deps += 'kni'
 endif
diff --git a/lib/librte_power/meson.build b/lib/librte_power/meson.build
index 9a2dcbfc7a..a2cc9fe2ef 100644
--- a/lib/librte_power/meson.build
+++ b/lib/librte_power/meson.build
@@ -2,16 +2,23 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
-sources = files('rte_power.c', 'power_acpi_cpufreq.c',
-		'power_kvm_vm.c', 'guest_channel.c',
-		'rte_power_empty_poll.c',
-		'power_pstate_cpufreq.c',
-		'rte_power_pmd_mgmt.c',
-		'power_common.c')
-headers = files('rte_power.h','rte_power_empty_poll.h',
-	'rte_power_pmd_mgmt.h',
-	'rte_power_guest_channel.h')
+sources = files(
+        'guest_channel.c',
+        'power_acpi_cpufreq.c',
+        'power_common.c',
+        'power_kvm_vm.c',
+        'power_pstate_cpufreq.c',
+        'rte_power.c',
+        'rte_power_empty_poll.c',
+        'rte_power_pmd_mgmt.c',
+)
+headers = files(
+        'rte_power.h',
+        'rte_power_empty_poll.h',
+        'rte_power_pmd_mgmt.h',
+        'rte_power_guest_channel.h'
+)
 deps += ['timer', 'ethdev']
diff --git a/lib/librte_regexdev/meson.build b/lib/librte_regexdev/meson.build
index 1b3b6db22a..7e12d8cd6d 100644
--- a/lib/librte_regexdev/meson.build
+++ b/lib/librte_regexdev/meson.build
@@ -2,7 +2,6 @@
 # Copyright 2020 Mellanox Technologies, Ltd
 
 sources = files('rte_regexdev.c')
-headers = files('rte_regexdev.h',
-	'rte_regexdev_driver.h')
+headers = files('rte_regexdev.h', 'rte_regexdev_driver.h')
 indirect_headers += files('rte_regexdev_core.h')
 deps += ['mbuf']
diff --git a/lib/librte_ring/meson.build b/lib/librte_ring/meson.build
index ea050d564a..c20685c689 100644
--- a/lib/librte_ring/meson.build
+++ b/lib/librte_ring/meson.build
@@ -5,15 +5,16 @@ sources = files('rte_ring.c')
 headers = files('rte_ring.h')
 # most sub-headers are not for direct inclusion
 indirect_headers += files (
-		'rte_ring_core.h',
-		'rte_ring_elem.h',
-		'rte_ring_elem_pvt.h',
-		'rte_ring_c11_pvt.h',
-		'rte_ring_generic_pvt.h',
-		'rte_ring_hts.h',
-		'rte_ring_hts_elem_pvt.h',
-		'rte_ring_peek.h',
-		'rte_ring_peek_elem_pvt.h',
-		'rte_ring_peek_zc.h',
-		'rte_ring_rts.h',
-		'rte_ring_rts_elem_pvt.h')
+        'rte_ring_core.h',
+        'rte_ring_elem.h',
+        'rte_ring_elem_pvt.h',
+        'rte_ring_c11_pvt.h',
+        'rte_ring_generic_pvt.h',
+        'rte_ring_hts.h',
+        'rte_ring_hts_elem_pvt.h',
+        'rte_ring_peek.h',
+        'rte_ring_peek_elem_pvt.h',
+        'rte_ring_peek_zc.h',
+        'rte_ring_rts.h',
+        'rte_ring_rts_elem_pvt.h',
+)
diff --git a/lib/librte_sched/meson.build b/lib/librte_sched/meson.build
index f85d64df81..b24f7b8775 100644
--- a/lib/librte_sched/meson.build
+++ b/lib/librte_sched/meson.build
@@ -2,6 +2,10 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_sched.c', 'rte_red.c', 'rte_approx.c')
-headers = files('rte_sched.h', 'rte_sched_common.h',
-		'rte_red.h', 'rte_approx.h')
+headers = files(
+        'rte_approx.h',
+        'rte_red.h',
+        'rte_sched.h',
+        'rte_sched_common.h',
+)
 deps += ['mbuf', 'meter']
diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build
index 9ff33722b2..2f53f49677 100644
--- a/lib/librte_stack/meson.build
+++ b/lib/librte_stack/meson.build
@@ -5,7 +5,8 @@ sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c')
 headers = files('rte_stack.h')
 # subheaders, not for direct inclusion by apps
 indirect_headers += files(
-		'rte_stack_std.h',
-		'rte_stack_lf.h',
-		'rte_stack_lf_generic.h',
-		'rte_stack_lf_c11.h')
+        'rte_stack_std.h',
+        'rte_stack_lf.h',
+        'rte_stack_lf_generic.h',
+        'rte_stack_lf_c11.h',
+)
diff --git a/lib/librte_table/meson.build b/lib/librte_table/meson.build
index 007ffe0130..230f21ea8e 100644
--- a/lib/librte_table/meson.build
+++ b/lib/librte_table/meson.build
@@ -1,36 +1,40 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_table_acl.c',
-		'rte_table_lpm.c',
-		'rte_table_lpm_ipv6.c',
-		'rte_table_hash_cuckoo.c',
-		'rte_table_hash_key8.c',
-		'rte_table_hash_key16.c',
-		'rte_table_hash_key32.c',
-		'rte_table_hash_ext.c',
-		'rte_table_hash_lru.c',
-		'rte_table_array.c',
-		'rte_table_stub.c',
-		'rte_swx_table_em.c',
-		'rte_swx_table_wm.c',
-		)
-headers = files('rte_table.h',
-		'rte_table_acl.h',
-		'rte_table_lpm.h',
-		'rte_table_lpm_ipv6.h',
-		'rte_table_hash.h',
-		'rte_table_hash_cuckoo.h',
-		'rte_table_hash_func.h',
-		'rte_lru.h',
-		'rte_table_array.h',
-		'rte_table_stub.h',
-		'rte_swx_table.h',
-		'rte_swx_table_em.h',
-		'rte_swx_table_wm.h',
-		)
+sources = files(
+        'rte_swx_table_em.c',
+        'rte_swx_table_wm.c',
+        'rte_table_acl.c',
+        'rte_table_array.c',
+        'rte_table_hash_cuckoo.c',
+        'rte_table_hash_ext.c',
+        'rte_table_hash_key8.c',
+        'rte_table_hash_key16.c',
+        'rte_table_hash_key32.c',
+        'rte_table_hash_lru.c',
+        'rte_table_lpm.c',
+        'rte_table_lpm_ipv6.c',
+        'rte_table_stub.c',
+)
+headers = files(
+        'rte_lru.h',
+        'rte_swx_table.h',
+        'rte_swx_table_em.h',
+        'rte_swx_table_wm.h',
+        'rte_table.h',
+        'rte_table_acl.h',
+        'rte_table_array.h',
+        'rte_table_hash.h',
+        'rte_table_hash_cuckoo.h',
+        'rte_table_hash_func.h',
+        'rte_table_lpm.h',
+        'rte_table_lpm_ipv6.h',
+        'rte_table_stub.h',
+)
 deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 
-indirect_headers += files('rte_lru_x86.h',
-		'rte_lru_arm64.h',
-		'rte_table_hash_func_arm64.h')
+indirect_headers += files(
+        'rte_lru_arm64.h',
+        'rte_lru_x86.h',
+        'rte_table_hash_func_arm64.h'
+)
diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
index 6185deab33..2d8fe0239f 100644
--- a/lib/librte_vhost/meson.build
+++ b/lib/librte_vhost/meson.build
@@ -2,25 +2,36 @@
 # Copyright(c) 2017-2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 if has_libnuma == 1
-	dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
+    dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
 endif
 if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-	cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
+    cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
 elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-	cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
+    cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
 elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-	cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
+    cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
 endif
-dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY',
-	      cc.has_header('linux/userfaultfd.h'))
+dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY', cc.has_header('linux/userfaultfd.h'))
 cflags += '-fno-strict-aliasing'
-sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vdpa.c',
-		'vhost.c', 'vhost_user.c',
-		'virtio_net.c', 'vhost_crypto.c')
-headers = files('rte_vhost.h', 'rte_vdpa.h', 'rte_vdpa_dev.h',
-		'rte_vhost_crypto.h', 'rte_vhost_async.h')
+sources = files(
+        'fd_man.c',
+        'iotlb.c',
+        'socket.c',
+        'vdpa.c',
+        'vhost.c',
+        'vhost_crypto.c',
+        'vhost_user.c',
+        'virtio_net.c',
+)
+headers = files(
+        'rte_vdpa.h',
+        'rte_vdpa_dev.h',
+        'rte_vhost.h',
+        'rte_vhost_async.h',
+        'rte_vhost_crypto.h',
+)
 deps += ['ethdev', 'cryptodev', 'hash', 'pci']
-- 
2.27.0

[dpdk-dev] [PATCH v2 09/16] drivers: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/baseband/turbo_sw/meson.build   |  46 ++--
 drivers/bus/dpaa/meson.build            |  28 +-
 drivers/bus/fslmc/meson.build           |  30 +-
 drivers/bus/ifpga/meson.build           |   6 +-
 drivers/bus/pci/meson.build             |  24 +-
 drivers/bus/vdev/meson.build            |   2 +-
 drivers/bus/vmbus/meson.build           |  22 +-
 drivers/common/cnxk/meson.build         |  78 +++---
 drivers/common/cpt/meson.build          |   9 +-
 drivers/common/dpaax/meson.build        |   8 +-
 drivers/common/mlx5/linux/meson.build   | 349 ++++++++++++------------
 drivers/common/mlx5/meson.build         |  40 +--
 drivers/common/mlx5/windows/meson.build |  30 +-
 drivers/common/mvep/meson.build         |  12 +-
 drivers/common/octeontx/meson.build     |   6 +-
 drivers/common/octeontx2/meson.build    |  29 +-
 drivers/common/qat/meson.build          |  71 ++---
 drivers/common/sfc_efx/base/meson.build | 142 +++++-----
 drivers/common/sfc_efx/meson.build      |  24 +-
 drivers/compress/isal/meson.build       |   4 +-
 drivers/compress/mlx5/meson.build       |  24 +-
 drivers/compress/zlib/meson.build       |   4 +-
 drivers/crypto/aesni_gcm/meson.build    |  22 +-
 drivers/crypto/aesni_mb/meson.build     |  22 +-
 drivers/crypto/armv8/meson.build        |   6 +-
 drivers/crypto/bcmfs/meson.build        |  26 +-
 drivers/crypto/caam_jr/meson.build      |  10 +-
 drivers/crypto/ccp/meson.build          |  16 +-
 drivers/crypto/dpaa2_sec/meson.build    |   6 +-
 drivers/crypto/dpaa_sec/meson.build     |   4 +-
 drivers/crypto/kasumi/meson.build       |  20 +-
 drivers/crypto/mvsam/meson.build        |   6 +-
 drivers/crypto/nitrox/meson.build       |  20 +-
 drivers/crypto/octeontx/meson.build     |  12 +-
 drivers/crypto/octeontx2/meson.build    |  16 +-
 drivers/crypto/openssl/meson.build      |   4 +-
 drivers/crypto/qat/meson.build          |  20 +-
 drivers/crypto/scheduler/meson.build    |  18 +-
 drivers/crypto/snow3g/meson.build       |  18 +-
 drivers/crypto/virtio/meson.build       |   2 +-
 drivers/crypto/zuc/meson.build          |  20 +-
 drivers/event/dlb2/meson.build          |  14 +-
 drivers/event/dpaa/meson.build          |   4 +-
 drivers/event/dpaa2/meson.build         |   8 +-
 drivers/event/dsw/meson.build           |   2 +-
 drivers/event/octeontx/meson.build      |  12 +-
 drivers/event/octeontx2/meson.build     |  24 +-
 drivers/event/opdl/meson.build          |  10 +-
 drivers/event/sw/meson.build            |   8 +-
 drivers/mempool/bucket/meson.build      |   4 +-
 drivers/mempool/cnxk/meson.build        |  16 +-
 drivers/mempool/dpaa/meson.build        |   4 +-
 drivers/mempool/dpaa2/meson.build       |   4 +-
 drivers/mempool/octeontx/meson.build    |   6 +-
 drivers/mempool/octeontx2/meson.build   |  20 +-
 drivers/mempool/stack/meson.build       |   4 +-
 drivers/net/af_packet/meson.build       |   4 +-
 drivers/net/af_xdp/meson.build          |  24 +-
 drivers/net/ark/meson.build             |  28 +-
 drivers/net/atlantic/meson.build        |  22 +-
 drivers/net/avp/meson.build             |   4 +-
 drivers/net/axgbe/meson.build           |  16 +-
 drivers/net/bnx2x/meson.build           |  18 +-
 drivers/net/bnxt/meson.build            | 124 ++++-----
 drivers/net/bonding/meson.build         |   8 +-
 drivers/net/cxgbe/meson.build           |  30 +-
 drivers/net/dpaa/meson.build            |  16 +-
 drivers/net/dpaa2/meson.build           |  26 +-
 drivers/net/e1000/base/meson.build      |  50 ++--
 drivers/net/e1000/meson.build           |  20 +-
 drivers/net/ena/meson.build             |  10 +-
 drivers/net/enetc/meson.build           |   6 +-
 drivers/net/enic/meson.build            |  46 ++--
 drivers/net/failsafe/meson.build        |  24 +-
 drivers/net/fm10k/base/meson.build      |  28 +-
 drivers/net/fm10k/meson.build           |  12 +-
 drivers/net/hinic/base/meson.build      |  26 +-
 drivers/net/hinic/meson.build           |  16 +-
 drivers/net/hns3/meson.build            |  52 ++--
 drivers/net/i40e/base/meson.build       |  32 +--
 drivers/net/i40e/meson.build            | 110 ++++----
 drivers/net/iavf/meson.build            |  94 +++----
 drivers/net/ice/base/meson.build        |  45 +--
 drivers/net/ice/meson.build             | 105 +++----
 drivers/net/igc/base/meson.build        |  20 +-
 drivers/net/igc/meson.build             |  16 +-
 drivers/net/ionic/meson.build           |  20 +-
 drivers/net/ipn3ke/meson.build          |  18 +-
 drivers/net/ixgbe/base/meson.build      |  42 +--
 drivers/net/ixgbe/meson.build           |  32 +--
 drivers/net/kni/meson.build             |   6 +-
 drivers/net/liquidio/meson.build        |  12 +-
 drivers/net/memif/meson.build           |   6 +-
 drivers/net/mlx4/meson.build            | 160 +++++------
 drivers/net/mlx5/linux/meson.build      |  14 +-
 drivers/net/mlx5/meson.build            |  90 +++---
 drivers/net/mlx5/windows/meson.build    |  10 +-
 drivers/net/mvneta/meson.build          |  16 +-
 drivers/net/mvpp2/meson.build           |  22 +-
 drivers/net/netvsc/meson.build          |   6 +-
 drivers/net/nfb/meson.build             |   6 +-
 drivers/net/nfp/meson.build             |  28 +-
 drivers/net/null/meson.build            |   6 +-
 drivers/net/octeontx/base/meson.build   |  18 +-
 drivers/net/octeontx/meson.build        |  12 +-
 drivers/net/octeontx2/meson.build       |  62 ++---
 drivers/net/octeontx_ep/meson.build     |   8 +-
 drivers/net/pcap/meson.build            |  10 +-
 drivers/net/pfe/meson.build             |  12 +-
 drivers/net/qede/base/meson.build       |  78 +++---
 drivers/net/qede/meson.build            |  22 +-
 drivers/net/ring/meson.build            |   6 +-
 drivers/net/sfc/meson.build             |  64 ++---
 drivers/net/softnic/meson.build         |  32 +--
 drivers/net/szedata2/meson.build        |   6 +-
 drivers/net/tap/meson.build             |  36 +--
 drivers/net/thunderx/base/meson.build   |  10 +-
 drivers/net/thunderx/meson.build        |  14 +-
 drivers/net/txgbe/base/meson.build      |  26 +-
 drivers/net/txgbe/meson.build           |  24 +-
 drivers/net/vdev_netvsc/meson.build     |   4 +-
 drivers/net/vhost/meson.build           |   6 +-
 drivers/net/virtio/meson.build          |  78 +++---
 drivers/net/vmxnet3/meson.build         |  10 +-
 drivers/raw/ifpga/base/meson.build      |  54 ++--
 drivers/raw/ifpga/meson.build           |   8 +-
 drivers/raw/ioat/meson.build            |  18 +-
 drivers/raw/ntb/meson.build             |   2 +-
 drivers/raw/octeontx2_dma/meson.build   |   8 +-
 drivers/raw/octeontx2_ep/meson.build    |   6 +-
 drivers/regex/mlx5/meson.build          |  32 +--
 drivers/regex/octeontx2/meson.build     |  22 +-
 drivers/vdpa/mlx5/meson.build           |  38 +--
 133 files changed, 1827 insertions(+), 1821 deletions(-)

diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build
index 55ef4e4ec7..477b8b371f 100644
--- a/drivers/baseband/turbo_sw/meson.build
+++ b/drivers/baseband/turbo_sw/meson.build
@@ -6,34 +6,34 @@ path = get_option('flexran_sdk')
 # check for FlexRAN SDK libraries for AVX2
 lib4g = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false)
 if lib4g.found()
-	ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
-	ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
-	ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
-	ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
-	ext_deps += cc.find_library('libstdc++', required: true)
-	ext_deps += cc.find_library('libirc', required: true)
-	ext_deps += cc.find_library('libimf', required: true)
-	ext_deps += cc.find_library('libipps', required: true)
-	ext_deps += cc.find_library('libsvml', required: true)
-	includes += include_directories(path + '/lib_turbo')
-	includes += include_directories(path + '/lib_crc')
-	includes += include_directories(path + '/lib_rate_matching')
-	includes += include_directories(path + '/lib_common')
-	cflags += ['-DRTE_BBDEV_SDK_AVX2']
+    ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
+    ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
+    ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
+    ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
+    ext_deps += cc.find_library('libstdc++', required: true)
+    ext_deps += cc.find_library('libirc', required: true)
+    ext_deps += cc.find_library('libimf', required: true)
+    ext_deps += cc.find_library('libipps', required: true)
+    ext_deps += cc.find_library('libsvml', required: true)
+    includes += include_directories(path + '/lib_turbo')
+    includes += include_directories(path + '/lib_crc')
+    includes += include_directories(path + '/lib_rate_matching')
+    includes += include_directories(path + '/lib_common')
+    cflags += ['-DRTE_BBDEV_SDK_AVX2']
 endif
 
 # check for FlexRAN SDK libraries for AVX512
 lib5g = cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: false)
 if lib5g.found()
-	ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
-	ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
-	includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
-	includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
-	includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
-	includes += include_directories(path + '/lib_rate_dematching_5gnr')
-	cflags += ['-DRTE_BBDEV_SDK_AVX512']
+    ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
+    ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
+    includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
+    includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
+    includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
+    includes += include_directories(path + '/lib_rate_dematching_5gnr')
+    cflags += ['-DRTE_BBDEV_SDK_AVX512']
 endif
 
 deps += ['bbdev', 'bus_vdev', 'ring']
diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build
index a3471403e2..9ff7bf21de 100644
--- a/drivers/bus/dpaa/meson.build
+++ b/drivers/bus/dpaa/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev']
 sources = files('base/fman/fman.c',
-		'base/fman/fman_hw.c',
-		'base/fman/netcfg_layer.c',
-		'base/qbman/bman.c',
-		'base/qbman/bman_driver.c',
-		'base/qbman/dpaa_alloc.c',
-		'base/qbman/dpaa_sys.c',
-		'base/qbman/process.c',
-		'base/qbman/qman.c',
-		'base/qbman/qman_driver.c',
-		'dpaa_bus.c')
+        'base/fman/fman_hw.c',
+        'base/fman/netcfg_layer.c',
+        'base/qbman/bman.c',
+        'base/qbman/bman_driver.c',
+        'base/qbman/dpaa_alloc.c',
+        'base/qbman/dpaa_sys.c',
+        'base/qbman/process.c',
+        'base/qbman/qman.c',
+        'base/qbman/qman_driver.c',
+        'dpaa_bus.c')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('include', 'base/qbman')
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index 260e7ef712..90f3e5674a 100644
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -2,24 +2,24 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev', 'kvargs']
 sources = files('fslmc_bus.c',
-		'fslmc_vfio.c',
-		'mc/dpbp.c',
-		'mc/dpci.c',
-		'mc/dpcon.c',
-		'mc/dpdmai.c',
-		'mc/dpio.c',
-		'mc/dpmng.c',
-		'mc/mc_sys.c',
-		'portal/dpaa2_hw_dpbp.c',
-		'portal/dpaa2_hw_dpci.c',
-		'portal/dpaa2_hw_dpio.c',
-		'qbman/qbman_portal.c',
-		'qbman/qbman_debug.c')
+        'fslmc_vfio.c',
+        'mc/dpbp.c',
+        'mc/dpci.c',
+        'mc/dpcon.c',
+        'mc/dpdmai.c',
+        'mc/dpio.c',
+        'mc/dpmng.c',
+        'mc/mc_sys.c',
+        'portal/dpaa2_hw_dpbp.c',
+        'portal/dpaa2_hw_dpci.c',
+        'portal/dpaa2_hw_dpio.c',
+        'qbman/qbman_portal.c',
+        'qbman/qbman_debug.c')
 
 includes += include_directories('mc', 'qbman/include', 'portal')
diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build
index 4d0507f553..cc5047e3ce 100644
--- a/drivers/bus/ifpga/meson.build
+++ b/drivers/bus/ifpga/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2010-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
 
 deps += ['pci', 'kvargs', 'rawdev']
diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build
index 78ec830b25..800ef7eabe 100644
--- a/drivers/bus/pci/meson.build
+++ b/drivers/bus/pci/meson.build
@@ -4,23 +4,23 @@
 deps += ['pci']
 headers = files('rte_bus_pci.h')
 sources = files('pci_common.c',
-	'pci_params.c')
+    'pci_params.c')
 if is_linux
-	sources += files('pci_common_uio.c',
-			'linux/pci.c',
-			'linux/pci_uio.c',
-			'linux/pci_vfio.c')
-	includes += include_directories('linux')
+    sources += files('pci_common_uio.c',
+            'linux/pci.c',
+            'linux/pci_uio.c',
+            'linux/pci_vfio.c')
+    includes += include_directories('linux')
 endif
 if is_freebsd
-	sources += files('pci_common_uio.c',
-			'bsd/pci.c')
-	includes += include_directories('bsd')
+    sources += files('pci_common_uio.c',
+            'bsd/pci.c')
+    includes += include_directories('bsd')
 endif
 if is_windows
-	sources += files('windows/pci.c',
-			'windows/pci_netuio.c')
-	includes += include_directories('windows')
+    sources += files('windows/pci.c',
+            'windows/pci_netuio.c')
+    includes += include_directories('windows')
 endif
 
 deps += ['kvargs']
diff --git a/drivers/bus/vdev/meson.build b/drivers/bus/vdev/meson.build
index 44b2966baa..3537423346 100644
--- a/drivers/bus/vdev/meson.build
+++ b/drivers/bus/vdev/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('vdev.c',
-	'vdev_params.c')
+    'vdev_params.c')
 headers = files('rte_bus_vdev.h')
 
 deps += ['kvargs']
diff --git a/drivers/bus/vmbus/meson.build b/drivers/bus/vmbus/meson.build
index 47e26703aa..50a2409e0b 100644
--- a/drivers/bus/vmbus/meson.build
+++ b/drivers/bus/vmbus/meson.build
@@ -1,24 +1,24 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 
 headers = files('rte_bus_vmbus.h','rte_vmbus_reg.h')
 
 sources = files('vmbus_common.c',
-		'vmbus_channel.c',
-		'vmbus_bufring.c',
-		'vmbus_common_uio.c')
+        'vmbus_channel.c',
+        'vmbus_bufring.c',
+        'vmbus_common_uio.c')
 
 if is_linux
-	sources += files('linux/vmbus_bus.c',
-			'linux/vmbus_uio.c')
-	includes += include_directories('linux')
+    sources += files('linux/vmbus_bus.c',
+            'linux/vmbus_uio.c')
+    includes += include_directories('linux')
 else
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index 4573d1388a..178bce7ab8 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -3,46 +3,48 @@
 #
 
 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
 
 config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
 deps = ['eal', 'pci', 'bus_pci', 'mbuf']
-sources = files('roc_dev.c',
-		'roc_idev.c',
-		'roc_irq.c',
-		'roc_mbox.c',
-		'roc_model.c',
-		'roc_nix.c',
-		'roc_nix_debug.c',
-		'roc_nix_fc.c',
-		'roc_nix_irq.c',
-		'roc_nix_mac.c',
-		'roc_nix_mcast.c',
-		'roc_nix_npc.c',
-		'roc_nix_ops.c',
-		'roc_nix_ptp.c',
-		'roc_nix_queue.c',
-		'roc_nix_rss.c',
-		'roc_nix_stats.c',
-		'roc_nix_tm.c',
-		'roc_nix_tm_ops.c',
-		'roc_nix_tm_utils.c',
-		'roc_nix_vlan.c',
-		'roc_npa.c',
-		'roc_npa_debug.c',
-		'roc_npa_irq.c',
-		'roc_npc.c',
-		'roc_npc_mcam.c',
-		'roc_npc_parse.c',
-		'roc_npc_utils.c',
-		'roc_platform.c',
-		'roc_sso.c',
-		'roc_sso_debug.c',
-		'roc_sso_irq.c',
-		'roc_tim.c',
-		'roc_tim_irq.c',
-		'roc_utils.c')
+sources = files(
+        'roc_dev.c',
+        'roc_idev.c',
+        'roc_irq.c',
+        'roc_mbox.c',
+        'roc_model.c',
+        'roc_nix.c',
+        'roc_nix_debug.c',
+        'roc_nix_fc.c',
+        'roc_nix_irq.c',
+        'roc_nix_mac.c',
+        'roc_nix_mcast.c',
+        'roc_nix_npc.c',
+        'roc_nix_ops.c',
+        'roc_nix_ptp.c',
+        'roc_nix_queue.c',
+        'roc_nix_rss.c',
+        'roc_nix_stats.c',
+        'roc_nix_tm.c',
+        'roc_nix_tm_ops.c',
+        'roc_nix_tm_utils.c',
+        'roc_nix_vlan.c',
+        'roc_npa.c',
+        'roc_npa_debug.c',
+        'roc_npa_irq.c',
+        'roc_npc.c',
+        'roc_npc_mcam.c',
+        'roc_npc_parse.c',
+        'roc_npc_utils.c',
+        'roc_platform.c',
+        'roc_sso.c',
+        'roc_sso_debug.c',
+        'roc_sso_irq.c',
+        'roc_tim.c',
+        'roc_tim_irq.c',
+        'roc_utils.c',
+)
 includes += include_directories('../../bus/pci')
diff --git a/drivers/common/cpt/meson.build b/drivers/common/cpt/meson.build
index 1127267ba5..c09824a651 100644
--- a/drivers/common/cpt/meson.build
+++ b/drivers/common/cpt/meson.build
@@ -2,13 +2,12 @@
 # Copyright(c) 2018 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('cpt_fpm_tables.c',
-		'cpt_pmd_ops_helper.c')
+sources = files('cpt_fpm_tables.c', 'cpt_pmd_ops_helper.c')
 
 deps = ['kvargs', 'pci', 'cryptodev']
 includes += include_directories('../../crypto/octeontx')
diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build
index b7f177a62e..a162779116 100644
--- a/drivers/common/dpaax/meson.build
+++ b/drivers/common/dpaax/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
@@ -11,8 +11,8 @@ sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
 includes += include_directories('caamflib')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 5d6a861689..3ca24988fc 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -9,48 +9,47 @@ LIB_GLUE_BASE = 'librte_common_mlx5_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+            '-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
+            '-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx5', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs, required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources += files('mlx5_nl.c')
 sources += files('mlx5_common_os.c')
 sources += files('mlx5_common_verbs.c')
 if not dlopen_ibverbs
-	sources += files('mlx5_glue.c')
+    sources += files('mlx5_glue.c')
 endif
 
 # To maintain the compatibility with the make build system
@@ -59,171 +58,167 @@ endif
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search", "struct member to search" ]
 has_member_args = [
-	[ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
-	'struct ibv_counter_set_init_attr', 'counter_set_id' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
-	'struct ibv_counters_init_attr', 'comp_mask' ],
-	[ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_devx_uar', 'mmap_off' ],
+        [ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
+            'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
+        [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
+            'struct ibv_counter_set_init_attr', 'counter_set_id' ],
+        [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
+            'struct ibv_counters_init_attr', 'comp_mask' ],
+        [ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
+            'struct mlx5dv_devx_uar', 'mmap_off' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
-	'IBV_ACCESS_RELAXED_ORDERING ' ],
-	[ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
-	[ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
-	[ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
-	[ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_create_flow_action_packet_reformat' ],
-	[ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
-	'IBV_FLOW_SPEC_MPLS' ],
-	[ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
-	[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAG_RX_END_PADDING' ],
-	[ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_query_devx_port' ],
-	[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_create' ],
-	[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
-	[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_query_async' ],
-	[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_qp_query' ],
-	[ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
-	'mlx5dv_pp_alloc' ],
-	[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_devx_tir' ],
-	[ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_get_event' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_meter' ],
-	[ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
-	'MLX5_MMAP_GET_NC_PAGES_CMD' ],
-	[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
-	[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
-	[ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_push_vlan' ],
-	[ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
-	[ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_ENHANCED_MPSW' ],
-	[ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_SEND_EN' ],
-	[ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_WAIT' ],
+        [ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
+            'IBV_ACCESS_RELAXED_ORDERING ' ],
+        [ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
+            'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
+        [ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
+        [ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
+        [ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
+        [ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
+            'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
+        [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
+            'mlx5dv_create_flow_action_packet_reformat' ],
+        [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
+            'IBV_FLOW_SPEC_MPLS' ],
+        [ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
+            'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
+        [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
+            'IBV_WQ_FLAG_RX_END_PADDING' ],
+        [ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
+            'mlx5dv_query_devx_port' ],
+        [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_obj_create' ],
+        [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
+            'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
+            'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
+        [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_obj_query_async' ],
+        [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_qp_query' ],
+        [ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
+            'mlx5dv_pp_alloc' ],
+        [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_dest_devx_tir' ],
+        [ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_get_event' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_flow_meter' ],
+        [ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
+            'MLX5_MMAP_GET_NC_PAGES_CMD' ],
+        [ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
+            'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
+        [ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
+            'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
+        [ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_push_vlan' ],
+        [ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
+        [ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_ENHANCED_MPSW' ],
+        [ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_SEND_EN' ],
+        [ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_WAIT' ],
         [ 'HAVE_MLX5_OPCODE_ACCESS_ASO', 'infiniband/mlx5dv.h',
-        'MLX5_OPCODE_ACCESS_ASO' ],
-	[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseLR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseLR4_Full' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
-	[ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
-	'IFLA_NUM_VF' ],
-	[ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
-	'IFLA_EXT_MASK' ],
-	[ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
-	'IFLA_PHYS_SWITCH_ID' ],
-	[ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
-	'IFLA_PHYS_PORT_NAME' ],
-	[ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
-	'RDMA_NL_NLDEV' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_GET' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_PORT_GET' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_NAME' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_PORT_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
-	[ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
-	'mlx5dv_dump_dr_domain'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_sampler'],
-	[ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_domain_set_reclaim_device_memory'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_array'],
-	[ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_aso' ],
-	[ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
-	'INFINIBAND_VERBS_H' ],
+            'MLX5_OPCODE_ACCESS_ASO' ],
+        [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseKR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseCR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseSR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseLR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseKR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseCR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseSR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseLR4_Full' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
+        [ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
+            'IFLA_NUM_VF' ],
+        [ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
+            'IFLA_EXT_MASK' ],
+        [ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
+            'IFLA_PHYS_SWITCH_ID' ],
+        [ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
+            'IFLA_PHYS_PORT_NAME' ],
+        [ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
+            'RDMA_NL_NLDEV' ],
+        [ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_CMD_GET' ],
+        [ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_CMD_PORT_GET' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_DEV_INDEX' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_DEV_NAME' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_PORT_INDEX' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
+        [ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
+            'mlx5dv_dump_dr_domain'],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_flow_sampler'],
+        [ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_domain_set_reclaim_device_memory'],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_dest_array'],
+        [ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_aso' ],
+        [ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
+            'INFINIBAND_VERBS_H' ],
         [ 'HAVE_MLX5_UMR_IMKEY', 'infiniband/mlx5dv.h',
-        'MLX5_WQE_UMR_CTRL_FLAG_INLINE' ],
+            'MLX5_WQE_UMR_CTRL_FLAG_INLINE' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix : file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3], prefix : file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx5_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx5_glue'
-	dlopen_lib_name = 'rte_common_' + dlopen_name
-	dlopen_so_version = LIB_GLUE_VERSION
-	dlopen_sources = files('mlx5_glue.c')
-	dlopen_install_dir = [ eal_pmd_path + '-glue' ]
-	dlopen_includes = [global_inc]
-	dlopen_includes += include_directories(
-		'../../../../lib/librte_eal/include/generic',
-	)
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: dlopen_includes,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx5_glue'
+    dlopen_lib_name = 'rte_common_' + dlopen_name
+    dlopen_so_version = LIB_GLUE_VERSION
+    dlopen_sources = files('mlx5_glue.c')
+    dlopen_install_dir = [ eal_pmd_path + '-glue' ]
+    dlopen_includes = [global_inc]
+    dlopen_includes += include_directories('../../../../lib/librte_eal/include/generic')
+    shared_lib = shared_library(
+            dlopen_lib_name,
+            dlopen_sources,
+            include_directories: dlopen_includes,
+            c_args: cflags,
+            dependencies: libs,
+            link_args: [
+                '-Wl,-export-dynamic',
+                '-Wl,-h,@0@'.format(LIB_GLUE),
+            ],
+            soversion: dlopen_so_version,
+            install: true,
+            install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index b2efea4432..b5585d2cc3 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -2,38 +2,38 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not (is_linux or (is_windows and is_ms_linker))
-	build = false
-	reason = 'only supported on Linux and Windows build with clang'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows build with clang'
+    subdir_done()
 endif
 
 deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs']
 sources += files(
-	'mlx5_devx_cmds.c',
-	'mlx5_common.c',
-	'mlx5_common_mp.c',
-	'mlx5_common_mr.c',
-	'mlx5_malloc.c',
-	'mlx5_common_pci.c',
-	'mlx5_common_devx.c',
+        'mlx5_devx_cmds.c',
+        'mlx5_common.c',
+        'mlx5_common_mp.c',
+        'mlx5_common_mr.c',
+        'mlx5_malloc.c',
+        'mlx5_common_pci.c',
+        'mlx5_common_devx.c',
 )
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 subdir(exec_env)
diff --git a/drivers/common/mlx5/windows/meson.build b/drivers/common/mlx5/windows/meson.build
index 16349c34f1..4a34a15eae 100644
--- a/drivers/common/mlx5/windows/meson.build
+++ b/drivers/common/mlx5/windows/meson.build
@@ -4,17 +4,17 @@
 includes += include_directories('.')
 
 sources += files(
-	'mlx5_glue.c',
-	'mlx5_common_os.c',
+        'mlx5_glue.c',
+        'mlx5_common_os.c',
 )
 
 res_lib = run_command(python3, '-c', 'import os; print(os.environ["DEVX_LIB_PATH"])')
 res_inc = run_command(python3, '-c', 'import os; print(os.environ["DEVX_INC_PATH"])')
 
 if (res_lib.returncode() != 0 or res_inc.returncode() != 0)
-	build = false
-	reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
-	subdir_done()
+    build = false
+    reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
+    subdir_done()
 endif
 
 devx_lib_dir = res_lib.stdout().strip()
@@ -23,21 +23,21 @@ devx_inc_dir = res_inc.stdout().strip()
 ext_deps += cc.find_library('mlx5devx', dirs: devx_lib_dir, required: true)
 includes += include_directories(devx_inc_dir)
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 # Generate an empty mlx5_autoconf.h file for compatibility with Linux
diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index a929e2311e..0e17e100cd 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -5,16 +5,16 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/common/octeontx/meson.build b/drivers/common/octeontx/meson.build
index 02b57b95c5..fcda0f6445 100644
--- a/drivers/common/octeontx/meson.build
+++ b/drivers/common/octeontx/meson.build
@@ -3,9 +3,9 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files('octeontx_mbox.c')
diff --git a/drivers/common/octeontx2/meson.build b/drivers/common/octeontx2/meson.build
index 97293d1a7c..ae22db060b 100644
--- a/drivers/common/octeontx2/meson.build
+++ b/drivers/common/octeontx2/meson.build
@@ -3,24 +3,27 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources= files('otx2_dev.c',
-		'otx2_irq.c',
-		'otx2_mbox.c',
-		'otx2_common.c',
-		'otx2_sec_idev.c',
-	       )
+        'otx2_irq.c',
+        'otx2_mbox.c',
+        'otx2_common.c',
+        'otx2_sec_idev.c',
+)
 
 deps = ['eal', 'pci', 'ethdev', 'kvargs']
-includes += include_directories('../../common/octeontx2',
-		'../../mempool/octeontx2', '../../bus/pci')
+includes += include_directories(
+        '../../common/octeontx2',
+        '../../mempool/octeontx2',
+        '../../bus/pci',
+)
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index fe278f734f..0690b24e2d 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017-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
 
 qat_crypto = true
@@ -15,55 +15,58 @@ qat_compress_path = 'compress/qat'
 qat_compress_relpath = '../../' + qat_compress_path
 
 if disable_drivers.contains(qat_crypto_path)
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 if disable_drivers.contains(qat_compress_path)
-	qat_compress = false
-	dpdk_drvs_disabled += qat_compress_path
-	set_variable(qat_compress_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_compress = false
+    dpdk_drvs_disabled += qat_compress_path
+    set_variable(qat_compress_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 
 libcrypto = dependency('libcrypto', required: false, method: 'pkg-config')
 if qat_crypto and not libcrypto.found()
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'missing dependency, libcrypto')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'missing dependency, libcrypto')
 endif
 
 # The driver should not build if both compression and crypto are disabled
 #FIXME common code depends on compression files so check only compress!
 if not qat_compress # and not qat_crypto
-	build = false
-	reason = '' # rely on reason for compress/crypto above
-	subdir_done()
+    build = false
+    reason = '' # rely on reason for compress/crypto above
+    subdir_done()
 endif
 
 deps += ['bus_pci', 'cryptodev', 'net', 'compressdev']
-sources += files('qat_common.c',
-		'qat_qp.c',
-		'qat_device.c',
-		'qat_logs.c')
+sources += files(
+        'qat_common.c',
+        'qat_qp.c',
+        'qat_device.c',
+        'qat_logs.c',
+)
 includes += include_directories('qat_adf',
-		qat_crypto_relpath,
-		qat_compress_relpath)
+        qat_crypto_relpath,
+        qat_compress_relpath,
+)
 
 if qat_compress
-	foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
-		sources += files(join_paths(qat_compress_relpath, f))
-	endforeach
+    foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
+        sources += files(join_paths(qat_compress_relpath, f))
+    endforeach
 endif
 
 if qat_crypto
-	foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
-			'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
-		sources += files(join_paths(qat_crypto_relpath, f))
-	endforeach
-	deps += ['security']
-	ext_deps += libcrypto
-	cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
+    foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
+            'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
+        sources += files(join_paths(qat_crypto_relpath, f))
+    endforeach
+    deps += ['security']
+    ext_deps += libcrypto
+    cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
 endif
diff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build
index 1a39418c65..313e53d77a 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -6,87 +6,87 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 sources = [
-	'efx_bootcfg.c',
-	'efx_crc32.c',
-	'efx_ev.c',
-	'efx_evb.c',
-	'efx_filter.c',
-	'efx_hash.c',
-	'efx_intr.c',
-	'efx_lic.c',
-	'efx_mac.c',
-	'efx_mae.c',
-	'efx_mcdi.c',
-	'efx_mon.c',
-	'efx_nic.c',
-	'efx_nvram.c',
-	'efx_pci.c',
-	'efx_phy.c',
-	'efx_port.c',
-	'efx_proxy.c',
-	'efx_rx.c',
-	'efx_sram.c',
-	'efx_tunnel.c',
-	'efx_tx.c',
-	'efx_vpd.c',
-	'efx_virtio.c',
-	'mcdi_mon.c',
-	'siena_mac.c',
-	'siena_mcdi.c',
-	'siena_nic.c',
-	'siena_nvram.c',
-	'siena_phy.c',
-	'siena_sram.c',
-	'siena_vpd.c',
-	'ef10_ev.c',
-	'ef10_evb.c',
-	'ef10_filter.c',
-	'ef10_image.c',
-	'ef10_intr.c',
-	'ef10_mac.c',
-	'ef10_mcdi.c',
-	'ef10_nic.c',
-	'ef10_nvram.c',
-	'ef10_phy.c',
-	'ef10_proxy.c',
-	'ef10_rx.c',
-	'ef10_tx.c',
-	'ef10_vpd.c',
-	'hunt_nic.c',
-	'medford_nic.c',
-	'medford2_nic.c',
-	'rhead_ev.c',
-	'rhead_intr.c',
-	'rhead_nic.c',
-	'rhead_pci.c',
-	'rhead_rx.c',
-	'rhead_tunnel.c',
-	'rhead_tx.c',
-	'rhead_virtio.c',
+        'efx_bootcfg.c',
+        'efx_crc32.c',
+        'efx_ev.c',
+        'efx_evb.c',
+        'efx_filter.c',
+        'efx_hash.c',
+        'efx_intr.c',
+        'efx_lic.c',
+        'efx_mac.c',
+        'efx_mae.c',
+        'efx_mcdi.c',
+        'efx_mon.c',
+        'efx_nic.c',
+        'efx_nvram.c',
+        'efx_pci.c',
+        'efx_phy.c',
+        'efx_port.c',
+        'efx_proxy.c',
+        'efx_rx.c',
+        'efx_sram.c',
+        'efx_tunnel.c',
+        'efx_tx.c',
+        'efx_vpd.c',
+        'efx_virtio.c',
+        'mcdi_mon.c',
+        'siena_mac.c',
+        'siena_mcdi.c',
+        'siena_nic.c',
+        'siena_nvram.c',
+        'siena_phy.c',
+        'siena_sram.c',
+        'siena_vpd.c',
+        'ef10_ev.c',
+        'ef10_evb.c',
+        'ef10_filter.c',
+        'ef10_image.c',
+        'ef10_intr.c',
+        'ef10_mac.c',
+        'ef10_mcdi.c',
+        'ef10_nic.c',
+        'ef10_nvram.c',
+        'ef10_phy.c',
+        'ef10_proxy.c',
+        'ef10_rx.c',
+        'ef10_tx.c',
+        'ef10_vpd.c',
+        'hunt_nic.c',
+        'medford_nic.c',
+        'medford2_nic.c',
+        'rhead_ev.c',
+        'rhead_intr.c',
+        'rhead_nic.c',
+        'rhead_pci.c',
+        'rhead_rx.c',
+        'rhead_tunnel.c',
+        'rhead_tx.c',
+        'rhead_virtio.c',
 ]
 
 extra_flags = [
-	'-Wno-sign-compare',
-	'-Wno-unused-parameter',
-	'-Wno-unused-variable',
-	'-Wno-empty-body',
-	'-Wno-unused-but-set-variable'
+        '-Wno-sign-compare',
+        '-Wno-unused-parameter',
+        '-Wno-unused-variable',
+        '-Wno-empty-body',
+        '-Wno-unused-but-set-variable'
 ]
 
 c_args = cflags
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 if build
-	base_lib = static_library('sfc_base', sources,
-		include_directories: includes,
-		dependencies: static_rte_eal,
-		c_args: c_args)
+    base_lib = static_library('sfc_base', sources,
+        include_directories: includes,
+        dependencies: static_rte_eal,
+        c_args: c_args)
 
-	base_objs = base_lib.extract_all_objects()
+    base_objs = base_lib.extract_all_objects()
 else
-	base_objs = []
+    base_objs = []
 endif
diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index 1ca9510733..d87ba396b4 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -6,32 +6,32 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+        '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+        '-Waggregate-return',
+        '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 subdir('base')
@@ -39,8 +39,8 @@ objs = [base_objs]
 
 deps += ['bus_pci']
 sources = files(
-	'sfc_efx.c',
-	'sfc_efx_mcdi.c',
+        'sfc_efx.c',
+        'sfc_efx_mcdi.c',
 )
 
 includes += include_directories('base')
diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meson.build
index d847c2ea6f..4b3eaa2274 100644
--- a/drivers/compress/isal/meson.build
+++ b/drivers/compress/isal/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libisal', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libisal"'
+    build = false
+    reason = 'missing dependency, "libisal"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build
index 2a6dc3f7ca..c5c5edfa7d 100644
--- a/drivers/compress/mlx5/meson.build
+++ b/drivers/compress/mlx5/meson.build
@@ -2,25 +2,25 @@
 # Copyright 2021 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 fmt_name = 'mlx5_compress'
 deps += ['common_mlx5', 'eal', 'compressdev']
 sources = files(
-	'mlx5_compress.c',
+        'mlx5_compress.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/compress/zlib/meson.build b/drivers/compress/zlib/meson.build
index 82cf0dddd6..f8937cad3e 100644
--- a/drivers/compress/zlib/meson.build
+++ b/drivers/compress/zlib/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "zlib"'
+    build = false
+    reason = 'missing dependency, "zlib"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build
index ea83e87740..0fcac2a8eb 100644
--- a/drivers/crypto/aesni_gcm/meson.build
+++ b/drivers/crypto/aesni_gcm/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.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('aesni_gcm_pmd.c', 'aesni_gcm_pmd_ops.c')
diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build
index 419b4743f5..ed6b9f53e4 100644
--- a/drivers/crypto/aesni_mb/meson.build
+++ b/drivers/crypto/aesni_mb/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.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
 
diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build
index 027173bc1e..40a4dbb7bb 100644
--- a/drivers/crypto/armv8/meson.build
+++ b/drivers/crypto/armv8/meson.build
@@ -3,9 +3,9 @@
 
 dep = dependency('libAArch64crypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libAArch64crypto"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libAArch64crypto"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 7aa0f05dbd..7801ab3480 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -5,16 +5,16 @@
 
 deps += ['eal', 'bus_vdev']
 sources = files(
-		'bcmfs_logs.c',
-		'bcmfs_device.c',
-		'bcmfs_vfio.c',
-		'bcmfs_qp.c',
-		'hw/bcmfs4_rm.c',
-		'hw/bcmfs5_rm.c',
-		'hw/bcmfs_rm_common.c',
-		'bcmfs_sym_pmd.c',
-		'bcmfs_sym_capabilities.c',
-		'bcmfs_sym_session.c',
-		'bcmfs_sym.c',
-		'bcmfs_sym_engine.c'
-		)
+        'bcmfs_logs.c',
+        'bcmfs_device.c',
+        'bcmfs_vfio.c',
+        'bcmfs_qp.c',
+        'hw/bcmfs4_rm.c',
+        'hw/bcmfs5_rm.c',
+        'hw/bcmfs_rm_common.c',
+        'bcmfs_sym_pmd.c',
+        'bcmfs_sym_capabilities.c',
+        'bcmfs_sym_session.c',
+        'bcmfs_sym.c',
+        'bcmfs_sym_engine.c'
+        )
diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build
index 68e6b1d44c..b28d5c66af 100644
--- a/drivers/crypto/caam_jr/meson.build
+++ b/drivers/crypto/caam_jr/meson.build
@@ -2,15 +2,15 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_vdev', 'bus_dpaa', 'security']
 sources = files('caam_jr_capabilities.c',
-		'caam_jr_hw.c',
-		'caam_jr_uio.c',
-		'caam_jr.c')
+        'caam_jr_hw.c',
+        'caam_jr_uio.c',
+        'caam_jr.c')
 
 includes += include_directories('../../bus/dpaa/include/')
 includes += include_directories('../../common/dpaax/')
diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index ff66427ae8..2d203fe729 100644
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build
@@ -2,21 +2,21 @@
 # Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 deps += 'bus_pci'
 
 sources = files('rte_ccp_pmd.c',
-		'ccp_crypto.c',
-		'ccp_dev.c',
-		'ccp_pci.c',
-		'ccp_pmd_ops.c')
+        'ccp_crypto.c',
+        'ccp_dev.c',
+        'ccp_pci.c',
+        'ccp_pmd_ops.c')
 
 ext_deps += dep
diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build
index 69c7264e5a..b007f06ba7 100644
--- a/drivers/crypto/dpaa2_sec/meson.build
+++ b/drivers/crypto/dpaa2_sec/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['security', 'mempool_dpaa2']
 sources = files('dpaa2_sec_dpseci.c',
-		'mc/dpseci.c')
+        'mc/dpseci.c')
 
 includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib')
diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build
index c391a26711..44fd60e5ae 100644
--- a/drivers/crypto/dpaa_sec/meson.build
+++ b/drivers/crypto/dpaa_sec/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa', 'mempool_dpaa', 'security']
diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build
index 7560fb7cfa..e6e0f08c3d 100644
--- a/drivers/crypto/kasumi/meson.build
+++ b/drivers/crypto/kasumi/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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
 
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index b4c55b5ff5..c0c828fbf8 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -5,9 +5,9 @@
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build
index 9c0e89c2c3..cef8379ba5 100644
--- a/drivers/crypto/nitrox/meson.build
+++ b/drivers/crypto/nitrox/meson.build
@@ -2,17 +2,17 @@
 # Copyright(C) 2019 Marvell International Ltd.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 sources = files(
-		'nitrox_device.c',
-		'nitrox_hal.c',
-		'nitrox_logs.c',
-		'nitrox_sym.c',
-		'nitrox_sym_capabilities.c',
-		'nitrox_sym_reqmgr.c',
-		'nitrox_qp.c'
-		)
+        'nitrox_device.c',
+        'nitrox_hal.c',
+        'nitrox_logs.c',
+        'nitrox_sym.c',
+        'nitrox_sym_capabilities.c',
+        'nitrox_sym_reqmgr.c',
+        'nitrox_qp.c'
+        )
diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build
index a353d37a10..f08801929d 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -1,17 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 deps += ['common_cpt']
 
 sources = files('otx_cryptodev.c',
-		'otx_cryptodev_capabilities.c',
-		'otx_cryptodev_hw_access.c',
-		'otx_cryptodev_mbox.c',
-		'otx_cryptodev_ops.c')
+        'otx_cryptodev_capabilities.c',
+        'otx_cryptodev_hw_access.c',
+        'otx_cryptodev_mbox.c',
+        'otx_cryptodev_ops.c')
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build
index 283818e5da..00b00df567 100644
--- a/drivers/crypto/octeontx2/meson.build
+++ b/drivers/crypto/octeontx2/meson.build
@@ -2,9 +2,9 @@
 # Copyright (C) 2019 Marvell International Ltd.
 
 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
 
 deps += ['bus_pci']
@@ -15,11 +15,11 @@ deps += ['eventdev']
 deps += ['security']
 
 sources = files('otx2_cryptodev.c',
-		'otx2_cryptodev_capabilities.c',
-		'otx2_cryptodev_hw_access.c',
-		'otx2_cryptodev_mbox.c',
-		'otx2_cryptodev_ops.c',
-		'otx2_cryptodev_sec.c')
+        'otx2_cryptodev_capabilities.c',
+        'otx2_cryptodev_hw_access.c',
+        'otx2_cryptodev_mbox.c',
+        'otx2_cryptodev_ops.c',
+        'otx2_cryptodev_sec.c')
 
 includes += include_directories('../../common/cpt')
 includes += include_directories('../../common/octeontx2')
diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index 47fb2bb751..b21fca0be3 100644
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index 92e0ed6565..523a901664 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -11,14 +11,14 @@ qat_deps += 'cryptodev'
 qat_deps += 'net'
 qat_deps += 'security'
 if dep.found()
-	# Add our sources files to the list
-	qat_sources += files('qat_sym_pmd.c',
-			     'qat_sym.c',
-			     'qat_sym_session.c',
-			     'qat_sym_hw_dp.c',
-			     'qat_asym_pmd.c',
-			     'qat_asym.c')
-	qat_ext_deps += dep
-	qat_cflags += '-DBUILD_QAT_SYM'
-	qat_cflags += '-DBUILD_QAT_ASYM'
+    # Add our sources files to the list
+    qat_sources += files('qat_sym_pmd.c',
+                 'qat_sym.c',
+                 'qat_sym_session.c',
+                 'qat_sym_hw_dp.c',
+                 'qat_asym_pmd.c',
+                 'qat_asym.c')
+    qat_ext_deps += dep
+    qat_cflags += '-DBUILD_QAT_SYM'
+    qat_cflags += '-DBUILD_QAT_ASYM'
 endif
diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build
index b67d9306e0..d510f49970 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -3,16 +3,16 @@
 
 deps += ['bus_vdev', 'reorder']
 sources = files(
-	'rte_cryptodev_scheduler.c',
-	'scheduler_failover.c',
-	'scheduler_multicore.c',
-	'scheduler_pkt_size_distr.c',
-	'scheduler_pmd.c',
-	'scheduler_pmd_ops.c',
-	'scheduler_roundrobin.c',
+        'rte_cryptodev_scheduler.c',
+        'scheduler_failover.c',
+        'scheduler_multicore.c',
+        'scheduler_pkt_size_distr.c',
+        'scheduler_pmd.c',
+        'scheduler_pmd_ops.c',
+        'scheduler_roundrobin.c',
 )
 
 headers = files(
-	'rte_cryptodev_scheduler.h',
-	'rte_cryptodev_scheduler_operations.h',
+        'rte_cryptodev_scheduler.h',
+        'rte_cryptodev_scheduler_operations.h',
 )
diff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build
index c1c5fd37f7..0c087baa2a 100644
--- a/drivers/crypto/snow3g/meson.build
+++ b/drivers/crypto/snow3g/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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))
+    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
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 
 endif
 
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 20e9e9551e..950f411327 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -4,4 +4,4 @@
 includes += include_directories('../../../lib/librte_vhost')
 deps += 'bus_pci'
 sources = files('virtio_cryptodev.c', 'virtio_pci.c',
-		'virtio_rxtx.c', 'virtqueue.c')
+        'virtio_rxtx.c', 'virtqueue.c')
diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build
index c3454d799e..a5f77a22d8 100644
--- a/drivers/crypto/zuc/meson.build
+++ b/drivers/crypto/zuc/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.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
-	# 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
 
diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build
index f22638b8e4..5f2d7ccc8b 100644
--- a/drivers/event/dlb2/meson.build
+++ b/drivers/event/dlb2/meson.build
@@ -9,13 +9,13 @@ if not is_linux or not dpdk_conf.has('RTE_ARCH_X86_64')
 endif
 
 sources = files('dlb2.c',
-		'dlb2_iface.c',
-		'dlb2_xstats.c',
-		'pf/dlb2_main.c',
-		'pf/dlb2_pf.c',
-		'pf/base/dlb2_resource.c',
-		'rte_pmd_dlb2.c',
-		'dlb2_selftest.c'
+        'dlb2_iface.c',
+        'dlb2_xstats.c',
+        'pf/dlb2_main.c',
+        'pf/dlb2_pf.c',
+        'pf/base/dlb2_resource.c',
+        'rte_pmd_dlb2.c',
+        'dlb2_selftest.c'
 )
 
 headers = files('rte_pmd_dlb2.h')
diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build
index 85105a210b..4d7d0021ad 100644
--- a/drivers/event/dpaa/meson.build
+++ b/drivers/event/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['net_dpaa', 'crypto_dpaa_sec']
 sources = files('dpaa_eventdev.c')
diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build
index 21aff6276a..3553057788 100644
--- a/drivers/event/dpaa2/meson.build
+++ b/drivers/event/dpaa2/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec']
 sources = files('dpaa2_hw_dpcon.c',
-		'dpaa2_eventdev.c',
-		'dpaa2_eventdev_selftest.c')
+        'dpaa2_eventdev.c',
+        'dpaa2_eventdev_selftest.c')
 
 includes += include_directories('../../crypto/dpaa2_sec/')
diff --git a/drivers/event/dsw/meson.build b/drivers/event/dsw/meson.build
index 60ab13d906..2df0fac4ff 100644
--- a/drivers/event/dsw/meson.build
+++ b/drivers/event/dsw/meson.build
@@ -3,6 +3,6 @@
 
 deps += ['bus_vdev']
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
 sources = files('dsw_evdev.c', 'dsw_event.c', 'dsw_xstats.c')
diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build
index 41e367684c..c088554199 100644
--- a/drivers/event/octeontx/meson.build
+++ b/drivers/event/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = files('ssovf_worker.c',
-		'ssovf_evdev.c',
-		'ssovf_evdev_selftest.c',
-		'ssovf_probe.c',
-		'timvf_worker.c',
-		'timvf_evdev.c',
-		'timvf_probe.c'
+        'ssovf_evdev.c',
+        'ssovf_evdev_selftest.c',
+        'ssovf_probe.c',
+        'timvf_worker.c',
+        'timvf_evdev.c',
+        'timvf_probe.c'
 )
 
 deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx']
diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build
index 22e7e4cb63..f6f9e028ee 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -3,21 +3,21 @@
 #
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_worker.c',
-		'otx2_worker_dual.c',
-		'otx2_evdev.c',
-		'otx2_evdev_adptr.c',
-		'otx2_evdev_crypto_adptr.c',
-		'otx2_evdev_irq.c',
-		'otx2_evdev_selftest.c',
-		'otx2_tim_evdev.c',
-		'otx2_tim_worker.c'
-		)
+        'otx2_worker_dual.c',
+        'otx2_evdev.c',
+        'otx2_evdev_adptr.c',
+        'otx2_evdev_crypto_adptr.c',
+        'otx2_evdev_irq.c',
+        'otx2_evdev_selftest.c',
+        'otx2_tim_evdev.c',
+        'otx2_tim_worker.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'crypto_octeontx2', 'mempool_octeontx2', 'net_octeontx2']
 
diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build
index cc6029c6f0..786d2f4e82 100644
--- a/drivers/event/opdl/meson.build
+++ b/drivers/event/opdl/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = files(
-	'opdl_evdev.c',
-	'opdl_evdev_init.c',
-	'opdl_evdev_xstats.c',
-	'opdl_ring.c',
-	'opdl_test.c',
+        'opdl_evdev.c',
+        'opdl_evdev_init.c',
+        'opdl_evdev_xstats.c',
+        'opdl_ring.c',
+        'opdl_test.c',
 )
 deps += ['bus_vdev']
diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build
index 985012219b..db403b1b8f 100644
--- a/drivers/event/sw/meson.build
+++ b/drivers/event/sw/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('sw_evdev_scheduler.c',
-	'sw_evdev_selftest.c',
-	'sw_evdev_worker.c',
-	'sw_evdev_xstats.c',
-	'sw_evdev.c'
+    'sw_evdev_selftest.c',
+    'sw_evdev_worker.c',
+    'sw_evdev_xstats.c',
+    'sw_evdev.c'
 )
 deps += ['hash', 'bus_vdev']
diff --git a/drivers/mempool/bucket/meson.build b/drivers/mempool/bucket/meson.build
index 61de2dc9b9..0051b6ac3c 100644
--- a/drivers/mempool/bucket/meson.build
+++ b/drivers/mempool/bucket/meson.build
@@ -7,8 +7,8 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_bucket.c')
diff --git a/drivers/mempool/cnxk/meson.build b/drivers/mempool/cnxk/meson.build
index 3282b5e5a6..e28a9e044d 100644
--- a/drivers/mempool/cnxk/meson.build
+++ b/drivers/mempool/cnxk/meson.build
@@ -3,14 +3,16 @@
 #
 
 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('cnxk_mempool.c',
-		'cnxk_mempool_ops.c',
-		'cn9k_mempool_ops.c',
-		'cn10k_mempool_ops.c')
+sources = files(
+        'cnxk_mempool.c',
+        'cnxk_mempool_ops.c',
+        'cn9k_mempool_ops.c',
+        'cn10k_mempool_ops.c',
+)
 
 deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_cnxk', 'mempool']
diff --git a/drivers/mempool/dpaa/meson.build b/drivers/mempool/dpaa/meson.build
index 09f5295d95..c4e9994b83 100644
--- a/drivers/mempool/dpaa/meson.build
+++ b/drivers/mempool/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa']
diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build
index 17ad0a8ea7..3d16d44158 100644
--- a/drivers/mempool/dpaa2/meson.build
+++ b/drivers/mempool/dpaa2/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_fslmc']
diff --git a/drivers/mempool/octeontx/meson.build b/drivers/mempool/octeontx/meson.build
index b5695a9329..2b8879d0c9 100644
--- a/drivers/mempool/octeontx/meson.build
+++ b/drivers/mempool/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('octeontx_fpavf.c',
-		'rte_mempool_octeontx.c'
+        'rte_mempool_octeontx.c'
 )
 
 deps += ['mbuf', 'bus_pci', 'common_octeontx']
diff --git a/drivers/mempool/octeontx2/meson.build b/drivers/mempool/octeontx2/meson.build
index 0586321abe..8a89288251 100644
--- a/drivers/mempool/octeontx2/meson.build
+++ b/drivers/mempool/octeontx2/meson.build
@@ -3,20 +3,20 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_mempool_ops.c',
-		'otx2_mempool.c',
-		'otx2_mempool_irq.c',
-		'otx2_mempool_debug.c'
-		)
+        'otx2_mempool.c',
+        'otx2_mempool_irq.c',
+        'otx2_mempool_debug.c'
+        )
 
 deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_octeontx2', 'mempool']
diff --git a/drivers/mempool/stack/meson.build b/drivers/mempool/stack/meson.build
index 8425772a42..371cf131b1 100644
--- a/drivers/mempool/stack/meson.build
+++ b/drivers/mempool/stack/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_stack.c')
diff --git a/drivers/net/af_packet/meson.build b/drivers/net/af_packet/meson.build
index 50a2f05d34..c014e9b61b 100644
--- a/drivers/net/af_packet/meson.build
+++ b/drivers/net/af_packet/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('rte_eth_af_packet.c')
diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index 60ccffabb9..3ed2b29784 100644
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -2,26 +2,26 @@
 # 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('rte_eth_af_xdp.c')
 
 bpf_dep = dependency('libbpf', required: false, method: 'pkg-config')
 if not bpf_dep.found()
-	bpf_dep = cc.find_library('bpf', required: false)
+    bpf_dep = cc.find_library('bpf', required: false)
 endif
 
 if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linux/if_xdp.h')
-	ext_deps += bpf_dep
-	bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
-			required: false, method: 'pkg-config')
-	if bpf_ver_dep.found()
-		dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
-	endif
+    ext_deps += bpf_dep
+    bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
+            required: false, method: 'pkg-config')
+    if bpf_ver_dep.found()
+        dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
+    endif
 else
-	build = false
-	reason = 'missing dependency, "libbpf"'
+    build = false
+    reason = 'missing dependency, "libbpf"'
 endif
diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build
index 91e8c0ddac..8d87744c22 100644
--- a/drivers/net/ark/meson.build
+++ b/drivers/net/ark/meson.build
@@ -2,18 +2,20 @@
 # 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('ark_ddm.c',
-	'ark_ethdev.c',
-	'ark_ethdev_rx.c',
-	'ark_ethdev_tx.c',
-	'ark_mpu.c',
-	'ark_pktchkr.c',
-	'ark_pktdir.c',
-	'ark_pktgen.c',
-	'ark_rqp.c',
-	'ark_udm.c')
+sources = files(
+        'ark_ddm.c',
+        'ark_ethdev.c',
+        'ark_ethdev_rx.c',
+        'ark_ethdev_tx.c',
+        'ark_mpu.c',
+        'ark_pktchkr.c',
+        'ark_pktdir.c',
+        'ark_pktgen.c',
+        'ark_rqp.c',
+        'ark_udm.c',
+)
diff --git a/drivers/net/atlantic/meson.build b/drivers/net/atlantic/meson.build
index 01373f868d..bf5e47eaaf 100644
--- a/drivers/net/atlantic/meson.build
+++ b/drivers/net/atlantic/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2018 Aquantia 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(
-	'atl_rxtx.c',
-	'atl_ethdev.c',
-	'atl_hw_regs.c',
-	'hw_atl/hw_atl_b0.c',
-	'hw_atl/hw_atl_llh.c',
-	'hw_atl/hw_atl_utils_fw2x.c',
-	'hw_atl/hw_atl_utils.c',
-	'rte_pmd_atlantic.c',
+        'atl_rxtx.c',
+        'atl_ethdev.c',
+        'atl_hw_regs.c',
+        'hw_atl/hw_atl_b0.c',
+        'hw_atl/hw_atl_llh.c',
+        'hw_atl/hw_atl_utils_fw2x.c',
+        'hw_atl/hw_atl_utils.c',
+        'rte_pmd_atlantic.c',
 )
diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
index 61c8d5b9f0..ea9dd1f20e 100644
--- a/drivers/net/avp/meson.build
+++ b/drivers/net/avp/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('avp_ethdev.c')
 headers = files('rte_avp_common.h', 'rte_avp_fifo.h')
diff --git a/drivers/net/axgbe/meson.build b/drivers/net/axgbe/meson.build
index 198e198767..cd2c747b13 100644
--- a/drivers/net/axgbe/meson.build
+++ b/drivers/net/axgbe/meson.build
@@ -2,19 +2,19 @@
 # Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('axgbe_ethdev.c',
-		'axgbe_dev.c',
-		'axgbe_mdio.c',
-		'axgbe_phy_impl.c',
-		'axgbe_i2c.c',
-		'axgbe_rxtx.c')
+        'axgbe_dev.c',
+        'axgbe_mdio.c',
+        'axgbe_phy_impl.c',
+        'axgbe_i2c.c',
+        'axgbe_rxtx.c')
 
 cflags += '-Wno-cast-qual'
 
 if arch_subdir == 'x86'
-	sources += files('axgbe_rxtx_vec_sse.c')
+    sources += files('axgbe_rxtx_vec_sse.c')
 endif
diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
index e260b75926..4714ec4935 100644
--- a/drivers/net/bnx2x/meson.build
+++ b/drivers/net/bnx2x/meson.build
@@ -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
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
@@ -13,9 +13,9 @@ reason = 'missing dependency, "zlib"'
 ext_deps += dep
 cflags += '-DZLIB_CONST'
 sources = files('bnx2x.c',
-	'bnx2x_ethdev.c',
-	'bnx2x_rxtx.c',
-	'bnx2x_stats.c',
-	'bnx2x_vfpf.c',
-	'ecore_sp.c',
-	'elink.c')
+    'bnx2x_ethdev.c',
+    'bnx2x_rxtx.c',
+    'bnx2x_stats.c',
+    'bnx2x_vfpf.c',
+    'ecore_sp.c',
+    'elink.c')
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 092655697f..0448e12bc3 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -3,9 +3,9 @@
 # Copyright(c) 2020 Broadcom
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 headers = files('rte_pmd_bnxt.h')
@@ -14,72 +14,72 @@ includes += include_directories('tf_ulp')
 includes += include_directories('tf_core')
 
 sources = files('bnxt_cpr.c',
-	'bnxt_ethdev.c',
-	'bnxt_filter.c',
-	'bnxt_flow.c',
-	'bnxt_hwrm.c',
-	'bnxt_irq.c',
-	'bnxt_ring.c',
-	'bnxt_rxq.c',
-	'bnxt_rxr.c',
-	'bnxt_stats.c',
-	'bnxt_txq.c',
-	'bnxt_txr.c',
-	'bnxt_util.c',
-	'bnxt_vnic.c',
-	'bnxt_reps.c',
+    'bnxt_ethdev.c',
+    'bnxt_filter.c',
+    'bnxt_flow.c',
+    'bnxt_hwrm.c',
+    'bnxt_irq.c',
+    'bnxt_ring.c',
+    'bnxt_rxq.c',
+    'bnxt_rxr.c',
+    'bnxt_stats.c',
+    'bnxt_txq.c',
+    'bnxt_txr.c',
+    'bnxt_util.c',
+    'bnxt_vnic.c',
+    'bnxt_reps.c',
 
-	'tf_core/tf_core.c',
-	'tf_core/bitalloc.c',
-	'tf_core/tf_msg.c',
-	'tf_core/rand.c',
-	'tf_core/stack.c',
+    'tf_core/tf_core.c',
+    'tf_core/bitalloc.c',
+    'tf_core/tf_msg.c',
+    'tf_core/rand.c',
+    'tf_core/stack.c',
         'tf_core/tf_em_common.c',
         'tf_core/tf_em_internal.c',
-	'tf_core/tf_rm.c',
-	'tf_core/tf_tbl.c',
-	'tf_core/tfp.c',
-	'tf_core/tf_session.c',
-	'tf_core/tf_device.c',
-	'tf_core/tf_device_p4.c',
-	'tf_core/tf_identifier.c',
-	'tf_core/tf_shadow_tbl.c',
-	'tf_core/tf_shadow_tcam.c',
-	'tf_core/tf_tcam.c',
-	'tf_core/tf_util.c',
-	'tf_core/tf_if_tbl.c',
-	'tf_core/ll.c',
-	'tf_core/tf_global_cfg.c',
-	'tf_core/tf_em_host.c',
-	'tf_core/tf_shadow_identifier.c',
-	'tf_core/tf_hash.c',
+    'tf_core/tf_rm.c',
+    'tf_core/tf_tbl.c',
+    'tf_core/tfp.c',
+    'tf_core/tf_session.c',
+    'tf_core/tf_device.c',
+    'tf_core/tf_device_p4.c',
+    'tf_core/tf_identifier.c',
+    'tf_core/tf_shadow_tbl.c',
+    'tf_core/tf_shadow_tcam.c',
+    'tf_core/tf_tcam.c',
+    'tf_core/tf_util.c',
+    'tf_core/tf_if_tbl.c',
+    'tf_core/ll.c',
+    'tf_core/tf_global_cfg.c',
+    'tf_core/tf_em_host.c',
+    'tf_core/tf_shadow_identifier.c',
+    'tf_core/tf_hash.c',
 
-	'hcapi/hcapi_cfa_p4.c',
+    'hcapi/hcapi_cfa_p4.c',
 
-	'tf_ulp/bnxt_ulp.c',
-	'tf_ulp/ulp_mark_mgr.c',
-	'tf_ulp/ulp_flow_db.c',
-	'tf_ulp/ulp_template_db_tbl.c',
-	'tf_ulp/ulp_template_db_class.c',
-	'tf_ulp/ulp_template_db_act.c',
-	'tf_ulp/ulp_utils.c',
-	'tf_ulp/ulp_mapper.c',
-	'tf_ulp/ulp_matcher.c',
-	'tf_ulp/ulp_rte_parser.c',
-	'tf_ulp/bnxt_ulp_flow.c',
-	'tf_ulp/ulp_port_db.c',
-	'tf_ulp/ulp_def_rules.c',
-	'tf_ulp/ulp_fc_mgr.c',
-	'tf_ulp/ulp_tun.c',
-	'tf_ulp/ulp_template_db_wh_plus_act.c',
-	'tf_ulp/ulp_template_db_wh_plus_class.c',
-	'tf_ulp/ulp_template_db_stingray_act.c',
-	'tf_ulp/ulp_template_db_stingray_class.c',
+    'tf_ulp/bnxt_ulp.c',
+    'tf_ulp/ulp_mark_mgr.c',
+    'tf_ulp/ulp_flow_db.c',
+    'tf_ulp/ulp_template_db_tbl.c',
+    'tf_ulp/ulp_template_db_class.c',
+    'tf_ulp/ulp_template_db_act.c',
+    'tf_ulp/ulp_utils.c',
+    'tf_ulp/ulp_mapper.c',
+    'tf_ulp/ulp_matcher.c',
+    'tf_ulp/ulp_rte_parser.c',
+    'tf_ulp/bnxt_ulp_flow.c',
+    'tf_ulp/ulp_port_db.c',
+    'tf_ulp/ulp_def_rules.c',
+    'tf_ulp/ulp_fc_mgr.c',
+    'tf_ulp/ulp_tun.c',
+    'tf_ulp/ulp_template_db_wh_plus_act.c',
+    'tf_ulp/ulp_template_db_wh_plus_class.c',
+    'tf_ulp/ulp_template_db_stingray_act.c',
+    'tf_ulp/ulp_template_db_stingray_class.c',
 
-	'rte_pmd_bnxt.c')
+    'rte_pmd_bnxt.c')
 
 if arch_subdir == 'x86'
-	sources += files('bnxt_rxtx_vec_sse.c')
+    sources += files('bnxt_rxtx_vec_sse.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('bnxt_rxtx_vec_neon.c')
+    sources += files('bnxt_rxtx_vec_neon.c')
 endif
diff --git a/drivers/net/bonding/meson.build b/drivers/net/bonding/meson.build
index 4682903a6f..67d7ab9d91 100644
--- a/drivers/net/bonding/meson.build
+++ b/drivers/net/bonding/meson.build
@@ -2,14 +2,14 @@
 # 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
 
 name = 'bond' #, james bond :-)
 sources = files('rte_eth_bond_api.c', 'rte_eth_bond_pmd.c', 'rte_eth_bond_flow.c',
-	'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
+    'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
 
 deps += 'sched' # needed for rte_bitmap.h
 deps += ['ip_frag']
diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
index 52896ea85c..5f6f7451a5 100644
--- a/drivers/net/cxgbe/meson.build
+++ b/drivers/net/cxgbe/meson.build
@@ -2,22 +2,22 @@
 # 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('cxgbe_ethdev.c',
-	'cxgbe_main.c',
-	'cxgbevf_ethdev.c',
-	'cxgbevf_main.c',
-	'sge.c',
-	'cxgbe_filter.c',
-	'cxgbe_flow.c',
-	'clip_tbl.c',
-	'mps_tcam.c',
-	'l2t.c',
-	'smt.c',
-	'base/t4_hw.c',
-	'base/t4vf_hw.c')
+    'cxgbe_main.c',
+    'cxgbevf_ethdev.c',
+    'cxgbevf_main.c',
+    'sge.c',
+    'cxgbe_filter.c',
+    'cxgbe_flow.c',
+    'clip_tbl.c',
+    'mps_tcam.c',
+    'l2t.c',
+    'smt.c',
+    'base/t4_hw.c',
+    'base/t4vf_hw.c')
 includes += include_directories('base')
diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build
index 0f72730b03..62989b24af 100644
--- a/drivers/net/dpaa/meson.build
+++ b/drivers/net/dpaa/meson.build
@@ -2,20 +2,20 @@
 # Copyright 2018-2020 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['mempool_dpaa']
 
 sources = files('dpaa_ethdev.c',
-		'fmlib/fm_lib.c',
-		'fmlib/fm_vsp.c',
-		'dpaa_flow.c',
-		'dpaa_rxtx.c',
-		'dpaa_fmc.c')
+        'fmlib/fm_lib.c',
+        'fmlib/fm_vsp.c',
+        'dpaa_flow.c',
+        'dpaa_rxtx.c',
+        'dpaa_fmc.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 headers = files('rte_pmd_dpaa.h')
diff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build
index f5f411d592..84319d2dbb 100644
--- a/drivers/net/dpaa2/meson.build
+++ b/drivers/net/dpaa2/meson.build
@@ -2,23 +2,23 @@
 # Copyright 2018-2021 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['mempool_dpaa2']
 sources = files('base/dpaa2_hw_dpni.c',
-		'dpaa2_tm.c',
-		'dpaa2_mux.c',
-		'dpaa2_ethdev.c',
-		'dpaa2_flow.c',
-		'dpaa2_rxtx.c',
-		'dpaa2_sparser.c',
-		'dpaa2_ptp.c',
-		'mc/dprtc.c',
-		'mc/dpkg.c',
-		'mc/dpdmux.c',
-		'mc/dpni.c')
+        'dpaa2_tm.c',
+        'dpaa2_mux.c',
+        'dpaa2_ethdev.c',
+        'dpaa2_flow.c',
+        'dpaa2_rxtx.c',
+        'dpaa2_sparser.c',
+        'dpaa2_ptp.c',
+        'mc/dprtc.c',
+        'mc/dpkg.c',
+        'mc/dpdmux.c',
+        'mc/dpni.c')
 
 includes += include_directories('base', 'mc')
 
diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index d13f693d3e..99468764e4 100644
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -2,37 +2,37 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'e1000_base.c',
-	'e1000_80003es2lan.c',
-	'e1000_82540.c',
-	'e1000_82541.c',
-	'e1000_82542.c',
-	'e1000_82543.c',
-	'e1000_82571.c',
-	'e1000_82575.c',
-	'e1000_api.c',
-	'e1000_i210.c',
-	'e1000_ich8lan.c',
-	'e1000_mac.c',
-	'e1000_manage.c',
-	'e1000_mbx.c',
-	'e1000_nvm.c',
-	'e1000_osdep.c',
-	'e1000_phy.c',
-	'e1000_vf.c'
+        'e1000_base.c',
+        'e1000_80003es2lan.c',
+        'e1000_82540.c',
+        'e1000_82541.c',
+        'e1000_82542.c',
+        'e1000_82543.c',
+        'e1000_82571.c',
+        'e1000_82575.c',
+        'e1000_api.c',
+        'e1000_i210.c',
+        'e1000_ich8lan.c',
+        'e1000_mac.c',
+        'e1000_manage.c',
+        'e1000_mbx.c',
+        'e1000_nvm.c',
+        'e1000_osdep.c',
+        'e1000_phy.c',
+        'e1000_vf.c'
 ]
 
 error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',
-	'-Wno-unused-variable', '-Wno-misleading-indentation',
-	'-Wno-implicit-fallthrough']
+    '-Wno-unused-variable', '-Wno-misleading-indentation',
+    '-Wno-implicit-fallthrough']
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('e1000_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/e1000/meson.build b/drivers/net/e1000/meson.build
index 43ad52cbc0..ebc05f7e2e 100644
--- a/drivers/net/e1000/meson.build
+++ b/drivers/net/e1000/meson.build
@@ -2,22 +2,22 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'e1000_logs.c',
-	'em_ethdev.c',
-	'em_rxtx.c',
-	'igb_ethdev.c',
-	'igb_flow.c',
-	'igb_pf.c',
-	'igb_rxtx.c'
+        'e1000_logs.c',
+        'em_ethdev.c',
+        'em_rxtx.c',
+        'igb_ethdev.c',
+        'igb_flow.c',
+        'igb_pf.c',
+        'igb_rxtx.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
index 772fbfc88e..d57b506a67 100644
--- a/drivers/net/ena/meson.build
+++ b/drivers/net/ena/meson.build
@@ -2,14 +2,14 @@
 # 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('ena_ethdev.c',
-	'base/ena_com.c',
-	'base/ena_eth_com.c')
+    'base/ena_com.c',
+    'base/ena_eth_com.c')
 
 deps += ['timer']
 
diff --git a/drivers/net/enetc/meson.build b/drivers/net/enetc/meson.build
index 850307c04e..1cfe6a089a 100644
--- a/drivers/net/enetc/meson.build
+++ b/drivers/net/enetc/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax']
 sources = files('enetc_ethdev.c',
-		'enetc_rxtx.c')
+        'enetc_rxtx.c')
 
 includes += include_directories('base')
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index 94fcc79c69..c9ff509c0d 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -2,40 +2,40 @@
 # Copyright(c) 2018 Cisco Systems, 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(
-	'base/vnic_cq.c',
-	'base/vnic_dev.c',
-	'base/vnic_intr.c',
-	'base/vnic_rq.c',
-	'base/vnic_wq.c',
-	'enic_ethdev.c',
-	'enic_flow.c',
-	'enic_fm_flow.c',
-	'enic_main.c',
-	'enic_res.c',
-	'enic_rxtx.c',
-	'enic_vf_representor.c',
-	)
+        'base/vnic_cq.c',
+        'base/vnic_dev.c',
+        'base/vnic_intr.c',
+        'base/vnic_rq.c',
+        'base/vnic_wq.c',
+        'enic_ethdev.c',
+        'enic_flow.c',
+        'enic_fm_flow.c',
+        'enic_main.c',
+        'enic_res.c',
+        'enic_rxtx.c',
+        'enic_vf_representor.c',
+    )
 deps += ['hash']
 includes += include_directories('base')
 
 # The current implementation assumes 64-bit pointers
 if cc.get_define('__AVX2__', args: machine_args) != '' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('enic_rxtx_vec_avx2.c')
+    sources += files('enic_rxtx_vec_avx2.c')
 # Build the avx2 handler if the compiler supports it, even though 'machine'
 # does not. This is to support users who build for the min supported machine
 # and need to run the binary on newer CPUs too.
 # This part is from i40e meson.build
 elif cc.has_argument('-mavx2') and dpdk_conf.get('RTE_ARCH_64')
-	enic_avx2_lib = static_library('enic_avx2_lib',
-			'enic_rxtx_vec_avx2.c',
-			dependencies: [static_rte_ethdev, static_rte_bus_pci],
-			include_directories: includes,
-			c_args: [cflags, '-mavx2'])
-	objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
+    enic_avx2_lib = static_library('enic_avx2_lib',
+            'enic_rxtx_vec_avx2.c',
+            dependencies: [static_rte_ethdev, static_rte_bus_pci],
+            include_directories: includes,
+            c_args: [cflags, '-mavx2'])
+    objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
 endif
diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
index d8343be63c..5f6967bd8e 100644
--- a/drivers/net/failsafe/meson.build
+++ b/drivers/net/failsafe/meson.build
@@ -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
 
 cflags += '-std=gnu99'
@@ -12,16 +12,16 @@ cflags += '-D_DEFAULT_SOURCE'
 cflags += '-D_XOPEN_SOURCE=700'
 cflags += '-pedantic'
 if is_linux
-	cflags += '-DLINUX'
+    cflags += '-DLINUX'
 else
-	cflags += '-DBSD'
+    cflags += '-DBSD'
 endif
 
 sources = files('failsafe_args.c',
-	'failsafe.c',
-	'failsafe_eal.c',
-	'failsafe_ether.c',
-	'failsafe_flow.c',
-	'failsafe_intr.c',
-	'failsafe_ops.c',
-	'failsafe_rxtx.c')
+    'failsafe.c',
+    'failsafe_eal.c',
+    'failsafe_ether.c',
+    'failsafe_flow.c',
+    'failsafe_intr.c',
+    'failsafe_ops.c',
+    'failsafe_rxtx.c')
diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build
index 6ac11b2012..6467a1278d 100644
--- a/drivers/net/fm10k/base/meson.build
+++ b/drivers/net/fm10k/base/meson.build
@@ -2,27 +2,27 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'fm10k_api.c',
-	'fm10k_common.c',
-	'fm10k_mbx.c',
-	'fm10k_pf.c',
-	'fm10k_tlv.c',
-	'fm10k_vf.c'
+        'fm10k_api.c',
+        'fm10k_common.c',
+        'fm10k_mbx.c',
+        'fm10k_pf.c',
+        'fm10k_tlv.c',
+        'fm10k_vf.c'
 ]
 
 error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value',
-	'-Wno-strict-aliasing', '-Wno-format-extra-args',
-	'-Wno-unused-variable',
-	'-Wno-implicit-fallthrough'
+    '-Wno-strict-aliasing', '-Wno-format-extra-args',
+    '-Wno-unused-variable',
+    '-Wno-implicit-fallthrough'
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('fm10k_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/fm10k/meson.build b/drivers/net/fm10k/meson.build
index 299b9ffb58..69566add96 100644
--- a/drivers/net/fm10k/meson.build
+++ b/drivers/net/fm10k/meson.build
@@ -2,20 +2,20 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'fm10k_ethdev.c',
-	'fm10k_rxtx.c',
+        'fm10k_ethdev.c',
+        'fm10k_rxtx.c',
 )
 if arch_subdir == 'x86'
-	sources += files('fm10k_rxtx_vec.c')
+    sources += files('fm10k_rxtx_vec.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/hinic/base/meson.build b/drivers/net/hinic/base/meson.build
index 6cf947f841..a00c90c14e 100644
--- a/drivers/net/hinic/base/meson.build
+++ b/drivers/net/hinic/base/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 sources = [
-	'hinic_pmd_api_cmd.c',
-	'hinic_pmd_cfg.c',
-	'hinic_pmd_cmdq.c',
-	'hinic_pmd_eqs.c',
-	'hinic_pmd_hwdev.c',
-	'hinic_pmd_hwif.c',
-	'hinic_pmd_mgmt.c',
-	'hinic_pmd_niccfg.c',
-	'hinic_pmd_nicio.c',
-	'hinic_pmd_wq.c',
- 	'hinic_pmd_mbox.c',
+        'hinic_pmd_api_cmd.c',
+        'hinic_pmd_cfg.c',
+        'hinic_pmd_cmdq.c',
+        'hinic_pmd_eqs.c',
+        'hinic_pmd_hwdev.c',
+        'hinic_pmd_hwif.c',
+        'hinic_pmd_mgmt.c',
+        'hinic_pmd_niccfg.c',
+        'hinic_pmd_nicio.c',
+        'hinic_pmd_wq.c',
+        'hinic_pmd_mbox.c',
 ]
 
 extra_flags = []
@@ -32,6 +32,6 @@ deps += ['hash']
 c_args = cflags
 
 base_lib = static_library('hinic_base', sources,
-	dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
-	c_args: c_args)
+    dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index 61ea3954ca..0fbfa43bf2 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'hinic_pmd_ethdev.c',
-	'hinic_pmd_rx.c',
-	'hinic_pmd_tx.c',
- 	'hinic_pmd_flow.c',
-	)
+        'hinic_pmd_ethdev.c',
+        'hinic_pmd_rx.c',
+        'hinic_pmd_tx.c',
+        'hinic_pmd_flow.c',
+    )
 
 includes += include_directories('base')
diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build
index dc0baf7678..53c7df7daf 100644
--- a/drivers/net/hns3/meson.build
+++ b/drivers/net/hns3/meson.build
@@ -2,38 +2,40 @@
 # Copyright(c) 2018-2021 Hisilicon Limited
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 if arch_subdir != 'x86' and arch_subdir != 'arm' or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
-	subdir_done()
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
+    subdir_done()
 endif
 
-sources = files('hns3_cmd.c',
-	'hns3_dcb.c',
-	'hns3_intr.c',
-	'hns3_ethdev.c',
-	'hns3_ethdev_vf.c',
-	'hns3_fdir.c',
-	'hns3_flow.c',
-	'hns3_mbx.c',
-	'hns3_regs.c',
-	'hns3_rss.c',
-	'hns3_rxtx.c',
-	'hns3_stats.c',
-	'hns3_mp.c',
-	'hns3_tm.c',
-	'hns3_ptp.c')
+sources = files(
+        'hns3_cmd.c',
+        'hns3_dcb.c',
+        'hns3_intr.c',
+        'hns3_ethdev.c',
+        'hns3_ethdev_vf.c',
+        'hns3_fdir.c',
+        'hns3_flow.c',
+        'hns3_mbx.c',
+        'hns3_regs.c',
+        'hns3_rss.c',
+        'hns3_rxtx.c',
+        'hns3_stats.c',
+        'hns3_mp.c',
+        'hns3_tm.c',
+        'hns3_ptp.c',
+)
 
 deps += ['hash']
 
 if arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('hns3_rxtx_vec.c')
-	if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
-		sources += files('hns3_rxtx_vec_sve.c')
-	endif
+    sources += files('hns3_rxtx_vec.c')
+    if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
+        sources += files('hns3_rxtx_vec_sve.c')
+    endif
 endif
diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 8bc6a0fa0b..c319902cd8 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -2,29 +2,29 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'i40e_adminq.c',
-	'i40e_common.c',
-	'i40e_dcb.c',
-	'i40e_diag.c',
-	'i40e_hmc.c',
-	'i40e_lan_hmc.c',
-	'i40e_nvm.c'
+        'i40e_adminq.c',
+        'i40e_common.c',
+        'i40e_dcb.c',
+        'i40e_diag.c',
+        'i40e_hmc.c',
+        'i40e_lan_hmc.c',
+        'i40e_nvm.c'
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-format-security',
-		'-Wno-format-nonliteral',
-		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
+        '-Wno-format', '-Wno-format-security',
+        '-Wno-format-nonliteral',
+        '-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('i40e_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index ce3cc658e9..7b4f6db5a4 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -2,76 +2,76 @@
 # Copyright(c) 2017 Intel Corporation
 
 cflags += ['-DPF_DRIVER',
-	'-DVF_DRIVER',
-	'-DINTEGRATED_VF',
-	'-DX722_A0_SUPPORT']
+    '-DVF_DRIVER',
+    '-DINTEGRATED_VF',
+    '-DX722_A0_SUPPORT']
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'i40e_ethdev.c',
-	'i40e_rxtx.c',
-	'i40e_ethdev_vf.c',
-	'i40e_pf.c',
-	'i40e_fdir.c',
-	'i40e_flow.c',
-	'i40e_tm.c',
-	'i40e_hash.c',
-	'i40e_vf_representor.c',
-	'rte_pmd_i40e.c'
-	)
+        'i40e_ethdev.c',
+        'i40e_rxtx.c',
+        'i40e_ethdev_vf.c',
+        'i40e_pf.c',
+        'i40e_fdir.c',
+        'i40e_flow.c',
+        'i40e_tm.c',
+        'i40e_hash.c',
+        'i40e_vf_representor.c',
+        'rte_pmd_i40e.c'
+    )
 
 deps += ['hash']
 includes += include_directories('base')
 
 if arch_subdir == 'x86'
-	sources += files('i40e_rxtx_vec_sse.c')
+    sources += files('i40e_rxtx_vec_sse.c')
 
-	if is_windows and cc.get_id() != 'clang'
-		cflags += ['-fno-asynchronous-unwind-tables']
-	endif
+    if is_windows and cc.get_id() != 'clang'
+        cflags += ['-fno-asynchronous-unwind-tables']
+    endif
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('i40e_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		i40e_avx2_lib = static_library('i40e_avx2_lib',
-				'i40e_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('i40e_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        i40e_avx2_lib = static_library('i40e_avx2_lib',
+                'i40e_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
+    endif
 
-	i40e_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    i40e_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	i40e_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    i40e_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		i40e_avx512_lib = static_library('i40e_avx512_lib',
-				'i40e_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
-	endif
+    if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        i40e_avx512_lib = static_library('i40e_avx512_lib',
+                'i40e_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
+    endif
 elif arch_subdir == 'ppc'
        sources += files('i40e_rxtx_vec_altivec.c')
 elif arch_subdir == 'arm'
diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index ac2af81f75..6f222a9e87 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 cflags += ['-Wno-strict-aliasing']
@@ -13,57 +13,57 @@ includes += include_directories('../../common/iavf')
 deps += ['common_iavf']
 
 sources = files(
-	'iavf_ethdev.c',
-	'iavf_rxtx.c',
-	'iavf_vchnl.c',
-	'iavf_generic_flow.c',
-	'iavf_fdir.c',
-	'iavf_hash.c',
+        'iavf_ethdev.c',
+        'iavf_rxtx.c',
+        'iavf_vchnl.c',
+        'iavf_generic_flow.c',
+        'iavf_fdir.c',
+        'iavf_hash.c',
 )
 
 if arch_subdir == 'x86'
-	sources += files('iavf_rxtx_vec_sse.c')
+    sources += files('iavf_rxtx_vec_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('iavf_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		iavf_avx2_lib = static_library('iavf_avx2_lib',
-				'iavf_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('iavf_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        iavf_avx2_lib = static_library('iavf_avx2_lib',
+                'iavf_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
+    endif
 
-	iavf_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    iavf_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	iavf_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    iavf_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		iavf_avx512_lib = static_library('iavf_avx512_lib',
-				'iavf_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
-	endif
+    if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        iavf_avx512_lib = static_library('iavf_avx512_lib',
+                'iavf_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
+    endif
 endif
 
 headers = files('rte_pmd_iavf.h')
diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build
index c44d0e035d..6c548a9977 100644
--- a/drivers/net/ice/base/meson.build
+++ b/drivers/net/ice/base/meson.build
@@ -2,39 +2,40 @@
 # Copyright(c) 2018-2021 Intel Corporation
 
 sources = [
-	'ice_controlq.c',
-	'ice_common.c',
-	'ice_sched.c',
-	'ice_switch.c',
-	'ice_nvm.c',
-	'ice_flex_pipe.c',
-	'ice_flow.c',
-	'ice_dcb.c',
-	'ice_fdir.c',
-	'ice_acl.c',
-	'ice_acl_ctrl.c',
-	'ice_vlan_mode.c',
+        'ice_controlq.c',
+        'ice_common.c',
+        'ice_sched.c',
+        'ice_switch.c',
+        'ice_nvm.c',
+        'ice_flex_pipe.c',
+        'ice_flow.c',
+        'ice_dcb.c',
+        'ice_fdir.c',
+        'ice_acl.c',
+        'ice_acl_ctrl.c',
+        'ice_vlan_mode.c',
 ]
 
-error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-variable',
-		'-Wno-unused-parameter',
+error_cflags = [
+        '-Wno-unused-value',
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-variable',
+        '-Wno-unused-parameter',
 ]
 
 if is_windows and cc.get_id() != 'clang'
-	cflags += ['-fno-asynchronous-unwind-tables']
+    cflags += ['-fno-asynchronous-unwind-tables']
 endif
 
 c_args = cflags
 
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ice_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+        dependencies: static_rte_eal,
+        c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build
index b2d0b66219..575b664a04 100644
--- a/drivers/net/ice/meson.build
+++ b/drivers/net/ice/meson.build
@@ -5,70 +5,71 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ice_ethdev.c',
-	'ice_rxtx.c',
-	'ice_switch_filter.c',
-	'ice_generic_flow.c',
-	'ice_fdir_filter.c',
-	'ice_hash.c',
-	'ice_acl_filter.c'
-	)
+        'ice_ethdev.c',
+        'ice_rxtx.c',
+        'ice_switch_filter.c',
+        'ice_generic_flow.c',
+        'ice_fdir_filter.c',
+        'ice_hash.c',
+        'ice_acl_filter.c'
+)
 
 deps += ['hash', 'net', 'common_iavf']
 includes += include_directories('base', '../../common/iavf')
 
 if arch_subdir == 'x86'
-	sources += files('ice_rxtx_vec_sse.c')
+    sources += files('ice_rxtx_vec_sse.c')
 
-	if is_windows and cc.get_id() != 'clang'
-		cflags += ['-fno-asynchronous-unwind-tables']
-	endif
+    if is_windows and cc.get_id() != 'clang'
+        cflags += ['-fno-asynchronous-unwind-tables']
+    endif
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('ice_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		ice_avx2_lib = static_library('ice_avx2_lib',
-				'ice_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('ice_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        ice_avx2_lib = static_library('ice_avx2_lib',
+                'ice_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
+    endif
 
-	ice_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    ice_avx512_cpu_support = (
+            cc.get_define('__AVX512F__', args: machine_args) != '' and
+                cc.get_define('__AVX512BW__', args: machine_args) != ''
+    )
 
-	ice_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    ice_avx512_cc_support = (
+            not machine_args.contains('-mno-avx512f') and
+                cc.has_argument('-mavx512f') and
+                cc.has_argument('-mavx512bw')
+    )
 
-	if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		ice_avx512_lib = static_library('ice_avx512_lib',
-				'ice_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
-	endif
+    if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        ice_avx512_lib = static_library('ice_avx512_lib',
+                'ice_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
+    endif
 endif
 
 sources += files('ice_dcf.c',
-		 'ice_dcf_vf_representor.c',
-		 'ice_dcf_ethdev.c',
-		 'ice_dcf_parent.c')
+         'ice_dcf_vf_representor.c',
+         'ice_dcf_ethdev.c',
+         'ice_dcf_parent.c')
 
 headers = files('rte_pmd_ice.h')
diff --git a/drivers/net/igc/base/meson.build b/drivers/net/igc/base/meson.build
index 690704fe02..8affc72e65 100644
--- a/drivers/net/igc/base/meson.build
+++ b/drivers/net/igc/base/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 sources = [
-	'igc_api.c',
-	'igc_base.c',
-	'igc_i225.c',
-	'igc_mac.c',
-	'igc_manage.c',
-	'igc_nvm.c',
-	'igc_osdep.c',
-	'igc_phy.c',
+        'igc_api.c',
+        'igc_base.c',
+        'igc_i225.c',
+        'igc_mac.c',
+        'igc_manage.c',
+        'igc_nvm.c',
+        'igc_osdep.c',
+        'igc_phy.c',
 ]
 
 base_lib = static_library('igc_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/igc/meson.build b/drivers/net/igc/meson.build
index b971e6f8c6..925ebd9030 100644
--- a/drivers/net/igc/meson.build
+++ b/drivers/net/igc/meson.build
@@ -2,20 +2,20 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'igc_logs.c',
-	'igc_ethdev.c',
-	'igc_txrx.c',
-	'igc_filter.c',
-	'igc_flow.c'
+        'igc_logs.c',
+        'igc_ethdev.c',
+        'igc_txrx.c',
+        'igc_filter.c',
+        'igc_flow.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build
index 631ea27f52..cf6771db81 100644
--- a/drivers/net/ionic/meson.build
+++ b/drivers/net/ionic/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2019 Pensando
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files(
-	'ionic_mac_api.c',
-	'ionic_rx_filter.c',
-	'ionic_rxtx.c',
-	'ionic_dev.c',
-	'ionic_ethdev.c',
-	'ionic_lif.c',
-	'ionic_main.c'
+        'ionic_mac_api.c',
+        'ionic_rx_filter.c',
+        'ionic_rxtx.c',
+        'ionic_dev.c',
+        'ionic_ethdev.c',
+        'ionic_lif.c',
+        'ionic_main.c'
 )
diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build
index 65de9d5172..6863cd9041 100644
--- a/drivers/net/ipn3ke/meson.build
+++ b/drivers/net/ipn3ke/meson.build
@@ -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
 
 #
@@ -16,15 +16,15 @@ endif
 #
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 includes += include_directories('../../raw/ifpga')
 
 sources += files('ipn3ke_ethdev.c',
-	'ipn3ke_representor.c',
-	'ipn3ke_tm.c',
-	'ipn3ke_flow.c')
+    'ipn3ke_representor.c',
+    'ipn3ke_tm.c',
+    'ipn3ke_flow.c')
 deps += ['bus_ifpga', 'ethdev', 'sched']
diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
index 48bbb86cb8..4d5e41bdeb 100644
--- a/drivers/net/ixgbe/base/meson.build
+++ b/drivers/net/ixgbe/base/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'ixgbe_82598.c',
-	'ixgbe_82599.c',
-	'ixgbe_api.c',
-	'ixgbe_common.c',
-	'ixgbe_dcb_82598.c',
-	'ixgbe_dcb_82599.c',
-	'ixgbe_dcb.c',
-	'ixgbe_hv_vf.c',
-	'ixgbe_mbx.c',
-	'ixgbe_phy.c',
-	'ixgbe_vf.c',
-	'ixgbe_x540.c',
-	'ixgbe_x550.c'
+        'ixgbe_82598.c',
+        'ixgbe_82599.c',
+        'ixgbe_api.c',
+        'ixgbe_common.c',
+        'ixgbe_dcb_82598.c',
+        'ixgbe_dcb_82599.c',
+        'ixgbe_dcb.c',
+        'ixgbe_hv_vf.c',
+        'ixgbe_mbx.c',
+        'ixgbe_phy.c',
+        'ixgbe_vf.c',
+        'ixgbe_x540.c',
+        'ixgbe_x550.c'
 ]
 
 error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
-		]
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
+        ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ixgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build
index 76cbfb830b..9d93eb802d 100644
--- a/drivers/net/ixgbe/meson.build
+++ b/drivers/net/ixgbe/meson.build
@@ -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
 
 cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
@@ -13,25 +13,25 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ixgbe_82599_bypass.c',
-	'ixgbe_bypass.c',
-	'ixgbe_ethdev.c',
-	'ixgbe_fdir.c',
-	'ixgbe_flow.c',
-	'ixgbe_ipsec.c',
-	'ixgbe_pf.c',
-	'ixgbe_rxtx.c',
-	'ixgbe_tm.c',
-	'ixgbe_vf_representor.c',
-	'rte_pmd_ixgbe.c'
+        'ixgbe_82599_bypass.c',
+        'ixgbe_bypass.c',
+        'ixgbe_ethdev.c',
+        'ixgbe_fdir.c',
+        'ixgbe_flow.c',
+        'ixgbe_ipsec.c',
+        'ixgbe_pf.c',
+        'ixgbe_rxtx.c',
+        'ixgbe_tm.c',
+        'ixgbe_vf_representor.c',
+        'rte_pmd_ixgbe.c'
 )
 
 deps += ['hash', 'security']
 
 if arch_subdir == 'x86'
-	sources += files('ixgbe_rxtx_vec_sse.c')
+    sources += files('ixgbe_rxtx_vec_sse.c')
 elif arch_subdir == 'arm'
-	sources += files('ixgbe_rxtx_vec_neon.c')
+    sources += files('ixgbe_rxtx_vec_neon.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
index 4d5e5fe368..c0751aeb59 100644
--- a/drivers/net/kni/meson.build
+++ b/drivers/net/kni/meson.build
@@ -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
 
 # this driver can be built if-and-only-if KNI library is buildable
diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build
index 4965ebe85f..e32029e853 100644
--- a/drivers/net/liquidio/meson.build
+++ b/drivers/net/liquidio/meson.build
@@ -2,13 +2,13 @@
 # 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('base/lio_23xx_vf.c',
-	'base/lio_mbox.c',
-	'lio_ethdev.c',
-	'lio_rxtx.c')
+    'base/lio_mbox.c',
+    'lio_ethdev.c',
+    'lio_rxtx.c')
 includes += include_directories('base')
diff --git a/drivers/net/memif/meson.build b/drivers/net/memif/meson.build
index 9c3ba432d0..3201f3babb 100644
--- a/drivers/net/memif/meson.build
+++ b/drivers/net/memif/meson.build
@@ -2,11 +2,11 @@
 # Copyright 2018-2019 Cisco Systems, Inc.  All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('rte_eth_memif.c',
-		'memif_socket.c')
+        'memif_socket.c')
 
 deps += ['hash']
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index d7602b748e..447bfda541 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -3,9 +3,9 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 static_ibverbs = (get_option('ibverbs_link') == 'static')
@@ -14,74 +14,74 @@ LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+            '-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
+            '-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx4', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs,
+            required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources = files(
-	'mlx4.c',
-	'mlx4_ethdev.c',
-	'mlx4_flow.c',
-	'mlx4_intr.c',
-	'mlx4_mp.c',
-	'mlx4_mr.c',
-	'mlx4_rxq.c',
-	'mlx4_rxtx.c',
-	'mlx4_txq.c',
-	'mlx4_utils.c',
+        'mlx4.c',
+        'mlx4_ethdev.c',
+        'mlx4_flow.c',
+        'mlx4_intr.c',
+        'mlx4_mp.c',
+        'mlx4_mr.c',
+        'mlx4_rxq.c',
+        'mlx4_rxtx.c',
+        'mlx4_txq.c',
+        'mlx4_utils.c',
 )
 if not dlopen_ibverbs
-	sources += files('mlx4_glue.c')
+    sources += files('mlx4_glue.c')
 endif
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 # To maintain the compatibility with the make build system
 # mlx4_autoconf.h file is still generated.
@@ -90,49 +90,49 @@ endif
 #   "symbol to search", "struct member to search" ]
 #
 has_member_args = [
-	[ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
-	'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
+        [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
+        'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
-	'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
-	[ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
-	'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
+        [ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
+        'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
+        [ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
+        'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
+        dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix: file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3],
+        prefix: file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx4_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx4_glue'
-	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' ]
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: global_inc,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx4_glue'
+    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' ]
+    shared_lib = shared_library(
+        dlopen_lib_name,
+        dlopen_sources,
+        include_directories: global_inc,
+        c_args: cflags,
+        dependencies: libs,
+        link_args: [
+        '-Wl,-export-dynamic',
+        '-Wl,-h,@0@'.format(LIB_GLUE),
+        ],
+        soversion: dlopen_so_version,
+        install: true,
+        install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/net/mlx5/linux/meson.build b/drivers/net/mlx5/linux/meson.build
index 8412edce78..5530241356 100644
--- a/drivers/net/mlx5/linux/meson.build
+++ b/drivers/net/mlx5/linux/meson.build
@@ -3,12 +3,12 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_socket.c',
-	'mlx5_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_verbs.c',
-	'mlx5_mp_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+        'mlx5_socket.c',
+        'mlx5_os.c',
+        'mlx5_ethdev_os.c',
+        'mlx5_verbs.c',
+        'mlx5_mp_os.c',
+        'mlx5_vlan_os.c',
+        'mlx5_flow_os.c',
 )
 
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 8740ca572e..d5cc50b105 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -3,66 +3,66 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not (is_linux or is_windows)
-	build = false
-	reason = 'only supported on Linux and Windows'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5']
 sources = files(
-	'mlx5.c',
-	'mlx5_ethdev.c',
-	'mlx5_flow.c',
-	'mlx5_flow_meter.c',
-	'mlx5_flow_dv.c',
+        'mlx5.c',
+        'mlx5_ethdev.c',
+        'mlx5_flow.c',
+        'mlx5_flow_meter.c',
+        'mlx5_flow_dv.c',
         'mlx5_flow_age.c',
-	'mlx5_mac.c',
-	'mlx5_mr.c',
-	'mlx5_rss.c',
-	'mlx5_rx.c',
-	'mlx5_rxmode.c',
-	'mlx5_rxq.c',
-	'mlx5_rxtx.c',
-	'mlx5_stats.c',
-	'mlx5_trigger.c',
-	'mlx5_tx.c',
-	'mlx5_tx_empw.c',
-	'mlx5_tx_mpw.c',
-	'mlx5_tx_nompw.c',
-	'mlx5_tx_txpp.c',
-	'mlx5_txq.c',
-	'mlx5_txpp.c',
-	'mlx5_vlan.c',
-	'mlx5_utils.c',
-	'mlx5_devx.c',
+        'mlx5_mac.c',
+        'mlx5_mr.c',
+        'mlx5_rss.c',
+        'mlx5_rx.c',
+        'mlx5_rxmode.c',
+        'mlx5_rxq.c',
+        'mlx5_rxtx.c',
+        'mlx5_stats.c',
+        'mlx5_trigger.c',
+        'mlx5_tx.c',
+        'mlx5_tx_empw.c',
+        'mlx5_tx_mpw.c',
+        'mlx5_tx_nompw.c',
+        'mlx5_tx_txpp.c',
+        'mlx5_txq.c',
+        'mlx5_txpp.c',
+        'mlx5_vlan.c',
+        'mlx5_utils.c',
+        'mlx5_devx.c',
 )
 
 if is_linux
-	sources += files(
-		'mlx5_flow_verbs.c',
-	)
-	if (dpdk_conf.has('RTE_ARCH_X86_64')
-		or dpdk_conf.has('RTE_ARCH_ARM64')
-		or dpdk_conf.has('RTE_ARCH_PPC_64'))
-		sources += files('mlx5_rxtx_vec.c')
-	endif
+    sources += files(
+            'mlx5_flow_verbs.c',
+    )
+    if (dpdk_conf.has('RTE_ARCH_X86_64')
+        or dpdk_conf.has('RTE_ARCH_ARM64')
+        or dpdk_conf.has('RTE_ARCH_PPC_64'))
+        sources += files('mlx5_rxtx_vec.c')
+    endif
 endif
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 subdir(exec_env)
diff --git a/drivers/net/mlx5/windows/meson.build b/drivers/net/mlx5/windows/meson.build
index ddb6c6ca90..c7d6617275 100644
--- a/drivers/net/mlx5/windows/meson.build
+++ b/drivers/net/mlx5/windows/meson.build
@@ -3,9 +3,9 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_os.c',
-	'mlx5_mp_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+        'mlx5_os.c',
+        'mlx5_mp_os.c',
+        'mlx5_ethdev_os.c',
+        'mlx5_vlan_os.c',
+        'mlx5_flow_os.c',
 )
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 0be7b3d8ba..87e8bad73e 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -4,23 +4,23 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mvneta_ethdev.c',
-	'mvneta_rxtx.c'
+        'mvneta_ethdev.c',
+        'mvneta_rxtx.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index bfda5439ba..9727f639e4 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -4,26 +4,26 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mrvl_ethdev.c',
-	'mrvl_flow.c',
-	'mrvl_qos.c',
-	'mrvl_mtr.c',
-	'mrvl_tm.c'
+        'mrvl_ethdev.c',
+        'mrvl_flow.c',
+        'mrvl_qos.c',
+        'mrvl_mtr.c',
+        'mrvl_tm.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build
index c190124db0..1dac5e512b 100644
--- a/drivers/net/netvsc/meson.build
+++ b/drivers/net/netvsc/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Microsoft Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 build = dpdk_conf.has('RTE_BUS_VMBUS')
diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build
index f4a89b87d5..0af4ddf806 100644
--- a/drivers/net/nfb/meson.build
+++ b/drivers/net/nfb/meson.build
@@ -4,9 +4,9 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('netcope-common', required: false, method: 'pkg-config')
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 21b20c9ac9..766e9c737a 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
+    build = false
+    reason = 'only supported on 64-bit Linux'
 endif
 sources = files('nfpcore/nfp_cpp_pcie_ops.c',
-	'nfpcore/nfp_nsp.c',
-	'nfpcore/nfp_cppcore.c',
-	'nfpcore/nfp_resource.c',
-	'nfpcore/nfp_mip.c',
-	'nfpcore/nfp_nffw.c',
-	'nfpcore/nfp_rtsym.c',
-	'nfpcore/nfp_nsp_cmds.c',
-	'nfpcore/nfp_crc.c',
-	'nfpcore/nfp_mutex.c',
-	'nfpcore/nfp_nsp_eth.c',
-	'nfpcore/nfp_hwinfo.c',
-	'nfp_net.c')
+    'nfpcore/nfp_nsp.c',
+    'nfpcore/nfp_cppcore.c',
+    'nfpcore/nfp_resource.c',
+    'nfpcore/nfp_mip.c',
+    'nfpcore/nfp_nffw.c',
+    'nfpcore/nfp_rtsym.c',
+    'nfpcore/nfp_nsp_cmds.c',
+    'nfpcore/nfp_crc.c',
+    'nfpcore/nfp_mutex.c',
+    'nfpcore/nfp_nsp_eth.c',
+    'nfpcore/nfp_hwinfo.c',
+    'nfp_net.c')
diff --git a/drivers/net/null/meson.build b/drivers/net/null/meson.build
index d9fb88fd7d..0251578aab 100644
--- a/drivers/net/null/meson.build
+++ b/drivers/net/null/meson.build
@@ -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
 
 sources = files('rte_eth_null.c')
diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index b8fe4b3013..0a69dfd467 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'octeontx_pkovf.c',
-	'octeontx_pkivf.c',
-	'octeontx_bgx.c'
+        'octeontx_pkovf.c',
+        'octeontx_pkivf.c',
+        'octeontx_bgx.c'
 ]
 
 depends = ['ethdev', 'mempool_octeontx']
 static_objs = []
 foreach d: depends
-	if not is_variable('shared_rte_' + d)
-		subdir_done()
-	endif
-	static_objs += get_variable('static_rte_' + d)
+    if not is_variable('shared_rte_' + d)
+        subdir_done()
+    endif
+    static_objs += get_variable('static_rte_' + d)
 endforeach
 
 c_args = cflags
 base_lib = static_library('octeontx_base', sources,
-	c_args: c_args,
-	dependencies: static_objs,
+    c_args: c_args,
+    dependencies: static_objs,
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 4e784b9484..1baac97688 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -2,18 +2,18 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('octeontx_rxtx.c',
-		'octeontx_ethdev.c',
-		'octeontx_ethdev_ops.c'
-		)
+        'octeontx_ethdev.c',
+        'octeontx_ethdev_ops.c'
+        )
 
 deps += ['mempool_octeontx', 'eventdev']
 
diff --git a/drivers/net/octeontx2/meson.build b/drivers/net/octeontx2/meson.build
index 779a75b5d0..fbcdd61e14 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,49 +3,49 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_rx.c',
-		'otx2_tx.c',
-		'otx2_tm.c',
-		'otx2_rss.c',
-		'otx2_mac.c',
-		'otx2_ptp.c',
-		'otx2_flow.c',
-		'otx2_link.c',
-		'otx2_vlan.c',
-		'otx2_stats.c',
-		'otx2_mcast.c',
-		'otx2_lookup.c',
-		'otx2_ethdev.c',
-		'otx2_flow_ctrl.c',
-		'otx2_flow_dump.c',
-		'otx2_flow_parse.c',
-		'otx2_flow_utils.c',
-		'otx2_ethdev_irq.c',
-		'otx2_ethdev_ops.c',
-		'otx2_ethdev_sec.c',
-		'otx2_ethdev_debug.c',
-		'otx2_ethdev_devargs.c'
-		)
+        'otx2_tx.c',
+        'otx2_tm.c',
+        'otx2_rss.c',
+        'otx2_mac.c',
+        'otx2_ptp.c',
+        'otx2_flow.c',
+        'otx2_link.c',
+        'otx2_vlan.c',
+        'otx2_stats.c',
+        'otx2_mcast.c',
+        'otx2_lookup.c',
+        'otx2_ethdev.c',
+        'otx2_flow_ctrl.c',
+        'otx2_flow_dump.c',
+        'otx2_flow_parse.c',
+        'otx2_flow_utils.c',
+        'otx2_ethdev_irq.c',
+        'otx2_ethdev_ops.c',
+        'otx2_ethdev_sec.c',
+        'otx2_ethdev_debug.c',
+        'otx2_ethdev_devargs.c'
+        )
 
 deps += ['bus_pci', 'cryptodev', 'eventdev', 'security']
 deps += ['common_octeontx2', 'mempool_octeontx2']
 
 extra_flags = ['-flax-vector-conversions']
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/net/octeontx_ep/meson.build b/drivers/net/octeontx_ep/meson.build
index a8436f35f2..ccadcc8732 100644
--- a/drivers/net/octeontx_ep/meson.build
+++ b/drivers/net/octeontx_ep/meson.build
@@ -4,10 +4,10 @@
 
 deps += ['common_octeontx2']
 sources = files(
-               'otx_ep_ethdev.c',
-               'otx_ep_vf.c',
-               'otx2_ep_vf.c',
-               'otx_ep_rxtx.c',
+        'otx_ep_ethdev.c',
+        'otx_ep_vf.c',
+        'otx2_ep_vf.c',
+        'otx_ep_rxtx.c',
                )
 
 includes += include_directories('../../common/octeontx2')
diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build
index b65d91e70a..61c0551582 100644
--- a/drivers/net/pcap/meson.build
+++ b/drivers/net/pcap/meson.build
@@ -2,14 +2,14 @@
 # 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 dpdk_conf.has('RTE_PORT_PCAP')
-	build = false
-	reason = 'missing dependency, "libpcap"'
+    build = false
+    reason = 'missing dependency, "libpcap"'
 endif
 sources = files('rte_eth_pcap.c')
 ext_deps += pcap_dep
diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build
index da0787c28c..811053ae90 100644
--- a/drivers/net/pfe/meson.build
+++ b/drivers/net/pfe/meson.build
@@ -2,18 +2,18 @@
 # Copyright 2019 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['common_dpaax']
 
 sources = files('pfe_ethdev.c',
-		'pfe_hal.c',
-		'pfe_hif_lib.c',
-		'pfe_hif.c')
+        'pfe_hal.c',
+        'pfe_hif_lib.c',
+        'pfe_hif.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/qede/base/meson.build b/drivers/net/qede/base/meson.build
index 03a6c44f53..614a0c3808 100644
--- a/drivers/net/qede/base/meson.build
+++ b/drivers/net/qede/base/meson.build
@@ -2,47 +2,47 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = [
-	'bcm_osal.c',
-	'ecore_cxt.c',
-	'ecore_dcbx.c',
-	'ecore_dev.c',
-	'ecore_hw.c',
-	'ecore_init_fw_funcs.c',
-	'ecore_init_ops.c',
-	'ecore_int.c',
-	'ecore_l2.c',
-	'ecore_mcp.c',
-	'ecore_sp_commands.c',
-	'ecore_spq.c',
-	'ecore_sriov.c',
-	'ecore_vf.c',
+        'bcm_osal.c',
+        'ecore_cxt.c',
+        'ecore_dcbx.c',
+        'ecore_dev.c',
+        'ecore_hw.c',
+        'ecore_init_fw_funcs.c',
+        'ecore_init_ops.c',
+        'ecore_int.c',
+        'ecore_l2.c',
+        'ecore_mcp.c',
+        'ecore_sp_commands.c',
+        'ecore_spq.c',
+        'ecore_sriov.c',
+        'ecore_vf.c',
 ]
 
 
 error_cflags = [
-	'-Wno-unused-parameter',
-	'-Wno-sign-compare',
-	'-Wno-missing-prototypes',
-	'-Wno-cast-qual',
-	'-Wno-unused-function',
-	'-Wno-unused-variable',
-	'-Wno-strict-aliasing',
-	'-Wno-missing-prototypes',
-	'-Wno-unused-value',
-	'-Wno-format-nonliteral',
-	'-Wno-shift-negative-value',
-	'-Wno-unused-but-set-variable',
-	'-Wno-missing-declarations',
-	'-Wno-maybe-uninitialized',
-	'-Wno-strict-prototypes',
-	'-Wno-shift-negative-value',
-	'-Wno-implicit-fallthrough',
-	'-Wno-format-extra-args',
-	'-Wno-visibility',
-	'-Wno-empty-body',
-	'-Wno-invalid-source-encoding',
-	'-Wno-sometimes-uninitialized',
-	'-Wno-pointer-bool-conversion',
+        '-Wno-unused-parameter',
+        '-Wno-sign-compare',
+        '-Wno-missing-prototypes',
+        '-Wno-cast-qual',
+        '-Wno-unused-function',
+        '-Wno-unused-variable',
+        '-Wno-strict-aliasing',
+        '-Wno-missing-prototypes',
+        '-Wno-unused-value',
+        '-Wno-format-nonliteral',
+        '-Wno-shift-negative-value',
+        '-Wno-unused-but-set-variable',
+        '-Wno-missing-declarations',
+        '-Wno-maybe-uninitialized',
+        '-Wno-strict-prototypes',
+        '-Wno-shift-negative-value',
+        '-Wno-implicit-fallthrough',
+        '-Wno-format-extra-args',
+        '-Wno-visibility',
+        '-Wno-empty-body',
+        '-Wno-invalid-source-encoding',
+        '-Wno-sometimes-uninitialized',
+        '-Wno-pointer-bool-conversion',
 ]
 c_args = cflags
 foreach flag: error_cflags
@@ -52,6 +52,6 @@ foreach flag: error_cflags
 endforeach
 
 base_lib = static_library('qede_base', sources,
-	dependencies: [static_rte_net, static_rte_bus_pci],
-	c_args: c_args)
+    dependencies: [static_rte_net, static_rte_bus_pci],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 05ce69560b..6591a883ed 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'qede_ethdev.c',
-	'qede_filter.c',
-	'qede_main.c',
-	'qede_rxtx.c',
-	'qede_debug.c',
-	'qede_regs.c',
-	'qede_sriov.c',
+        'qede_ethdev.c',
+        'qede_filter.c',
+        'qede_main.c',
+        'qede_rxtx.c',
+        'qede_debug.c',
+        'qede_regs.c',
+        'qede_sriov.c',
 )
 
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
diff --git a/drivers/net/ring/meson.build b/drivers/net/ring/meson.build
index fb6a5f7d66..0156b37aad 100644
--- a/drivers/net/ring/meson.build
+++ b/drivers/net/ring/meson.build
@@ -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
 
 sources = files('rte_eth_ring.c')
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index 0c5cfb9058..b58425bf99 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -7,14 +7,14 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
@@ -24,42 +24,42 @@ extra_flags += '-Wno-strict-aliasing'
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+        '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+        '-Waggregate-return',
+        '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 deps += ['common_sfc_efx', 'bus_pci']
 sources = files(
-	'sfc_ethdev.c',
-	'sfc_kvargs.c',
-	'sfc.c',
-	'sfc_mcdi.c',
-	'sfc_sriov.c',
-	'sfc_intr.c',
-	'sfc_ev.c',
-	'sfc_port.c',
-	'sfc_rx.c',
-	'sfc_tx.c',
-	'sfc_tso.c',
-	'sfc_filter.c',
-	'sfc_switch.c',
-	'sfc_mae.c',
-	'sfc_flow.c',
-	'sfc_dp.c',
-	'sfc_ef10_rx.c',
-	'sfc_ef10_essb_rx.c',
-	'sfc_ef10_tx.c',
-	'sfc_ef100_rx.c',
-	'sfc_ef100_tx.c',
+        'sfc_ethdev.c',
+        'sfc_kvargs.c',
+        'sfc.c',
+        'sfc_mcdi.c',
+        'sfc_sriov.c',
+        'sfc_intr.c',
+        'sfc_ev.c',
+        'sfc_port.c',
+        'sfc_rx.c',
+        'sfc_tx.c',
+        'sfc_tso.c',
+        'sfc_filter.c',
+        'sfc_switch.c',
+        'sfc_mae.c',
+        'sfc_flow.c',
+        'sfc_dp.c',
+        'sfc_ef10_rx.c',
+        'sfc_ef10_essb_rx.c',
+        'sfc_ef10_tx.c',
+        'sfc_ef100_rx.c',
+        'sfc_ef100_tx.c',
 )
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index e31bdece7b..0bde03a0c3 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -2,23 +2,23 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 headers = files('rte_eth_softnic.h')
 sources = files('rte_eth_softnic_tm.c',
-	'rte_eth_softnic.c',
-	'rte_eth_softnic_mempool.c',
-	'rte_eth_softnic_swq.c',
-	'rte_eth_softnic_link.c',
-	'rte_eth_softnic_tap.c',
-	'rte_eth_softnic_action.c',
-	'rte_eth_softnic_pipeline.c',
-	'rte_eth_softnic_thread.c',
-	'rte_eth_softnic_cli.c',
-	'rte_eth_softnic_flow.c',
-	'rte_eth_softnic_meter.c',
-	'rte_eth_softnic_cryptodev.c',
-	'parser.c',
-	'conn.c')
+    'rte_eth_softnic.c',
+    'rte_eth_softnic_mempool.c',
+    'rte_eth_softnic_swq.c',
+    'rte_eth_softnic_link.c',
+    'rte_eth_softnic_tap.c',
+    'rte_eth_softnic_action.c',
+    'rte_eth_softnic_pipeline.c',
+    'rte_eth_softnic_thread.c',
+    'rte_eth_softnic_cli.c',
+    'rte_eth_softnic_flow.c',
+    'rte_eth_softnic_meter.c',
+    'rte_eth_softnic_cryptodev.c',
+    'parser.c',
+    'conn.c')
 deps += ['pipeline', 'port', 'table', 'sched', 'cryptodev']
diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
index 4f8f3325f6..dd288bfac8 100644
--- a/drivers/net/szedata2/meson.build
+++ b/drivers/net/szedata2/meson.build
@@ -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
 
 dep = dependency('libsze2', required: false, method: 'pkg-config')
diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build
index d51bd3190d..43fd7775e6 100644
--- a/drivers/net/tap/meson.build
+++ b/drivers/net/tap/meson.build
@@ -2,16 +2,16 @@
 # Copyright 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files(
-	'rte_eth_tap.c',
-	'tap_bpf_api.c',
-	'tap_flow.c',
-	'tap_intr.c',
-	'tap_netlink.c',
-	'tap_tcmsgs.c',
+        'rte_eth_tap.c',
+        'tap_bpf_api.c',
+        'tap_flow.c',
+        'tap_intr.c',
+        'tap_netlink.c',
+        'tap_tcmsgs.c',
 )
 
 deps = ['bus_vdev', 'gso', 'hash']
@@ -25,21 +25,15 @@ cflags += '-DTAP_MAX_QUEUES=16'
 #   "enum/define", "symbol to search" ]
 #
 args = [
-	[ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_UNSPEC' ],
-	[ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_KEY_VLAN_PRIO' ],
-	[ 'HAVE_TC_BPF', 'linux/pkt_cls.h',
-	  'TCA_BPF_UNSPEC' ],
-	[ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h',
-	  'TCA_BPF_FD' ],
-	[ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_UNSPEC' ],
-	[ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_FD' ],
+        [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h', 'TCA_FLOWER_UNSPEC' ],
+        [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h', 'TCA_FLOWER_KEY_VLAN_PRIO' ],
+        [ 'HAVE_TC_BPF', 'linux/pkt_cls.h', 'TCA_BPF_UNSPEC' ],
+        [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h', 'TCA_BPF_FD' ],
+        [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h', 'TCA_ACT_BPF_UNSPEC' ],
+        [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h', 'TCA_ACT_BPF_FD' ],
 ]
 config = configuration_data()
 foreach arg:args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
 endforeach
 configure_file(output : 'tap_autoconf.h', configuration : config)
diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build
index 8998264a3a..9cf4bf553a 100644
--- a/drivers/net/thunderx/base/meson.build
+++ b/drivers/net/thunderx/base/meson.build
@@ -2,15 +2,15 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'nicvf_hw.c',
-	'nicvf_mbox.c',
-	'nicvf_bsvf.c'
+        'nicvf_hw.c',
+        'nicvf_mbox.c',
+        'nicvf_bsvf.c'
 ]
 
 c_args = cflags
 base_lib = static_library('nicvf_base', sources,
-	c_args: c_args,
-	dependencies: static_rte_ethdev
+    c_args: c_args,
+    dependencies: static_rte_ethdev
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index dad5c59242..468a450ec0 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -2,25 +2,25 @@
 # 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
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('nicvf_rxtx.c',
-		'nicvf_ethdev.c',
-		'nicvf_svf.c'
+        'nicvf_ethdev.c',
+        'nicvf_svf.c'
 )
 
 if cc.has_argument('-fno-prefetch-loop-arrays')
-	cflags += '-fno-prefetch-loop-arrays'
+    cflags += '-fno-prefetch-loop-arrays'
 endif
 
 if cc.has_argument('-Wno-maybe-uninitialized')
-	cflags += '-Wno-maybe-uninitialized'
+    cflags += '-Wno-maybe-uninitialized'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build
index 33d0adf0d6..94db39ce2e 100644
--- a/drivers/net/txgbe/base/meson.build
+++ b/drivers/net/txgbe/base/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2015-2020
 
 sources = [
-	'txgbe_dcb_hw.c',
-	'txgbe_dcb.c',
-	'txgbe_eeprom.c',
-	'txgbe_hw.c',
-	'txgbe_mbx.c',
-	'txgbe_mng.c',
-	'txgbe_phy.c',
-	'txgbe_vf.c',
+        'txgbe_dcb_hw.c',
+        'txgbe_dcb.c',
+        'txgbe_eeprom.c',
+        'txgbe_hw.c',
+        'txgbe_mbx.c',
+        'txgbe_mng.c',
+        'txgbe_phy.c',
+        'txgbe_vf.c',
 ]
 
 error_cflags = []
 
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('txgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build
index 3b9994aa97..5fbbbd56f1 100644
--- a/drivers/net/txgbe/meson.build
+++ b/drivers/net/txgbe/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2015-2020
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'txgbe_ethdev.c',
-	'txgbe_ethdev_vf.c',
-	'txgbe_fdir.c',
-	'txgbe_flow.c',
-	'txgbe_ipsec.c',
-	'txgbe_ptypes.c',
-	'txgbe_pf.c',
-	'txgbe_rxtx.c',
-	'txgbe_tm.c',
+        'txgbe_ethdev.c',
+        'txgbe_ethdev_vf.c',
+        'txgbe_fdir.c',
+        'txgbe_flow.c',
+        'txgbe_ipsec.c',
+        'txgbe_ptypes.c',
+        'txgbe_pf.c',
+        'txgbe_rxtx.c',
+        'txgbe_tm.c',
 )
 
 deps += ['hash', 'security']
diff --git a/drivers/net/vdev_netvsc/meson.build b/drivers/net/vdev_netvsc/meson.build
index 49d3a2c7bb..b20a053bc2 100644
--- a/drivers/net/vdev_netvsc/meson.build
+++ b/drivers/net/vdev_netvsc/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('vdev_netvsc.c')
 
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
index 804b7a1dd1..858b79fdf5 100644
--- a/drivers/net/vhost/meson.build
+++ b/drivers/net/vhost/meson.build
@@ -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
 
 build = dpdk_conf.has('RTE_LIB_VHOST')
diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
index d595cfdcab..06bd0b6edc 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -2,54 +2,54 @@
 # 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('virtio.c',
-	'virtio_ethdev.c',
-	'virtio_pci_ethdev.c',
-	'virtio_pci.c',
-	'virtio_rxtx.c',
-	'virtio_rxtx_simple.c',
-	'virtqueue.c')
+    'virtio_ethdev.c',
+    'virtio_pci_ethdev.c',
+    'virtio_pci.c',
+    'virtio_rxtx.c',
+    'virtio_rxtx_simple.c',
+    'virtqueue.c')
 deps += ['kvargs', 'bus_pci']
 
 if arch_subdir == 'x86'
-	if not machine_args.contains('-mno-avx512f')
-		if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
-			cflags += ['-DCC_AVX512_SUPPORT']
-			virtio_avx512_lib = static_library('virtio_avx512_lib',
-					      'virtio_rxtx_packed.c',
-					      dependencies: [static_rte_ethdev,
-						static_rte_kvargs, static_rte_bus_pci],
-					      include_directories: includes,
-					      c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
-			objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
-			if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-				cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
-			elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-				cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
-			elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-				cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
-			endif
-		endif
-	endif
-	sources += files('virtio_rxtx_simple_sse.c')
+    if not machine_args.contains('-mno-avx512f')
+        if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
+            cflags += ['-DCC_AVX512_SUPPORT']
+            virtio_avx512_lib = static_library('virtio_avx512_lib',
+                          'virtio_rxtx_packed.c',
+                          dependencies: [static_rte_ethdev,
+                        static_rte_kvargs, static_rte_bus_pci],
+                          include_directories: includes,
+                          c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
+            objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
+            if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
+                cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
+            elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
+                cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
+            elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
+                cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
+            endif
+        endif
+    endif
+    sources += files('virtio_rxtx_simple_sse.c')
 elif arch_subdir == 'ppc'
-	sources += files('virtio_rxtx_simple_altivec.c')
+    sources += files('virtio_rxtx_simple_altivec.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('virtio_rxtx_packed.c')
-	sources += files('virtio_rxtx_simple_neon.c')
+    sources += files('virtio_rxtx_packed.c')
+    sources += files('virtio_rxtx_simple_neon.c')
 endif
 
 if is_linux
-	sources += files('virtio_user_ethdev.c',
-		'virtio_user/vhost_kernel.c',
-		'virtio_user/vhost_kernel_tap.c',
-		'virtio_user/vhost_user.c',
-		'virtio_user/vhost_vdpa.c',
-		'virtio_user/virtio_user_dev.c')
-	deps += ['bus_vdev']
+    sources += files('virtio_user_ethdev.c',
+        'virtio_user/vhost_kernel.c',
+        'virtio_user/vhost_kernel_tap.c',
+        'virtio_user/vhost_user.c',
+        'virtio_user/vhost_vdpa.c',
+        'virtio_user/virtio_user_dev.c')
+    deps += ['bus_vdev']
 endif
diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build
index 0641f776ff..ed563386d5 100644
--- a/drivers/net/vmxnet3/meson.build
+++ b/drivers/net/vmxnet3/meson.build
@@ -2,13 +2,15 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources += files(
-	'vmxnet3_ethdev.c',
-	'vmxnet3_rxtx.c',
+        'vmxnet3_ethdev.c',
+        'vmxnet3_rxtx.c',
 )
 
 error_cflags = [
-		'-Wno-unused-parameter', '-Wno-unused-value',
-                '-Wno-strict-aliasing', '-Wno-format-extra-args',
+        '-Wno-unused-parameter',
+        '-Wno-unused-value',
+        '-Wno-strict-aliasing',
+        '-Wno-format-extra-args',
 ]
 foreach flag: error_cflags
         if cc.has_argument(flag)
diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
index 3549afafa1..8d27c60213 100644
--- a/drivers/raw/ifpga/base/meson.build
+++ b/drivers/raw/ifpga/base/meson.build
@@ -2,42 +2,42 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = [
-	'ifpga_api.c',
-	'ifpga_enumerate.c',
-	'ifpga_feature_dev.c',
-	'ifpga_fme.c',
-	'ifpga_fme_iperf.c',
-	'ifpga_fme_dperf.c',
-	'ifpga_fme_error.c',
-	'ifpga_port.c',
-	'ifpga_port_error.c',
-	'ifpga_fme_pr.c',
-	'ifpga_fme_rsu.c',
-	'ifpga_sec_mgr.c',
-	'opae_hw_api.c',
-	'opae_ifpga_hw_api.c',
-	'opae_debug.c',
-	'opae_spi.c',
-	'opae_spi_transaction.c',
-	'opae_intel_max10.c',
-	'opae_i2c.c',
-	'opae_at24_eeprom.c',
-	'opae_eth_group.c',
+        'ifpga_api.c',
+        'ifpga_enumerate.c',
+        'ifpga_feature_dev.c',
+        'ifpga_fme.c',
+        'ifpga_fme_iperf.c',
+        'ifpga_fme_dperf.c',
+        'ifpga_fme_error.c',
+        'ifpga_port.c',
+        'ifpga_port_error.c',
+        'ifpga_fme_pr.c',
+        'ifpga_fme_rsu.c',
+        'ifpga_sec_mgr.c',
+        'opae_hw_api.c',
+        'opae_ifpga_hw_api.c',
+        'opae_debug.c',
+        'opae_spi.c',
+        'opae_spi_transaction.c',
+        'opae_intel_max10.c',
+        'opae_i2c.c',
+        'opae_at24_eeprom.c',
+        'opae_eth_group.c',
 ]
 
 rtdep = dependency('librt', required: false)
 if not rtdep.found()
-	rtdep = cc.find_library('librt', required: false)
+    rtdep = cc.find_library('librt', required: false)
 endif
 if not rtdep.found()
-	build = false
-	reason = 'missing dependency, "librt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "librt"'
+    subdir_done()
 endif
 
 ext_deps += rtdep
 
 base_lib = static_library('ifpga_rawdev_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 60ea59ae28..aeccc1796d 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
-	'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
+    'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
 
 sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c')
 
diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build
index 6fbae05b78..47633f2795 100644
--- a/drivers/raw/ioat/meson.build
+++ b/drivers/raw/ioat/meson.build
@@ -4,15 +4,15 @@
 build = dpdk_conf.has('RTE_ARCH_X86')
 reason = 'only supported on x86'
 sources = files(
-	'idxd_pci.c',
-	'idxd_vdev.c',
-	'ioat_common.c',
-	'ioat_rawdev.c',
-	'ioat_rawdev_test.c')
+        'idxd_pci.c',
+        'idxd_vdev.c',
+        'ioat_common.c',
+        'ioat_rawdev.c',
+    'ioat_rawdev_test.c')
 deps += ['bus_pci',
-	'bus_vdev',
-	'mbuf',
-	'rawdev']
+    'bus_vdev',
+    'mbuf',
+    'rawdev']
 
 headers = files('rte_ioat_rawdev.h',
-		'rte_ioat_rawdev_fns.h')
+        'rte_ioat_rawdev_fns.h')
diff --git a/drivers/raw/ntb/meson.build b/drivers/raw/ntb/meson.build
index 1b7c6eb449..bfe0b0e366 100644
--- a/drivers/raw/ntb/meson.build
+++ b/drivers/raw/ntb/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2019 Intel Corporation.
 
 deps += ['rawdev', 'mbuf', 'mempool',
-	 'pci', 'bus_pci']
+     'pci', 'bus_pci']
 sources = files('ntb.c',
                 'ntb_hw_intel.c')
 headers = files('rte_pmd_ntb.h')
diff --git a/drivers/raw/octeontx2_dma/meson.build b/drivers/raw/octeontx2_dma/meson.build
index 11f74680a5..e744fccaae 100644
--- a/drivers/raw/octeontx2_dma/meson.build
+++ b/drivers/raw/octeontx2_dma/meson.build
@@ -8,11 +8,11 @@ sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c')
 extra_flags = []
 # This integrated controller runs only on a arm64 machine, remove 32bit warnings
 if not dpdk_conf.get('RTE_ARCH_64')
-	extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
+    extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
 endif
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
diff --git a/drivers/raw/octeontx2_ep/meson.build b/drivers/raw/octeontx2_ep/meson.build
index 0e6338f76b..fed71db5e8 100644
--- a/drivers/raw/octeontx2_ep/meson.build
+++ b/drivers/raw/octeontx2_ep/meson.build
@@ -4,6 +4,6 @@
 
 deps += ['bus_pci', 'common_octeontx2', 'rawdev']
 sources = files('otx2_ep_rawdev.c',
-		'otx2_ep_enqdeq.c',
-		'otx2_ep_test.c',
-		'otx2_ep_vf.c')
+        'otx2_ep_enqdeq.c',
+        'otx2_ep_test.c',
+        'otx2_ep_vf.c')
diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build
index 87e9611812..888ac5a8de 100644
--- a/drivers/regex/mlx5/meson.build
+++ b/drivers/regex/mlx5/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2020 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['common_mlx5', 'eal', 'regexdev']
 sources = files(
-	'mlx5_regex.c',
-	'mlx5_rxp.c',
-	'mlx5_regex_devx.c',
-	'mlx5_regex_control.c',
-	'mlx5_regex_fastpath.c',
+        'mlx5_regex.c',
+        'mlx5_rxp.c',
+        'mlx5_regex_devx.c',
+        'mlx5_regex_control.c',
+        'mlx5_regex_fastpath.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/regex/octeontx2/meson.build b/drivers/regex/octeontx2/meson.build
index 6ccc8589a7..55af764b90 100644
--- a/drivers/regex/octeontx2/meson.build
+++ b/drivers/regex/octeontx2/meson.build
@@ -3,24 +3,24 @@
 #
 
 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
 
 lib = cc.find_library('librxp_compiler', required: false)
 if lib.found()
-	ext_deps += lib
-	ext_deps += cc.find_library('libstdc++', required: true)
-	includes += include_directories(inc_dir)
-	cflags += ['-DREE_COMPILER_SDK']
+    ext_deps += lib
+    ext_deps += cc.find_library('libstdc++', required: true)
+    includes += include_directories(inc_dir)
+    cflags += ['-DREE_COMPILER_SDK']
 endif
 
 sources = files('otx2_regexdev.c',
-		'otx2_regexdev_hw_access.c',
-		'otx2_regexdev_mbox.c',
-		'otx2_regexdev_compiler.c'
-		)
+        'otx2_regexdev_hw_access.c',
+        'otx2_regexdev_mbox.c',
+        'otx2_regexdev_compiler.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'regexdev']
 
diff --git a/drivers/vdpa/mlx5/meson.build b/drivers/vdpa/mlx5/meson.build
index a83ca86b3f..8335e39b9d 100644
--- a/drivers/vdpa/mlx5/meson.build
+++ b/drivers/vdpa/mlx5/meson.build
@@ -2,35 +2,35 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched']
 sources = files(
-	'mlx5_vdpa.c',
-	'mlx5_vdpa_mem.c',
-	'mlx5_vdpa_event.c',
-	'mlx5_vdpa_virtq.c',
-	'mlx5_vdpa_steer.c',
-	'mlx5_vdpa_lm.c',
+        'mlx5_vdpa.c',
+        'mlx5_vdpa_mem.c',
+        'mlx5_vdpa_event.c',
+        'mlx5_vdpa_virtq.c',
+        'mlx5_vdpa_steer.c',
+        'mlx5_vdpa_lm.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
-- 
2.27.0

Re: [dpdk-dev] [PATCH v2 09/16] drivers: change meson file tabs to spaces

[Xu, Rosen]

Hi,

> -----Original Message-----
> From: Richardson, Bruce <bruce.richardson@intel.com>
> Sent: Tuesday, April 20, 2021 18:22
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; Chautru, Nicolas
> <nicolas.chautru@intel.com>; Hemant Agrawal <hemant.agrawal@nxp.com>;
> Sachin Saxena <sachin.saxena@oss.nxp.com>; Xu, Rosen
> <rosen.xu@intel.com>; Stephen Hemminger <sthemmin@microsoft.com>;
>  drivers/bus/ifpga/meson.build           |   6 +-
>  drivers/net/ipn3ke/meson.build          |  18 +-
>  drivers/raw/ifpga/base/meson.build      |  54 ++--
>  drivers/raw/ifpga/meson.build           |   8 +-

> diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build
> index 4d0507f553..cc5047e3ce 100644
> --- a/drivers/bus/ifpga/meson.build
> +++ b/drivers/bus/ifpga/meson.build
> @@ -2,9 +2,9 @@
>  # Copyright(c) 2010-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
> 
> diff --git a/drivers/net/ipn3ke/meson.build
> b/drivers/net/ipn3ke/meson.build
> index 65de9d5172..6863cd9041 100644
> --- a/drivers/net/ipn3ke/meson.build
> +++ b/drivers/net/ipn3ke/meson.build
> @@ -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
> 
>  #
> @@ -16,15 +16,15 @@ endif
>  #
> 
>  if has_libfdt == 0
> -	build = false
> -	reason = 'missing dependency, "libfdt"'
> -	subdir_done()
> +    build = false
> +    reason = 'missing dependency, "libfdt"'
> +    subdir_done()
>  endif
> 
>  includes += include_directories('../../raw/ifpga')
> 
>  sources += files('ipn3ke_ethdev.c',
> -	'ipn3ke_representor.c',
> -	'ipn3ke_tm.c',
> -	'ipn3ke_flow.c')
> +    'ipn3ke_representor.c',
> +    'ipn3ke_tm.c',
> +    'ipn3ke_flow.c')
>  deps += ['bus_ifpga', 'ethdev', 'sched']
> diff --git a/drivers/raw/ifpga/base/meson.build
> b/drivers/raw/ifpga/base/meson.build
> index 3549afafa1..8d27c60213 100644
> --- a/drivers/raw/ifpga/base/meson.build
> +++ b/drivers/raw/ifpga/base/meson.build
> @@ -2,42 +2,42 @@
>  # Copyright(c) 2018 Intel Corporation
> 
>  sources = [
> -	'ifpga_api.c',
> -	'ifpga_enumerate.c',
> -	'ifpga_feature_dev.c',
> -	'ifpga_fme.c',
> -	'ifpga_fme_iperf.c',
> -	'ifpga_fme_dperf.c',
> -	'ifpga_fme_error.c',
> -	'ifpga_port.c',
> -	'ifpga_port_error.c',
> -	'ifpga_fme_pr.c',
> -	'ifpga_fme_rsu.c',
> -	'ifpga_sec_mgr.c',
> -	'opae_hw_api.c',
> -	'opae_ifpga_hw_api.c',
> -	'opae_debug.c',
> -	'opae_spi.c',
> -	'opae_spi_transaction.c',
> -	'opae_intel_max10.c',
> -	'opae_i2c.c',
> -	'opae_at24_eeprom.c',
> -	'opae_eth_group.c',
> +        'ifpga_api.c',
> +        'ifpga_enumerate.c',
> +        'ifpga_feature_dev.c',
> +        'ifpga_fme.c',
> +        'ifpga_fme_iperf.c',
> +        'ifpga_fme_dperf.c',
> +        'ifpga_fme_error.c',
> +        'ifpga_port.c',
> +        'ifpga_port_error.c',
> +        'ifpga_fme_pr.c',
> +        'ifpga_fme_rsu.c',
> +        'ifpga_sec_mgr.c',
> +        'opae_hw_api.c',
> +        'opae_ifpga_hw_api.c',
> +        'opae_debug.c',
> +        'opae_spi.c',
> +        'opae_spi_transaction.c',
> +        'opae_intel_max10.c',
> +        'opae_i2c.c',
> +        'opae_at24_eeprom.c',
> +        'opae_eth_group.c',
>  ]
> 
>  rtdep = dependency('librt', required: false)
>  if not rtdep.found()
> -	rtdep = cc.find_library('librt', required: false)
> +    rtdep = cc.find_library('librt', required: false)
>  endif
>  if not rtdep.found()
> -	build = false
> -	reason = 'missing dependency, "librt"'
> -	subdir_done()
> +    build = false
> +    reason = 'missing dependency, "librt"'
> +    subdir_done()
>  endif
> 
>  ext_deps += rtdep
> 
>  base_lib = static_library('ifpga_rawdev_base', sources,
> -	dependencies: static_rte_eal,
> -	c_args: cflags)
> +    dependencies: static_rte_eal,
> +    c_args: cflags)
>  base_objs = base_lib.extract_all_objects()
> diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
> index 60ea59ae28..aeccc1796d 100644
> --- a/drivers/raw/ifpga/meson.build
> +++ b/drivers/raw/ifpga/meson.build
> @@ -2,16 +2,16 @@
>  # Copyright(c) 2018 Intel Corporation
> 
>  if has_libfdt == 0
> -	build = false
> -	reason = 'missing dependency, "libfdt"'
> -	subdir_done()
> +    build = false
> +    reason = 'missing dependency, "libfdt"'
> +    subdir_done()
>  endif
> 
>  subdir('base')
>  objs = [base_objs]
> 
>  deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
> -	'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
> +    'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
> 
>  sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c')
> 
> 2.27.0

Reviewed-by: Rosen Xu <rosen.xu@intel.com>

[dpdk-dev] [PATCH v2 10/16] examples: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/bbdev_app/meson.build                |  2 +-
 examples/bond/meson.build                     |  2 +-
 examples/cmdline/meson.build                  |  4 ++-
 examples/distributor/meson.build              |  4 +--
 examples/ethtool/meson.build                  | 12 ++++----
 examples/eventdev_pipeline/meson.build        |  6 ++--
 examples/fips_validation/meson.build          | 22 +++++++-------
 examples/flow_classify/meson.build            |  2 +-
 examples/flow_filtering/meson.build           |  2 +-
 examples/helloworld/meson.build               |  2 +-
 examples/ioat/meson.build                     |  4 +--
 examples/ip_fragmentation/meson.build         |  2 +-
 examples/ip_pipeline/meson.build              | 30 +++++++++----------
 examples/ip_reassembly/meson.build            |  2 +-
 examples/ipsec-secgw/meson.build              | 26 ++++++++--------
 examples/ipv4_multicast/meson.build           |  2 +-
 examples/kni/meson.build                      |  4 +--
 examples/l2fwd-cat/meson.build                |  5 ++--
 examples/l2fwd-crypto/meson.build             |  4 +--
 examples/l2fwd-event/meson.build              | 12 ++++----
 examples/l2fwd-jobstats/meson.build           |  2 +-
 examples/l2fwd-keepalive/meson.build          |  7 +++--
 examples/l2fwd/meson.build                    |  2 +-
 examples/l3fwd-acl/meson.build                |  2 +-
 examples/l3fwd-graph/meson.build              |  2 +-
 examples/l3fwd-power/meson.build              |  3 +-
 examples/l3fwd/meson.build                    |  8 +++--
 examples/link_status_interrupt/meson.build    |  2 +-
 .../client_server_mp/mp_client/meson.build    |  2 +-
 .../client_server_mp/mp_server/meson.build    |  2 +-
 examples/multi_process/hotplug_mp/meson.build |  2 +-
 examples/multi_process/simple_mp/meson.build  |  2 +-
 .../multi_process/symmetric_mp/meson.build    |  2 +-
 examples/ntb/meson.build                      |  8 ++---
 examples/packet_ordering/meson.build          |  2 +-
 .../l3fwd-thread/meson.build                  | 20 ++++++-------
 .../pthread_shim/meson.build                  | 22 +++++++-------
 examples/pipeline/meson.build                 | 12 ++++----
 examples/ptpclient/meson.build                |  2 +-
 examples/qos_meter/meson.build                |  3 +-
 examples/qos_sched/meson.build                |  9 ++++--
 examples/rxtx_callbacks/meson.build           |  2 +-
 examples/service_cores/meson.build            |  2 +-
 examples/skeleton/meson.build                 |  2 +-
 examples/timer/meson.build                    |  2 +-
 examples/vdpa/meson.build                     |  6 ++--
 examples/vhost/meson.build                    | 11 +++----
 examples/vhost_blk/meson.build                | 12 ++++----
 examples/vhost_crypto/meson.build             |  4 +--
 .../vm_power_manager/guest_cli/meson.build    |  4 ++-
 examples/vm_power_manager/meson.build         | 25 +++++++++-------
 examples/vmdq/meson.build                     |  2 +-
 examples/vmdq_dcb/meson.build                 |  2 +-
 53 files changed, 183 insertions(+), 156 deletions(-)

diff --git a/examples/bbdev_app/meson.build b/examples/bbdev_app/meson.build
index 8e06a8a235..ea588e8706 100644
--- a/examples/bbdev_app/meson.build
+++ b/examples/bbdev_app/meson.build
@@ -9,5 +9,5 @@
 deps += 'bbdev'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/bond/meson.build b/examples/bond/meson.build
index 69382ffcd2..ed22b7887d 100644
--- a/examples/bond/meson.build
+++ b/examples/bond/meson.build
@@ -9,5 +9,5 @@
 deps += 'net_bond'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/cmdline/meson.build b/examples/cmdline/meson.build
index 7de0f16251..0e1e8fb256 100644
--- a/examples/cmdline/meson.build
+++ b/examples/cmdline/meson.build
@@ -8,5 +8,7 @@
 
 allow_experimental_apis = true
 sources = files(
-	'commands.c', 'main.c', 'parse_obj_list.c'
+        'commands.c',
+        'main.c',
+        'parse_obj_list.c',
 )
diff --git a/examples/distributor/meson.build b/examples/distributor/meson.build
index d8dbc235fb..9df59923ce 100644
--- a/examples/distributor/meson.build
+++ b/examples/distributor/meson.build
@@ -9,11 +9,11 @@
 # require the power library
 build = dpdk_conf.has('RTE_LIB_POWER')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 allow_experimental_apis = true
 deps += ['distributor', 'power']
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build
index 4d08bc4c57..d7f63d48af 100644
--- a/examples/ethtool/meson.build
+++ b/examples/ethtool/meson.build
@@ -8,17 +8,19 @@
 
 build = is_linux
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
-sources = files('lib/rte_ethtool.c',
-	'ethtool-app/ethapp.c',
-	'ethtool-app/main.c')
+sources = files(
+        'lib/rte_ethtool.c',
+        'ethtool-app/ethapp.c',
+        'ethtool-app/main.c',
+)
 includes = include_directories('lib', 'ethtool-app')
 
 deps += 'bus_pci'
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += 'net_ixgbe'
+    deps += 'net_ixgbe'
 endif
 
 allow_experimental_apis = true
diff --git a/examples/eventdev_pipeline/meson.build b/examples/eventdev_pipeline/meson.build
index 1dfeba0d3f..b8f5cfe109 100644
--- a/examples/eventdev_pipeline/meson.build
+++ b/examples/eventdev_pipeline/meson.build
@@ -9,7 +9,7 @@
 allow_experimental_apis = true
 deps += 'eventdev'
 sources = files(
-	'main.c',
-	'pipeline_worker_generic.c',
-	'pipeline_worker_tx.c'
+        'main.c',
+        'pipeline_worker_generic.c',
+        'pipeline_worker_tx.c',
 )
diff --git a/examples/fips_validation/meson.build b/examples/fips_validation/meson.build
index e2745d2786..7eef456318 100644
--- a/examples/fips_validation/meson.build
+++ b/examples/fips_validation/meson.build
@@ -9,15 +9,15 @@
 deps += ['cryptodev']
 allow_experimental_apis = true
 sources = files(
-	'fips_validation_aes.c',
-	'fips_validation.c',
-	'fips_validation_hmac.c',
-	'fips_validation_tdes.c',
-	'fips_validation_gcm.c',
-	'fips_validation_cmac.c',
-	'fips_validation_ccm.c',
-	'fips_validation_sha.c',
-	'fips_validation_xts.c',
-	'fips_dev_self_test.c',
-	'main.c'
+        'fips_validation_aes.c',
+        'fips_validation.c',
+        'fips_validation_hmac.c',
+        'fips_validation_tdes.c',
+        'fips_validation_gcm.c',
+        'fips_validation_cmac.c',
+        'fips_validation_ccm.c',
+        'fips_validation_sha.c',
+        'fips_validation_xts.c',
+        'fips_dev_self_test.c',
+        'main.c',
 )
diff --git a/examples/flow_classify/meson.build b/examples/flow_classify/meson.build
index 56472e6819..1be1bf0374 100644
--- a/examples/flow_classify/meson.build
+++ b/examples/flow_classify/meson.build
@@ -9,5 +9,5 @@
 deps += 'flow_classify'
 allow_experimental_apis = true
 sources = files(
-	'flow_classify.c'
+        'flow_classify.c',
 )
diff --git a/examples/flow_filtering/meson.build b/examples/flow_filtering/meson.build
index 6f5d1b08a9..441678bbe5 100644
--- a/examples/flow_filtering/meson.build
+++ b/examples/flow_filtering/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c',
+        'main.c',
 )
diff --git a/examples/helloworld/meson.build b/examples/helloworld/meson.build
index 2b0a250361..441678bbe5 100644
--- a/examples/helloworld/meson.build
+++ b/examples/helloworld/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/ioat/meson.build b/examples/ioat/meson.build
index e348196ba3..68bce1ab03 100644
--- a/examples/ioat/meson.build
+++ b/examples/ioat/meson.build
@@ -9,11 +9,11 @@
 allow_experimental_apis = true
 build = dpdk_conf.has('RTE_RAW_IOAT')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['raw_ioat']
 
 sources = files(
-	'ioatfwd.c'
+        'ioatfwd.c',
 )
diff --git a/examples/ip_fragmentation/meson.build b/examples/ip_fragmentation/meson.build
index 1230db4776..cd84e9b143 100644
--- a/examples/ip_fragmentation/meson.build
+++ b/examples/ip_fragmentation/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps +=  ['ip_frag', 'lpm']
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/ip_pipeline/meson.build b/examples/ip_pipeline/meson.build
index 945e28b58b..57f522c24c 100644
--- a/examples/ip_pipeline/meson.build
+++ b/examples/ip_pipeline/meson.build
@@ -8,24 +8,24 @@
 
 build = cc.has_header('sys/epoll.h')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['pipeline', 'bus_pci']
 allow_experimental_apis = true
 sources = files(
-	'action.c',
-	'cli.c',
-	'conn.c',
-	'kni.c',
-	'link.c',
-	'main.c',
-	'mempool.c',
-	'parser.c',
-	'pipeline.c',
-	'swq.c',
-	'tap.c',
-	'thread.c',
-	'tmgr.c',
-	'cryptodev.c'
+        'action.c',
+        'cli.c',
+        'conn.c',
+        'cryptodev.c',
+        'kni.c',
+        'link.c',
+        'main.c',
+        'mempool.c',
+        'parser.c',
+        'pipeline.c',
+        'swq.c',
+        'tap.c',
+        'thread.c',
+        'tmgr.c',
 )
diff --git a/examples/ip_reassembly/meson.build b/examples/ip_reassembly/meson.build
index 517bd4e19a..b12b66b127 100644
--- a/examples/ip_reassembly/meson.build
+++ b/examples/ip_reassembly/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['lpm', 'ip_frag']
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/ipsec-secgw/meson.build b/examples/ipsec-secgw/meson.build
index d0373dab53..b4b483a782 100644
--- a/examples/ipsec-secgw/meson.build
+++ b/examples/ipsec-secgw/meson.build
@@ -9,17 +9,17 @@
 deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev']
 allow_experimental_apis = true
 sources = files(
-	'esp.c',
-	'event_helper.c',
-	'flow.c',
-	'ipsec.c',
-	'ipsec_process.c',
-	'ipsec-secgw.c',
-	'ipsec_worker.c',
-	'parser.c',
-	'rt.c',
-	'sa.c',
-	'sad.c',
-	'sp4.c',
-	'sp6.c'
+        'esp.c',
+        'event_helper.c',
+        'flow.c',
+        'ipsec.c',
+        'ipsec_process.c',
+        'ipsec-secgw.c',
+        'ipsec_worker.c',
+        'parser.c',
+        'rt.c',
+        'sa.c',
+        'sad.c',
+        'sp4.c',
+        'sp6.c',
 )
diff --git a/examples/ipv4_multicast/meson.build b/examples/ipv4_multicast/meson.build
index 7dc13fb8fc..236f45bd56 100644
--- a/examples/ipv4_multicast/meson.build
+++ b/examples/ipv4_multicast/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'hash'
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/kni/meson.build b/examples/kni/meson.build
index e119eebabb..1c0bf99a49 100644
--- a/examples/kni/meson.build
+++ b/examples/kni/meson.build
@@ -9,11 +9,11 @@
 # this app can be built if-and-only-if KNI library is buildable
 build = dpdk_conf.has('RTE_LIB_KNI')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['kni', 'bus_pci']
 sources = files(
-	'main.c'
+        'main.c',
 )
 allow_experimental_apis = true
diff --git a/examples/l2fwd-cat/meson.build b/examples/l2fwd-cat/meson.build
index 60169bcbda..68554e76ce 100644
--- a/examples/l2fwd-cat/meson.build
+++ b/examples/l2fwd-cat/meson.build
@@ -9,12 +9,13 @@
 pqos = cc.find_library('pqos', required: false)
 build = pqos.found()
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 ext_deps += pqos
 allow_experimental_apis = true
 cflags += '-I/usr/local/include' # assume pqos lib installed in /usr/local
 sources = files(
-	'cat.c', 'l2fwd-cat.c'
+        'cat.c',
+        'l2fwd-cat.c',
 )
diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build
index 1813f015b2..bb44c88882 100644
--- a/examples/l2fwd-crypto/meson.build
+++ b/examples/l2fwd-crypto/meson.build
@@ -8,9 +8,9 @@
 
 deps += 'cryptodev'
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/l2fwd-event/meson.build b/examples/l2fwd-event/meson.build
index 4a546eaf81..5bc8188086 100644
--- a/examples/l2fwd-event/meson.build
+++ b/examples/l2fwd-event/meson.build
@@ -10,10 +10,10 @@
 allow_experimental_apis = true
 deps += 'eventdev'
 sources = files(
-	'main.c',
-	'l2fwd_poll.c',
-	'l2fwd_common.c',
-	'l2fwd_event.c',
-	'l2fwd_event_internal_port.c',
-	'l2fwd_event_generic.c'
+        'main.c',
+        'l2fwd_common.c',
+        'l2fwd_event.c',
+        'l2fwd_event_generic.c',
+        'l2fwd_event_internal_port.c',
+        'l2fwd_poll.c',
 )
diff --git a/examples/l2fwd-jobstats/meson.build b/examples/l2fwd-jobstats/meson.build
index 72273736b6..bffcf35e8c 100644
--- a/examples/l2fwd-jobstats/meson.build
+++ b/examples/l2fwd-jobstats/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['jobstats', 'timer']
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/l2fwd-keepalive/meson.build b/examples/l2fwd-keepalive/meson.build
index a56d679675..ed49c61238 100644
--- a/examples/l2fwd-keepalive/meson.build
+++ b/examples/l2fwd-keepalive/meson.build
@@ -9,12 +9,13 @@
 allow_experimental_apis = true
 librt = cc.find_library('rt', required: false)
 if not librt.found()
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 ext_deps += librt
 deps += 'timer'
 sources = files(
-	'main.c', 'shm.c'
+        'main.c',
+        'shm.c',
 )
diff --git a/examples/l2fwd/meson.build b/examples/l2fwd/meson.build
index 50d88caa0a..da6551407e 100644
--- a/examples/l2fwd/meson.build
+++ b/examples/l2fwd/meson.build
@@ -9,5 +9,5 @@
 # Enable experimental API flag as l2fwd uses rte_ethdev_set_ptype API
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/l3fwd-acl/meson.build b/examples/l3fwd-acl/meson.build
index 6fa468b3aa..6efe46e710 100644
--- a/examples/l3fwd-acl/meson.build
+++ b/examples/l3fwd-acl/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += ['acl', 'lpm', 'hash']
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/l3fwd-graph/meson.build b/examples/l3fwd-graph/meson.build
index a816bd8903..b3ceaadb59 100644
--- a/examples/l3fwd-graph/meson.build
+++ b/examples/l3fwd-graph/meson.build
@@ -8,6 +8,6 @@
 
 deps += ['graph', 'eal', 'lpm', 'ethdev', 'node' ]
 sources = files(
-	'main.c'
+        'main.c',
 )
 allow_experimental_apis = true
diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index eb8aef306a..0f69bb782c 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -14,5 +14,6 @@ endif
 allow_experimental_apis = true
 deps += ['power', 'timer', 'lpm', 'hash', 'metrics', 'telemetry']
 sources = files(
-	'main.c', 'perf_core.c'
+        'main.c',
+        'perf_core.c',
 )
diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build
index 7d72b1b365..b739d6900a 100644
--- a/examples/l3fwd/meson.build
+++ b/examples/l3fwd/meson.build
@@ -9,6 +9,10 @@
 allow_experimental_apis = true
 deps += ['hash', 'lpm', 'eventdev']
 sources = files(
-	'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c',
-	'l3fwd_event_internal_port.c', 'l3fwd_event_generic.c', 'main.c'
+        'l3fwd_em.c',
+        'l3fwd_event.c',
+        'l3fwd_event_internal_port.c',
+        'l3fwd_event_generic.c',
+        'l3fwd_lpm.c',
+        'main.c',
 )
diff --git a/examples/link_status_interrupt/meson.build b/examples/link_status_interrupt/meson.build
index 2b0a250361..441678bbe5 100644
--- a/examples/link_status_interrupt/meson.build
+++ b/examples/link_status_interrupt/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/multi_process/client_server_mp/mp_client/meson.build b/examples/multi_process/client_server_mp/mp_client/meson.build
index 69c3d3bfbe..3c4848bdef 100644
--- a/examples/multi_process/client_server_mp/mp_client/meson.build
+++ b/examples/multi_process/client_server_mp/mp_client/meson.build
@@ -10,5 +10,5 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-	'client.c'
+        'client.c'
 )
diff --git a/examples/multi_process/client_server_mp/mp_server/meson.build b/examples/multi_process/client_server_mp/mp_server/meson.build
index 0ef6424f4b..74814e5fe8 100644
--- a/examples/multi_process/client_server_mp/mp_server/meson.build
+++ b/examples/multi_process/client_server_mp/mp_server/meson.build
@@ -10,5 +10,5 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-	'args.c', 'init.c', 'main.c'
+        'args.c', 'init.c', 'main.c'
 )
diff --git a/examples/multi_process/hotplug_mp/meson.build b/examples/multi_process/hotplug_mp/meson.build
index f82f4d48a2..ae92905049 100644
--- a/examples/multi_process/hotplug_mp/meson.build
+++ b/examples/multi_process/hotplug_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'commands.c', 'main.c'
+        'commands.c', 'main.c'
 )
diff --git a/examples/multi_process/simple_mp/meson.build b/examples/multi_process/simple_mp/meson.build
index cb02c65a69..adb06b0a75 100644
--- a/examples/multi_process/simple_mp/meson.build
+++ b/examples/multi_process/simple_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'mp_commands.c', 'main.c'
+        'mp_commands.c', 'main.c'
 )
diff --git a/examples/multi_process/symmetric_mp/meson.build b/examples/multi_process/symmetric_mp/meson.build
index 14167825b0..a5b988c44f 100644
--- a/examples/multi_process/symmetric_mp/meson.build
+++ b/examples/multi_process/symmetric_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c'
 )
diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build
index 02be9fc80d..37899dfeb6 100644
--- a/examples/ntb/meson.build
+++ b/examples/ntb/meson.build
@@ -8,15 +8,15 @@
 
 allow_experimental_apis = true
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'rawdev'
 cflags += ['-D_FILE_OFFSET_BITS=64']
 sources = files(
-	'ntb_fwd.c'
+        'ntb_fwd.c',
 )
 if dpdk_conf.has('RTE_RAW_NTB')
-	deps += 'raw_ntb'
+    deps += 'raw_ntb'
 endif
diff --git a/examples/packet_ordering/meson.build b/examples/packet_ordering/meson.build
index b381959145..f8be053fb0 100644
--- a/examples/packet_ordering/meson.build
+++ b/examples/packet_ordering/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'reorder'
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/performance-thread/l3fwd-thread/meson.build b/examples/performance-thread/l3fwd-thread/meson.build
index 4858b201e4..58d4e96a45 100644
--- a/examples/performance-thread/l3fwd-thread/meson.build
+++ b/examples/performance-thread/l3fwd-thread/meson.build
@@ -8,7 +8,7 @@
 
 build = dpdk_conf.has('RTE_ARCH_X86_64')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['timer', 'lpm']
@@ -16,17 +16,17 @@ allow_experimental_apis = true
 
 # get the performance thread (pt) architecture subdir
 if dpdk_conf.has('RTE_ARCH_ARM64')
-	pt_arch_dir = '../common/arch/arm64'
+    pt_arch_dir = '../common/arch/arm64'
 else
-	pt_arch_dir = '../common/arch/x86'
+    pt_arch_dir = '../common/arch/x86'
 endif
 sources += files('main.c',
-	'../common/lthread.c',
-	'../common/lthread_cond.c',
-	'../common/lthread_diag.c',
-	'../common/lthread_mutex.c',
-	'../common/lthread_sched.c',
-	'../common/lthread_tls.c',
-	pt_arch_dir + '/ctx.c')
+    '../common/lthread.c',
+    '../common/lthread_cond.c',
+    '../common/lthread_diag.c',
+    '../common/lthread_mutex.c',
+    '../common/lthread_sched.c',
+    '../common/lthread_tls.c',
+    pt_arch_dir + '/ctx.c')
 
 includes += include_directories('../common', pt_arch_dir)
diff --git a/examples/performance-thread/pthread_shim/meson.build b/examples/performance-thread/pthread_shim/meson.build
index d499799307..866e6c94e8 100644
--- a/examples/performance-thread/pthread_shim/meson.build
+++ b/examples/performance-thread/pthread_shim/meson.build
@@ -8,7 +8,7 @@
 
 build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['timer']
@@ -16,18 +16,18 @@ allow_experimental_apis = true
 
 # get the performance thread (pt) architecture subdir
 if dpdk_conf.has('RTE_ARCH_ARM64')
-	pt_arch_dir = '../common/arch/arm64'
+    pt_arch_dir = '../common/arch/arm64'
 else
-	pt_arch_dir = '../common/arch/x86'
+    pt_arch_dir = '../common/arch/x86'
 endif
 sources += files('main.c',
-	'pthread_shim.c',
-	'../common/lthread.c',
-	'../common/lthread_cond.c',
-	'../common/lthread_diag.c',
-	'../common/lthread_mutex.c',
-	'../common/lthread_sched.c',
-	'../common/lthread_tls.c',
-	pt_arch_dir + '/ctx.c')
+    'pthread_shim.c',
+    '../common/lthread.c',
+    '../common/lthread_cond.c',
+    '../common/lthread_diag.c',
+    '../common/lthread_mutex.c',
+    '../common/lthread_sched.c',
+    '../common/lthread_tls.c',
+    pt_arch_dir + '/ctx.c')
 
 includes += include_directories('../common', pt_arch_dir)
diff --git a/examples/pipeline/meson.build b/examples/pipeline/meson.build
index 4f5925d7cf..50103f2e01 100644
--- a/examples/pipeline/meson.build
+++ b/examples/pipeline/meson.build
@@ -8,15 +8,15 @@
 
 build = cc.has_header('sys/epoll.h')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 deps += ['pipeline', 'bus_pci']
 allow_experimental_apis = true
 sources = files(
-	'cli.c',
-	'conn.c',
-	'main.c',
-	'obj.c',
-	'thread.c',
+        'cli.c',
+        'conn.c',
+        'main.c',
+        'obj.c',
+        'thread.c',
 )
diff --git a/examples/ptpclient/meson.build b/examples/ptpclient/meson.build
index d4171a2183..47d091ea21 100644
--- a/examples/ptpclient/meson.build
+++ b/examples/ptpclient/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'ptpclient.c'
+        'ptpclient.c',
 )
diff --git a/examples/qos_meter/meson.build b/examples/qos_meter/meson.build
index 2f9ab13afd..573d4978c6 100644
--- a/examples/qos_meter/meson.build
+++ b/examples/qos_meter/meson.build
@@ -9,5 +9,6 @@
 allow_experimental_apis = true
 deps += 'meter'
 sources = files(
-	'main.c', 'rte_policer.c'
+        'main.c',
+        'rte_policer.c',
 )
diff --git a/examples/qos_sched/meson.build b/examples/qos_sched/meson.build
index ba59d3c9e5..dc103e9556 100644
--- a/examples/qos_sched/meson.build
+++ b/examples/qos_sched/meson.build
@@ -9,6 +9,11 @@
 allow_experimental_apis = true
 deps += ['sched', 'cfgfile']
 sources = files(
-	'app_thread.c', 'args.c', 'cfg_file.c', 'cmdline.c',
-	'init.c', 'main.c', 'stats.c'
+        'app_thread.c',
+        'args.c',
+        'cfg_file.c',
+        'cmdline.c',
+        'init.c',
+        'main.c',
+        'stats.c',
 )
diff --git a/examples/rxtx_callbacks/meson.build b/examples/rxtx_callbacks/meson.build
index a7bf12dd3a..5e860708fc 100644
--- a/examples/rxtx_callbacks/meson.build
+++ b/examples/rxtx_callbacks/meson.build
@@ -10,5 +10,5 @@
 allow_experimental_apis = true
 
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/service_cores/meson.build b/examples/service_cores/meson.build
index 2b0a250361..441678bbe5 100644
--- a/examples/service_cores/meson.build
+++ b/examples/service_cores/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/skeleton/meson.build b/examples/skeleton/meson.build
index ef46b187e7..f56a4104b5 100644
--- a/examples/skeleton/meson.build
+++ b/examples/skeleton/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'basicfwd.c'
+        'basicfwd.c',
 )
diff --git a/examples/timer/meson.build b/examples/timer/meson.build
index 87c21a8679..c140f74e12 100644
--- a/examples/timer/meson.build
+++ b/examples/timer/meson.build
@@ -9,5 +9,5 @@
 allow_experimental_apis = true
 deps += 'timer'
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/vdpa/meson.build b/examples/vdpa/meson.build
index 26f6089c92..bd086050dc 100644
--- a/examples/vdpa/meson.build
+++ b/examples/vdpa/meson.build
@@ -7,12 +7,12 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/vhost/meson.build b/examples/vhost/meson.build
index 9d9947c585..3efd5e6540 100644
--- a/examples/vhost/meson.build
+++ b/examples/vhost/meson.build
@@ -7,17 +7,18 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'main.c', 'virtio_net.c'
+        'main.c',
+        'virtio_net.c',
 )
 
 if dpdk_conf.has('RTE_RAW_IOAT')
-	deps += 'raw_ioat'
-	sources += files('ioat.c')
+    deps += 'raw_ioat'
+    sources += files('ioat.c')
 endif
diff --git a/examples/vhost_blk/meson.build b/examples/vhost_blk/meson.build
index 354ba05848..9314f47e55 100644
--- a/examples/vhost_blk/meson.build
+++ b/examples/vhost_blk/meson.build
@@ -7,17 +7,19 @@
 # DPDK instance, use 'make'
 
 if not is_linux
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 if not cc.has_header('linux/virtio_blk.h')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += 'vhost'
 allow_experimental_apis = true
 sources = files(
-	'blk.c', 'vhost_blk.c', 'vhost_blk_compat.c'
+        'blk.c',
+        'vhost_blk.c',
+        'vhost_blk_compat.c',
 )
diff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build
index 403f210983..720f42dd70 100644
--- a/examples/vhost_crypto/meson.build
+++ b/examples/vhost_crypto/meson.build
@@ -8,11 +8,11 @@
 
 build = dpdk_conf.has('RTE_LIB_VHOST')
 if not build
-	subdir_done()
+    subdir_done()
 endif
 
 allow_experimental_apis = true
 deps += ['vhost', 'cryptodev']
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
index cd95266018..666eef94ae 100644
--- a/examples/vm_power_manager/guest_cli/meson.build
+++ b/examples/vm_power_manager/guest_cli/meson.build
@@ -14,7 +14,9 @@ endif
 deps += ['power']
 
 sources = files(
-	'main.c', 'parse.c', 'vm_power_cli_guest.c'
+        'main.c',
+        'parse.c',
+        'vm_power_cli_guest.c',
 )
 
 allow_experimental_apis = true
diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index 637bd23235..c15bad6609 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -7,34 +7,39 @@
 # DPDK instance, use 'make'
 
 if not dpdk_conf.has('RTE_LIB_POWER')
-	build = false
-	subdir_done()
+    build = false
+    subdir_done()
 endif
 
 deps += ['power']
 
 if dpdk_conf.has('RTE_NET_BNXT')
-	deps += ['net_bnxt']
+    deps += ['net_bnxt']
 endif
 
 if dpdk_conf.has('RTE_NET_I40E')
-	deps += ['net_i40e']
+    deps += ['net_i40e']
 endif
 
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += ['net_ixgbe']
+    deps += ['net_ixgbe']
 endif
 
 allow_experimental_apis = true
 sources = files(
-	'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
+        'channel_manager.c',
+        'channel_monitor.c',
+        'main.c',
+        'parse.c',
+        'power_manager.c',
+        'vm_power_cli.c',
 )
 
 # If we're on X86, pull in the x86 code for the branch monitor algo.
 if dpdk_conf.has('RTE_ARCH_X86_64')
-	sources += files('oob_monitor_x86.c')
+    sources += files('oob_monitor_x86.c')
 else
-	sources += files('oob_monitor_nop.c')
+    sources += files('oob_monitor_nop.c')
 endif
 
 opt_dep = cc.find_library('virt', required : false)
@@ -43,6 +48,6 @@ ext_deps += opt_dep
 
 opt_dep = dependency('jansson', required : false, method: 'pkg-config')
 if opt_dep.found()
-	ext_deps += opt_dep
-	cflags += '-DUSE_JANSSON'
+    ext_deps += opt_dep
+    cflags += '-DUSE_JANSSON'
 endif
diff --git a/examples/vmdq/meson.build b/examples/vmdq/meson.build
index 2b0a250361..441678bbe5 100644
--- a/examples/vmdq/meson.build
+++ b/examples/vmdq/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
diff --git a/examples/vmdq_dcb/meson.build b/examples/vmdq_dcb/meson.build
index 2b0a250361..441678bbe5 100644
--- a/examples/vmdq_dcb/meson.build
+++ b/examples/vmdq_dcb/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-	'main.c'
+        'main.c',
 )
-- 
2.27.0

[dpdk-dev] [PATCH v2 11/16] app: change meson file tabs to spaces

[Bruce Richardson]

Switch from using tabs to 4 spaces for meson.build indentation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/test-bbdev/meson.build         |  16 +-
 app/test-compress-perf/meson.build |  14 +-
 app/test-crypto-perf/meson.build   |  24 +-
 app/test-eventdev/meson.build      |  28 +-
 app/test-flow-perf/meson.build     |   8 +-
 app/test-pipeline/meson.build      |  19 +-
 app/test-pmd/meson.build           |  64 ++--
 app/test/meson.build               | 530 +++++++++++++++--------------
 8 files changed, 358 insertions(+), 345 deletions(-)

diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 6d50e03396..57335641f0 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -1,17 +1,19 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-sources = files('main.c',
-		'test_bbdev.c',
-		'test_bbdev_perf.c',
-		'test_bbdev_vector.c')
+sources = files(
+        'main.c',
+        'test_bbdev.c',
+        'test_bbdev_perf.c',
+        'test_bbdev_vector.c',
+)
 deps += ['bbdev', 'bus_vdev']
 if dpdk_conf.has('RTE_BASEBAND_FPGA_LTE_FEC')
-	deps += ['baseband_fpga_lte_fec']
+    deps += ['baseband_fpga_lte_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_FPGA_5GNR_FEC')
-	deps += ['baseband_fpga_5gnr_fec']
+    deps += ['baseband_fpga_5gnr_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_ACC100')
-	deps += ['baseband_acc100']
+    deps += ['baseband_acc100']
 endif
diff --git a/app/test-compress-perf/meson.build b/app/test-compress-perf/meson.build
index a1a484da9a..3f79e2da9d 100644
--- a/app/test-compress-perf/meson.build
+++ b/app/test-compress-perf/meson.build
@@ -1,10 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-sources = files('comp_perf_options_parse.c',
-		'main.c',
-		'comp_perf_test_verify.c',
-		'comp_perf_test_throughput.c',
-		'comp_perf_test_cyclecount.c',
-		'comp_perf_test_common.c')
+sources = files(
+        'comp_perf_options_parse.c',
+        'comp_perf_test_common.c',
+        'comp_perf_test_cyclecount.c',
+        'comp_perf_test_throughput.c',
+        'comp_perf_test_verify.c',
+        'main.c',
+)
 deps = ['compressdev']
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 558c648788..20444b7912 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -1,17 +1,19 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-sources = files('cperf_ops.c',
-		'cperf_options_parsing.c',
-		'cperf_test_common.c',
-		'cperf_test_latency.c',
-		'cperf_test_pmd_cyclecount.c',
-		'cperf_test_throughput.c',
-		'cperf_test_vector_parsing.c',
-		'cperf_test_vectors.c',
-		'cperf_test_verify.c',
-		'main.c')
+sources = files(
+        'cperf_ops.c',
+        'cperf_options_parsing.c',
+        'cperf_test_common.c',
+        'cperf_test_latency.c',
+        'cperf_test_pmd_cyclecount.c',
+        'cperf_test_throughput.c',
+        'cperf_test_vector_parsing.c',
+        'cperf_test_vectors.c',
+        'cperf_test_verify.c',
+        'main.c',
+)
 deps += ['cryptodev', 'net', 'security']
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index 9e588d9ec7..04117dbe4f 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -1,17 +1,19 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc
 
-sources = files('evt_main.c',
-		'evt_options.c',
-		'evt_test.c',
-		'parser.c',
-		'test_order_common.c',
-		'test_order_atq.c',
-		'test_order_queue.c',
-		'test_perf_common.c',
-		'test_perf_atq.c',
-		'test_perf_queue.c',
-		'test_pipeline_common.c',
-		'test_pipeline_atq.c',
-		'test_pipeline_queue.c')
+sources = files(
+        'evt_main.c',
+        'evt_options.c',
+        'evt_test.c',
+        'parser.c',
+        'test_order_atq.c',
+        'test_order_common.c',
+        'test_order_queue.c',
+        'test_perf_atq.c',
+        'test_perf_common.c',
+        'test_perf_queue.c',
+        'test_pipeline_atq.c',
+        'test_pipeline_common.c',
+        'test_pipeline_queue.c'
+)
 deps += 'eventdev'
diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build
index 6eaf83b41a..1d860e036a 100644
--- a/app/test-flow-perf/meson.build
+++ b/app/test-flow-perf/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2020 Mellanox Technologies, Ltd
 
 sources = files(
-	'actions_gen.c',
-	'flow_gen.c',
-	'items_gen.c',
-	'main.c',
+        'actions_gen.c',
+        'flow_gen.c',
+        'items_gen.c',
+        'main.c',
 )
 
 deps += ['ethdev']
diff --git a/app/test-pipeline/meson.build b/app/test-pipeline/meson.build
index d5eddaba99..fd91f83231 100644
--- a/app/test-pipeline/meson.build
+++ b/app/test-pipeline/meson.build
@@ -2,13 +2,14 @@
 # Copyright(c) 2019 Intel Corporation
 
 sources = files(
-	'config.c',
-	'init.c',
-	'main.c',
-	'pipeline_acl.c',
-	'pipeline_hash.c',
-	'pipeline_lpm.c',
-	'pipeline_lpm_ipv6.c',
-	'pipeline_stub.c',
-	'runtime.c')
+        'config.c',
+        'init.c',
+        'main.c',
+        'pipeline_acl.c',
+        'pipeline_hash.c',
+        'pipeline_lpm.c',
+        'pipeline_lpm_ipv6.c',
+        'pipeline_stub.c',
+        'runtime.c',
+)
 deps += ['pipeline', 'pci']
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 7e9c7bdd69..98f3289bdf 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -4,58 +4,60 @@
 # override default name to drop the hyphen
 name = 'testpmd'
 cflags += '-Wno-deprecated-declarations'
-sources = files('5tswap.c',
-	'cmdline.c',
-	'cmdline_flow.c',
-	'cmdline_mtr.c',
-	'cmdline_tm.c',
-	'config.c',
-	'csumonly.c',
-	'flowgen.c',
-	'icmpecho.c',
-	'ieee1588fwd.c',
-	'iofwd.c',
-	'macfwd.c',
-	'macswap.c',
-	'noisy_vnf.c',
-	'parameters.c',
-	'rxonly.c',
-	'testpmd.c',
-	'txonly.c',
-	'util.c')
+sources = files(
+        '5tswap.c',
+        'cmdline.c',
+        'cmdline_flow.c',
+        'cmdline_mtr.c',
+        'cmdline_tm.c',
+        'config.c',
+        'csumonly.c',
+        'flowgen.c',
+        'icmpecho.c',
+        'ieee1588fwd.c',
+        'iofwd.c',
+        'macfwd.c',
+        'macswap.c',
+        'noisy_vnf.c',
+        'parameters.c',
+        'rxonly.c',
+        'testpmd.c',
+        'txonly.c',
+        'util.c',
+)
 
 deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-	deps += 'bitratestats'
+    deps += 'bitratestats'
 endif
 if dpdk_conf.has('RTE_LIB_PDUMP')
-	deps += 'pdump'
+    deps += 'pdump'
 endif
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-	deps += 'bitratestats'
+    deps += 'bitratestats'
 endif
 if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
-	deps += 'latencystats'
+    deps += 'latencystats'
 endif
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+    deps += 'crypto_scheduler'
 endif
 if dpdk_conf.has('RTE_NET_BOND')
-	deps += 'net_bond'
+    deps += 'net_bond'
 endif
 if dpdk_conf.has('RTE_NET_BNXT')
-	deps += 'net_bnxt'
+    deps += 'net_bnxt'
 endif
 if dpdk_conf.has('RTE_NET_I40E')
-	deps += 'net_i40e'
+    deps += 'net_i40e'
 endif
 if dpdk_conf.has('RTE_NET_IXGBE')
-	deps += 'net_ixgbe'
+    deps += 'net_ixgbe'
 endif
 if dpdk_conf.has('RTE_NET_DPAA')
-	deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
+    deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
 endif
 if dpdk_conf.has('RTE_LIB_BPF')
-	sources += files('bpf_cmd.c')
-	deps += 'bpf'
+    sources += files('bpf_cmd.c')
+    deps += 'bpf'
 endif
diff --git a/app/test/meson.build b/app/test/meson.build
index bd50818f82..08c82d3d23 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -2,181 +2,183 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not get_option('tests')
-	subdir_done()
+    subdir_done()
 endif
 
-test_sources = files('commands.c',
-	'packet_burst_generator.c',
-	'test.c',
-	'test_acl.c',
-	'test_alarm.c',
-	'test_atomic.c',
-	'test_barrier.c',
-	'test_bitops.c',
-	'test_bitmap.c',
-	'test_bpf.c',
-	'test_byteorder.c',
-	'test_cmdline.c',
-	'test_cmdline_cirbuf.c',
-	'test_cmdline_etheraddr.c',
-	'test_cmdline_ipaddr.c',
-	'test_cmdline_lib.c',
-	'test_cmdline_num.c',
-	'test_cmdline_portlist.c',
-	'test_cmdline_string.c',
-	'test_common.c',
-	'test_cpuflags.c',
-	'test_crc.c',
-	'test_cryptodev.c',
-	'test_cryptodev_asym.c',
-	'test_cryptodev_blockcipher.c',
-	'test_cryptodev_security_pdcp.c',
-	'test_cycles.c',
-	'test_debug.c',
-	'test_distributor.c',
-	'test_distributor_perf.c',
-	'test_eal_flags.c',
-	'test_eal_fs.c',
-	'test_efd.c',
-	'test_efd_perf.c',
-	'test_errno.c',
-	'test_ethdev_link.c',
-	'test_event_crypto_adapter.c',
-	'test_event_eth_rx_adapter.c',
-	'test_event_ring.c',
-	'test_event_timer_adapter.c',
-	'test_eventdev.c',
-	'test_external_mem.c',
-	'test_fbarray.c',
-	'test_fib.c',
-	'test_fib_perf.c',
-	'test_fib6.c',
-	'test_fib6_perf.c',
-	'test_func_reentrancy.c',
-	'test_flow_classify.c',
-	'test_graph.c',
-	'test_graph_perf.c',
-	'test_hash.c',
-	'test_hash_functions.c',
-	'test_hash_multiwriter.c',
-	'test_hash_readwrite.c',
-	'test_hash_perf.c',
-	'test_hash_readwrite_lf_perf.c',
-	'test_interrupts.c',
+test_sources = files(
+        'commands.c',
+        'packet_burst_generator.c',
+        'test.c',
+        'test_acl.c',
+        'test_alarm.c',
+        'test_atomic.c',
+        'test_barrier.c',
+        'test_bitops.c',
+        'test_bitmap.c',
+        'test_bpf.c',
+        'test_byteorder.c',
+        'test_cmdline.c',
+        'test_cmdline_cirbuf.c',
+        'test_cmdline_etheraddr.c',
+        'test_cmdline_ipaddr.c',
+        'test_cmdline_lib.c',
+        'test_cmdline_num.c',
+        'test_cmdline_portlist.c',
+        'test_cmdline_string.c',
+        'test_common.c',
+        'test_cpuflags.c',
+        'test_crc.c',
+        'test_cryptodev.c',
+        'test_cryptodev_asym.c',
+        'test_cryptodev_blockcipher.c',
+        'test_cryptodev_security_pdcp.c',
+        'test_cycles.c',
+        'test_debug.c',
+        'test_distributor.c',
+        'test_distributor_perf.c',
+        'test_eal_flags.c',
+        'test_eal_fs.c',
+        'test_efd.c',
+        'test_efd_perf.c',
+        'test_errno.c',
+        'test_ethdev_link.c',
+        'test_event_crypto_adapter.c',
+        'test_event_eth_rx_adapter.c',
+        'test_event_ring.c',
+        'test_event_timer_adapter.c',
+        'test_eventdev.c',
+        'test_external_mem.c',
+        'test_fbarray.c',
+        'test_fib.c',
+        'test_fib_perf.c',
+        'test_fib6.c',
+        'test_fib6_perf.c',
+        'test_func_reentrancy.c',
+        'test_flow_classify.c',
+        'test_graph.c',
+        'test_graph_perf.c',
+        'test_hash.c',
+        'test_hash_functions.c',
+        'test_hash_multiwriter.c',
+        'test_hash_readwrite.c',
+        'test_hash_perf.c',
+        'test_hash_readwrite_lf_perf.c',
+        'test_interrupts.c',
         'test_ipfrag.c',
-	'test_ipsec.c',
-	'test_ipsec_sad.c',
-	'test_ipsec_perf.c',
-	'test_kni.c',
-	'test_kvargs.c',
-	'test_lcores.c',
-	'test_logs.c',
-	'test_lpm.c',
-	'test_lpm6.c',
-	'test_lpm6_perf.c',
-	'test_lpm_perf.c',
-	'test_malloc.c',
-	'test_mbuf.c',
-	'test_member.c',
-	'test_member_perf.c',
-	'test_memcpy.c',
-	'test_memcpy_perf.c',
-	'test_memory.c',
-	'test_mempool.c',
-	'test_mempool_perf.c',
-	'test_memzone.c',
-	'test_meter.c',
-	'test_metrics.c',
-	'test_mcslock.c',
-	'test_mp_secondary.c',
-	'test_per_lcore.c',
-	'test_pflock.c',
-	'test_pmd_perf.c',
-	'test_power.c',
-	'test_power_cpufreq.c',
-	'test_power_kvm_vm.c',
-	'test_prefetch.c',
-	'test_rand_perf.c',
-	'test_rawdev.c',
-	'test_rcu_qsbr.c',
-	'test_rcu_qsbr_perf.c',
-	'test_reciprocal_division.c',
-	'test_reciprocal_division_perf.c',
-	'test_red.c',
-	'test_reorder.c',
-	'test_rib.c',
-	'test_rib6.c',
-	'test_ring.c',
-	'test_ring_mpmc_stress.c',
-	'test_ring_hts_stress.c',
-	'test_ring_mt_peek_stress.c',
-	'test_ring_mt_peek_stress_zc.c',
-	'test_ring_perf.c',
-	'test_ring_rts_stress.c',
-	'test_ring_st_peek_stress.c',
-	'test_ring_st_peek_stress_zc.c',
-	'test_ring_stress.c',
-	'test_rwlock.c',
-	'test_sched.c',
-	'test_security.c',
-	'test_service_cores.c',
-	'test_spinlock.c',
-	'test_stack.c',
-	'test_stack_perf.c',
-	'test_string_fns.c',
-	'test_table.c',
-	'test_table_acl.c',
-	'test_table_combined.c',
-	'test_table_pipeline.c',
-	'test_table_ports.c',
-	'test_table_tables.c',
-	'test_tailq.c',
-	'test_thash.c',
-	'test_timer.c',
-	'test_timer_perf.c',
-	'test_timer_racecond.c',
-	'test_timer_secondary.c',
-	'test_ticketlock.c',
-	'test_trace.c',
-	'test_trace_register.c',
-	'test_trace_perf.c',
-	'test_version.c',
-	'virtual_pmd.c'
+        'test_ipsec.c',
+        'test_ipsec_sad.c',
+        'test_ipsec_perf.c',
+        'test_kni.c',
+        'test_kvargs.c',
+        'test_lcores.c',
+        'test_logs.c',
+        'test_lpm.c',
+        'test_lpm6.c',
+        'test_lpm6_perf.c',
+        'test_lpm_perf.c',
+        'test_malloc.c',
+        'test_mbuf.c',
+        'test_member.c',
+        'test_member_perf.c',
+        'test_memcpy.c',
+        'test_memcpy_perf.c',
+        'test_memory.c',
+        'test_mempool.c',
+        'test_mempool_perf.c',
+        'test_memzone.c',
+        'test_meter.c',
+        'test_metrics.c',
+        'test_mcslock.c',
+        'test_mp_secondary.c',
+        'test_per_lcore.c',
+        'test_pflock.c',
+        'test_pmd_perf.c',
+        'test_power.c',
+        'test_power_cpufreq.c',
+        'test_power_kvm_vm.c',
+        'test_prefetch.c',
+        'test_rand_perf.c',
+        'test_rawdev.c',
+        'test_rcu_qsbr.c',
+        'test_rcu_qsbr_perf.c',
+        'test_reciprocal_division.c',
+        'test_reciprocal_division_perf.c',
+        'test_red.c',
+        'test_reorder.c',
+        'test_rib.c',
+        'test_rib6.c',
+        'test_ring.c',
+        'test_ring_mpmc_stress.c',
+        'test_ring_hts_stress.c',
+        'test_ring_mt_peek_stress.c',
+        'test_ring_mt_peek_stress_zc.c',
+        'test_ring_perf.c',
+        'test_ring_rts_stress.c',
+        'test_ring_st_peek_stress.c',
+        'test_ring_st_peek_stress_zc.c',
+        'test_ring_stress.c',
+        'test_rwlock.c',
+        'test_sched.c',
+        'test_security.c',
+        'test_service_cores.c',
+        'test_spinlock.c',
+        'test_stack.c',
+        'test_stack_perf.c',
+        'test_string_fns.c',
+        'test_table.c',
+        'test_table_acl.c',
+        'test_table_combined.c',
+        'test_table_pipeline.c',
+        'test_table_ports.c',
+        'test_table_tables.c',
+        'test_tailq.c',
+        'test_thash.c',
+        'test_timer.c',
+        'test_timer_perf.c',
+        'test_timer_racecond.c',
+        'test_timer_secondary.c',
+        'test_ticketlock.c',
+        'test_trace.c',
+        'test_trace_register.c',
+        'test_trace_perf.c',
+        'test_version.c',
+        'virtual_pmd.c',
 )
 
-test_deps = ['acl',
-	'bus_pci',
-	'bus_vdev',
-	'bitratestats',
-	'bpf',
-	'cfgfile',
-	'cmdline',
-	'cryptodev',
-	'distributor',
-	'efd',
-	'ethdev',
-	'eventdev',
-	'fib',
-	'flow_classify',
-	'graph',
-	'hash',
-	'ipsec',
-	'latencystats',
-	'lpm',
-	'member',
-	'metrics',
-	'node',
-	'pipeline',
-	'port',
-	'rawdev',
-	'rcu',
-	'reorder',
-	'rib',
-	'ring',
-	'security',
-	'stack',
-	'telemetry',
-	'timer'
+test_deps = [
+        'acl',
+        'bus_pci',
+        'bus_vdev',
+        'bitratestats',
+        'bpf',
+        'cfgfile',
+        'cmdline',
+        'cryptodev',
+        'distributor',
+        'efd',
+        'ethdev',
+        'eventdev',
+        'fib',
+        'flow_classify',
+        'graph',
+        'hash',
+        'ipsec',
+        'latencystats',
+        'lpm',
+        'member',
+        'metrics',
+        'node',
+        'pipeline',
+        'port',
+        'rawdev',
+        'rcu',
+        'reorder',
+        'rib',
+        'ring',
+        'security',
+        'stack',
+        'telemetry',
+        'timer',
 ]
 
 # Each test is marked with flag true/false
@@ -241,7 +243,7 @@ fast_tests = [
         ['rwlock_rds_wrm_autotest', true],
         ['rwlock_rde_wro_autotest', true],
         ['sched_autotest', true],
-		['security_autotest', false],
+        ['security_autotest', false],
         ['spinlock_autotest', true],
         ['stack_autotest', false],
         ['stack_lf_autotest', false],
@@ -306,7 +308,7 @@ perf_test_names = [
         'hash_readwrite_perf_autotest',
         'hash_readwrite_lf_perf_autotest',
         'trace_perf_autotest',
-	'ipsec_perf_autotest',
+        'ipsec_perf_autotest',
 ]
 
 driver_test_names = [
@@ -345,55 +347,55 @@ dump_test_names = [
 # DPDK libraries.  Explicit linkage of drivers (plugin libraries)
 # in applications should not be used.
 if dpdk_conf.has('RTE_MEMPOOL_RING')
-	test_deps += 'mempool_ring'
+    test_deps += 'mempool_ring'
 endif
 if dpdk_conf.has('RTE_MEMPOOL_STACK')
-	test_deps += 'mempool_stack'
+    test_deps += 'mempool_stack'
 endif
 if dpdk_conf.has('RTE_EVENT_SKELETON')
-	test_deps += 'event_skeleton'
+    test_deps += 'event_skeleton'
 endif
 if dpdk_conf.has('RTE_LIB_TELEMETRY')
-	test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
-	fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]]
+    test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
+    fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]]
 endif
 
 # The following linkages of drivers are required because
 # they are used via a driver-specific API.
 if dpdk_conf.has('RTE_NET_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_NET_RING')
-		test_sources += 'test_link_bonding_mode4.c'
-		driver_test_names += 'link_bonding_mode4_autotest'
-	endif
+    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_NET_RING')
+        test_sources += 'test_link_bonding_mode4.c'
+        driver_test_names += 'link_bonding_mode4_autotest'
+    endif
 endif
 if dpdk_conf.has('RTE_NET_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'
-	test_sources += 'test_bitratestats.c'
-	test_sources += 'test_latencystats.c'
-	test_sources += 'sample_packet_forward.c'
-	test_sources += 'test_pdump.c'
-	fast_tests += [['ring_pmd_autotest', true]]
-	perf_test_names += 'ring_pmd_perf_autotest'
-	fast_tests += [['event_eth_tx_adapter_autotest', false]]
-	fast_tests += [['bitratestats_autotest', true]]
-	fast_tests += [['latencystats_autotest', true]]
-	fast_tests += [['pdump_autotest', true]]
+    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'
+    test_sources += 'test_bitratestats.c'
+    test_sources += 'test_latencystats.c'
+    test_sources += 'sample_packet_forward.c'
+    test_sources += 'test_pdump.c'
+    fast_tests += [['ring_pmd_autotest', true]]
+    perf_test_names += 'ring_pmd_perf_autotest'
+    fast_tests += [['event_eth_tx_adapter_autotest', false]]
+    fast_tests += [['bitratestats_autotest', true]]
+    fast_tests += [['latencystats_autotest', true]]
+    fast_tests += [['pdump_autotest', true]]
 endif
 
 if dpdk_conf.has('RTE_LIB_POWER')
-	test_deps += 'power'
+    test_deps += 'power'
 endif
 if dpdk_conf.has('RTE_LIB_KNI')
-	test_deps += 'kni'
+    test_deps += 'kni'
 endif
 if dpdk_conf.has('RTE_LIB_PDUMP')
-	test_deps += 'pdump'
+    test_deps += 'pdump'
 endif
 
 if cc.has_argument('-Wno-format-truncation')
@@ -408,38 +410,38 @@ cflags += ['-DALLOW_INTERNAL_API']
 
 test_dep_objs = []
 if dpdk_conf.has('RTE_LIB_COMPRESSDEV')
-	compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
-	if compress_test_dep.found()
-		test_dep_objs += compress_test_dep
-		test_sources += 'test_compressdev.c'
-		test_deps += 'compressdev'
-		fast_tests += [['compressdev_autotest', false]]
-	endif
+    compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
+    if compress_test_dep.found()
+        test_dep_objs += compress_test_dep
+        test_sources += 'test_compressdev.c'
+        test_deps += 'compressdev'
+        fast_tests += [['compressdev_autotest', false]]
+    endif
 endif
 
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	driver_test_names += 'cryptodev_scheduler_autotest'
-	test_deps += 'crypto_scheduler'
+    driver_test_names += 'cryptodev_scheduler_autotest'
+    test_deps += 'crypto_scheduler'
 endif
 
 foreach d:test_deps
-	def_lib = get_option('default_library')
-	test_dep_objs += get_variable(def_lib + '_rte_' + d)
+    def_lib = get_option('default_library')
+    test_dep_objs += get_variable(def_lib + '_rte_' + d)
 endforeach
 
 link_libs = []
 if get_option('default_library') == 'static'
-	link_libs = dpdk_static_libraries + dpdk_drivers
+    link_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 dpdk_test = executable('dpdk-test',
-	test_sources,
-	link_whole: link_libs,
-	dependencies: test_dep_objs,
-	c_args: cflags,
-	install_rpath: join_paths(get_option('prefix'),
-			 driver_install_path),
-	install: true)
+        test_sources,
+        link_whole: link_libs,
+        dependencies: test_dep_objs,
+        c_args: cflags,
+        install_rpath: join_paths(get_option('prefix'),
+             driver_install_path),
+        install: true)
 
 has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
 message('hugepage availability: @0@'.format(has_hugepage))
@@ -455,59 +457,59 @@ num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip()
 default_test_args = [num_cores_arg]
 
 foreach arg : fast_tests
-	test_args = default_test_args
-	run_test = true
-	if not has_hugepage
-		if arg[1]
-			test_args += ['--no-huge', '-m', '2048']
-		else
-			run_test = false
-		endif
-	endif
+    test_args = default_test_args
+    run_test = true
+    if not has_hugepage
+        if arg[1]
+            test_args += ['--no-huge', '-m', '2048']
+        else
+            run_test = false
+        endif
+    endif
 
-	if (get_option('default_library') == 'shared' and
-		arg[0] == 'event_eth_tx_adapter_autotest')
-		foreach drv:dpdk_drivers
-			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
-		endforeach
-	endif
-	if is_linux
-		test_args += ['--file-prefix=@0@'.format(arg[0])]
-	endif
+    if (get_option('default_library') == 'shared' and
+        arg[0] == 'event_eth_tx_adapter_autotest')
+        foreach drv:dpdk_drivers
+            test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
+        endforeach
+    endif
+    if is_linux
+        test_args += ['--file-prefix=@0@'.format(arg[0])]
+    endif
 
-	if run_test
-		test(arg[0], dpdk_test,
-			env : ['DPDK_TEST=' + arg[0]],
-			args : test_args,
-			timeout : timeout_seconds_fast,
-			is_parallel : false,
-			suite : 'fast-tests')
-	endif
+    if run_test
+        test(arg[0], dpdk_test,
+                env : ['DPDK_TEST=' + arg[0]],
+                args : test_args,
+                timeout : timeout_seconds_fast,
+                is_parallel : false,
+                suite : 'fast-tests')
+    endif
 endforeach
 
 foreach arg : perf_test_names
-	test(arg, dpdk_test,
-	env : ['DPDK_TEST=' + arg],
-	args : default_test_args,
-	timeout : timeout_seconds,
-	is_parallel : false,
-	suite : 'perf-tests')
+    test(arg, dpdk_test,
+            env : ['DPDK_TEST=' + arg],
+            args : default_test_args,
+            timeout : timeout_seconds,
+            is_parallel : false,
+            suite : 'perf-tests')
 endforeach
 
 foreach arg : driver_test_names
-	test(arg, dpdk_test,
-		env : ['DPDK_TEST=' + arg],
-		args : default_test_args,
-		timeout : timeout_seconds,
-		is_parallel : false,
-		suite : 'driver-tests')
+    test(arg, dpdk_test,
+            env : ['DPDK_TEST=' + arg],
+            args : default_test_args,
+            timeout : timeout_seconds,
+            is_parallel : false,
+            suite : 'driver-tests')
 endforeach
 
 foreach arg : dump_test_names
-	test(arg, dpdk_test,
-		env : ['DPDK_TEST=' + arg],
-		args : default_test_args,
-		timeout : timeout_seconds,
-		is_parallel : false,
-		suite : 'debug-tests')
+    test(arg, dpdk_test,
+            env : ['DPDK_TEST=' + arg],
+            args : default_test_args,
+            timeout : timeout_seconds,
+            is_parallel : false,
+            suite : 'debug-tests')
 endforeach
-- 
2.27.0

[dpdk-dev] [PATCH v2 12/16] editorconfig: add entry for meson files

[Bruce Richardson]

Meson style guide recommends four-space indents, like for python, so add
to editorconfig file.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 .editorconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index d705825574..5101630c8c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,11 @@ max_line_length = 80
 indent_style = space
 indent_size = 4
 
+[meson.build]
+indent_style = space
+indent_size = 4
+tab_width = 4
+
 [*.rst]
 indent_style = space
 indent_size = 3
-- 
2.27.0

[dpdk-dev] [PATCH v2 13/16] doc: add meson coding style section to contributors guide

[Bruce Richardson]

To help with consistency across all files, add a section to the
contributors guide on meson coding style. Although short, this covers
the basics for now, and can be extended in future as we see the need.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 doc/guides/contributing/coding_style.rst | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index fdcd21861d..dae1bd3245 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -1012,3 +1012,49 @@ headers
 
 version
 	As above
+
+
+Meson Coding Style
+------------------
+
+The following guidelines apply to the build system code in meson.build files in DPDK.
+
+* Indentation should be using 4 spaces, no hard tabs.
+
+* Line continuations should be doubly-indented to ensure visible difference from normal indentation.
+  Any line continuations beyond the first may be singly indented to avoid large amounts of indentation.
+
+* Lists of files or components must be alphabetical unless doing so would cause errors.
+
+* Two formats are supported for lists of files or list of components:
+
+   * For a small number of list entries, generally 3 or fewer, all elements may be put on a single line.
+     In this case, the opening and closing braces of the list must be on the same line as the list items.
+     No trailing comma is put on the final list entry.
+   * For lists with more than 3 items,
+     it is recommended that the lists be put in the files with a *single* entry per line.
+     In this case, the opening brace, or ``files`` function call must be on a line on its own,
+     and the closing brace must similarly be on a line on its own at the end.
+     To help with readability of nested sublists, the closing brace should be dedented to appear
+     at the same level as the opening braced statement.
+     The final list entry must have a trailing comma,
+     so that adding a new entry to the list never modifies any other line in the list.
+
+Examples::
+
+    sources = files('file1.c', 'file2.c')
+
+    subdirs = ['dir1', 'dir2']
+
+    headers = files(
+            'header1.c',
+            'header2.c',
+            'header3.c',   # always include trailing comma
+    )                      # closing brace at indent level of opening brace
+
+    components = [
+            'comp1',
+            'comp2',
+            ...
+            'compN',
+    ]
-- 
2.27.0

[dpdk-dev] [PATCH v2 14/16] lib: remove librte_ prefix from directory names

[Bruce Richardson]

There is no reason for the DPDK libraries to all have 'librte_' prefix on
the directory names. This prefix makes the directory names longer and also
makes it awkward to add features referring to individual libraries in the
build - should the lib names be specified with or without the prefix.
Therefore, we can just remove the library prefix and use the library's
unique name as the directory name, i.e. 'eal' rather than 'librte_eal'

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 MAINTAINERS                                   | 210 +++++++++---------
 app/test/test_eal_fs.c                        |   2 +-
 app/test/test_memzone.c                       |   2 +-
 app/test/test_telemetry_json.c                |   2 +-
 config/arm/meson.build                        |   2 +-
 devtools/build-tags.sh                        |  14 +-
 doc/api/doxy-api.conf.in                      | 104 ++++-----
 doc/guides/contributing/abi_versioning.rst    |  12 +-
 doc/guides/contributing/coding_style.rst      |   4 +-
 doc/guides/contributing/documentation.rst     |  10 +-
 doc/guides/prog_guide/event_timer_adapter.rst |   2 +-
 doc/guides/prog_guide/qos_framework.rst       |   4 +-
 doc/guides/prog_guide/rawdev.rst              |   2 +-
 doc/guides/rel_notes/known_issues.rst         |   2 +-
 drivers/common/mlx5/linux/meson.build         |   2 +-
 drivers/crypto/virtio/meson.build             |   2 +-
 kernel/linux/kni/meson.build                  |   4 +-
 lib/{librte_acl => acl}/acl.h                 |   0
 lib/{librte_acl => acl}/acl_bld.c             |   0
 lib/{librte_acl => acl}/acl_gen.c             |   0
 lib/{librte_acl => acl}/acl_run.h             |   0
 lib/{librte_acl => acl}/acl_run_altivec.c     |   0
 lib/{librte_acl => acl}/acl_run_altivec.h     |   0
 lib/{librte_acl => acl}/acl_run_avx2.c        |   0
 lib/{librte_acl => acl}/acl_run_avx2.h        |   0
 lib/{librte_acl => acl}/acl_run_avx512.c      |   0
 .../acl_run_avx512_common.h                   |   0
 lib/{librte_acl => acl}/acl_run_avx512x16.h   |   0
 lib/{librte_acl => acl}/acl_run_avx512x8.h    |   0
 lib/{librte_acl => acl}/acl_run_neon.c        |   0
 lib/{librte_acl => acl}/acl_run_neon.h        |   0
 lib/{librte_acl => acl}/acl_run_scalar.c      |   0
 lib/{librte_acl => acl}/acl_run_sse.c         |   0
 lib/{librte_acl => acl}/acl_run_sse.h         |   0
 lib/{librte_acl => acl}/acl_vect.h            |   0
 lib/{librte_acl => acl}/meson.build           |   0
 lib/{librte_acl => acl}/rte_acl.c             |   0
 lib/{librte_acl => acl}/rte_acl.h             |   0
 lib/{librte_acl => acl}/rte_acl_osdep.h       |   0
 lib/{librte_acl => acl}/tb_mem.c              |   0
 lib/{librte_acl => acl}/tb_mem.h              |   0
 lib/{librte_acl => acl}/version.map           |   0
 lib/{librte_bbdev => bbdev}/meson.build       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.c       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev.h       |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_op.h    |   0
 lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h   |   0
 lib/{librte_bbdev => bbdev}/version.map       |   0
 .../meson.build                               |   0
 .../rte_bitrate.c                             |   0
 .../rte_bitrate.h                             |   0
 .../version.map                               |   0
 lib/{librte_bpf => bpf}/bpf.c                 |   0
 lib/{librte_bpf => bpf}/bpf_def.h             |   0
 lib/{librte_bpf => bpf}/bpf_exec.c            |   0
 lib/{librte_bpf => bpf}/bpf_impl.h            |   0
 lib/{librte_bpf => bpf}/bpf_jit_arm64.c       |   0
 lib/{librte_bpf => bpf}/bpf_jit_x86.c         |   0
 lib/{librte_bpf => bpf}/bpf_load.c            |   0
 lib/{librte_bpf => bpf}/bpf_load_elf.c        |   0
 lib/{librte_bpf => bpf}/bpf_pkt.c             |   0
 lib/{librte_bpf => bpf}/bpf_validate.c        |   0
 lib/{librte_bpf => bpf}/meson.build           |   0
 lib/{librte_bpf => bpf}/rte_bpf.h             |   0
 lib/{librte_bpf => bpf}/rte_bpf_ethdev.h      |   0
 lib/{librte_bpf => bpf}/version.map           |   0
 lib/{librte_cfgfile => cfgfile}/meson.build   |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c |   0
 lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h |   0
 lib/{librte_cfgfile => cfgfile}/version.map   |   0
 lib/{librte_cmdline => cmdline}/cmdline.c     |   0
 lib/{librte_cmdline => cmdline}/cmdline.h     |   0
 .../cmdline_cirbuf.c                          |   0
 .../cmdline_cirbuf.h                          |   0
 .../cmdline_os_unix.c                         |   0
 .../cmdline_os_windows.c                      |   0
 .../cmdline_parse.c                           |   0
 .../cmdline_parse.h                           |   0
 .../cmdline_parse_etheraddr.c                 |   0
 .../cmdline_parse_etheraddr.h                 |   0
 .../cmdline_parse_ipaddr.c                    |   0
 .../cmdline_parse_ipaddr.h                    |   0
 .../cmdline_parse_num.c                       |   0
 .../cmdline_parse_num.h                       |   0
 .../cmdline_parse_portlist.c                  |   0
 .../cmdline_parse_portlist.h                  |   0
 .../cmdline_parse_string.c                    |   0
 .../cmdline_parse_string.h                    |   0
 .../cmdline_private.h                         |   0
 .../cmdline_rdline.c                          |   0
 .../cmdline_rdline.h                          |   0
 .../cmdline_socket.c                          |   0
 .../cmdline_socket.h                          |   0
 .../cmdline_vt100.c                           |   0
 .../cmdline_vt100.h                           |   0
 lib/{librte_cmdline => cmdline}/meson.build   |   0
 lib/{librte_cmdline => cmdline}/version.map   |   0
 .../meson.build                               |   0
 .../rte_comp.c                                |   0
 .../rte_comp.h                                |   0
 .../rte_compressdev.c                         |   0
 .../rte_compressdev.h                         |   0
 .../rte_compressdev_internal.h                |   0
 .../rte_compressdev_pmd.c                     |   0
 .../rte_compressdev_pmd.h                     |   0
 .../version.map                               |   0
 .../cryptodev_trace_points.c                  |   0
 .../meson.build                               |   0
 .../rte_crypto.h                              |   0
 .../rte_crypto_asym.h                         |   0
 .../rte_crypto_sym.h                          |   0
 .../rte_cryptodev.c                           |   0
 .../rte_cryptodev.h                           |   0
 .../rte_cryptodev_pmd.c                       |   0
 .../rte_cryptodev_pmd.h                       |   0
 .../rte_cryptodev_trace.h                     |   0
 .../rte_cryptodev_trace_fp.h                  |   0
 .../version.map                               |   0
 .../distributor_private.h                     |   0
 .../meson.build                               |   0
 .../rte_distributor.c                         |   0
 .../rte_distributor.h                         |   0
 .../rte_distributor_match_generic.c           |   0
 .../rte_distributor_match_sse.c               |   0
 .../rte_distributor_single.c                  |   0
 .../rte_distributor_single.h                  |   0
 .../version.map                               |   0
 .../arm/include/meson.build                   |   0
 .../arm/include/rte_atomic.h                  |   0
 .../arm/include/rte_atomic_32.h               |   0
 .../arm/include/rte_atomic_64.h               |   0
 .../arm/include/rte_byteorder.h               |   0
 .../arm/include/rte_cpuflags.h                |   0
 .../arm/include/rte_cpuflags_32.h             |   0
 .../arm/include/rte_cpuflags_64.h             |   0
 .../arm/include/rte_cycles.h                  |   0
 .../arm/include/rte_cycles_32.h               |   0
 .../arm/include/rte_cycles_64.h               |   0
 lib/{librte_eal => eal}/arm/include/rte_io.h  |   0
 .../arm/include/rte_io_64.h                   |   0
 .../arm/include/rte_mcslock.h                 |   0
 .../arm/include/rte_memcpy.h                  |   0
 .../arm/include/rte_memcpy_32.h               |   0
 .../arm/include/rte_memcpy_64.h               |   0
 .../arm/include/rte_pause.h                   |   0
 .../arm/include/rte_pause_32.h                |   0
 .../arm/include/rte_pause_64.h                |   0
 .../arm/include/rte_pflock.h                  |   0
 .../arm/include/rte_power_intrinsics.h        |   0
 .../arm/include/rte_prefetch.h                |   0
 .../arm/include/rte_prefetch_32.h             |   0
 .../arm/include/rte_prefetch_64.h             |   0
 .../arm/include/rte_rwlock.h                  |   0
 .../arm/include/rte_spinlock.h                |   0
 .../arm/include/rte_ticketlock.h              |   0
 .../arm/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/arm/meson.build       |   0
 lib/{librte_eal => eal}/arm/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/arm/rte_cycles.c      |   0
 lib/{librte_eal => eal}/arm/rte_hypervisor.c  |   0
 .../arm/rte_power_intrinsics.c                |   0
 .../common/eal_common_bus.c                   |   0
 .../common/eal_common_class.c                 |   0
 .../common/eal_common_config.c                |   0
 .../common/eal_common_cpuflags.c              |   0
 .../common/eal_common_debug.c                 |   0
 .../common/eal_common_dev.c                   |   0
 .../common/eal_common_devargs.c               |   0
 .../common/eal_common_dynmem.c                |   0
 .../common/eal_common_errno.c                 |   0
 .../common/eal_common_fbarray.c               |   0
 .../common/eal_common_hexdump.c               |   0
 .../common/eal_common_hypervisor.c            |   0
 .../common/eal_common_launch.c                |   0
 .../common/eal_common_lcore.c                 |   0
 .../common/eal_common_log.c                   |   0
 .../common/eal_common_mcfg.c                  |   0
 .../common/eal_common_memalloc.c              |   0
 .../common/eal_common_memory.c                |   0
 .../common/eal_common_memzone.c               |   0
 .../common/eal_common_options.c               |   0
 .../common/eal_common_proc.c                  |   0
 .../common/eal_common_string_fns.c            |   0
 .../common/eal_common_tailqs.c                |   0
 .../common/eal_common_thread.c                |   0
 .../common/eal_common_timer.c                 |   0
 .../common/eal_common_trace.c                 |   0
 .../common/eal_common_trace_ctf.c             |   0
 .../common/eal_common_trace_points.c          |   0
 .../common/eal_common_trace_utils.c           |   0
 .../common/eal_common_uuid.c                  |   0
 .../common/eal_filesystem.h                   |   0
 .../common/eal_hugepages.h                    |   0
 .../common/eal_internal_cfg.h                 |   0
 lib/{librte_eal => eal}/common/eal_log.h      |   0
 lib/{librte_eal => eal}/common/eal_memalloc.h |   0
 lib/{librte_eal => eal}/common/eal_memcfg.h   |   0
 lib/{librte_eal => eal}/common/eal_options.h  |   0
 lib/{librte_eal => eal}/common/eal_private.h  |   0
 lib/{librte_eal => eal}/common/eal_thread.h   |   0
 lib/{librte_eal => eal}/common/eal_trace.h    |   0
 lib/{librte_eal => eal}/common/hotplug_mp.c   |   0
 lib/{librte_eal => eal}/common/hotplug_mp.h   |   0
 lib/{librte_eal => eal}/common/malloc_elem.c  |   0
 lib/{librte_eal => eal}/common/malloc_elem.h  |   0
 lib/{librte_eal => eal}/common/malloc_heap.c  |   0
 lib/{librte_eal => eal}/common/malloc_heap.h  |   0
 lib/{librte_eal => eal}/common/malloc_mp.c    |   0
 lib/{librte_eal => eal}/common/malloc_mp.h    |   0
 lib/{librte_eal => eal}/common/meson.build    |   0
 .../common/rte_keepalive.c                    |   0
 lib/{librte_eal => eal}/common/rte_malloc.c   |   0
 lib/{librte_eal => eal}/common/rte_random.c   |   0
 .../common/rte_reciprocal.c                   |   0
 lib/{librte_eal => eal}/common/rte_service.c  |   0
 lib/{librte_eal => eal}/common/rte_version.c  |   0
 lib/{librte_eal => eal}/freebsd/eal.c         |   0
 lib/{librte_eal => eal}/freebsd/eal_alarm.c   |   0
 .../freebsd/eal_alarm_private.h               |   0
 .../freebsd/eal_cpuflags.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_debug.c   |   0
 lib/{librte_eal => eal}/freebsd/eal_dev.c     |   0
 .../freebsd/eal_hugepage_info.c               |   0
 .../freebsd/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/freebsd/eal_lcore.c   |   0
 .../freebsd/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/freebsd/eal_memory.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_thread.c  |   0
 lib/{librte_eal => eal}/freebsd/eal_timer.c   |   0
 .../freebsd/include/meson.build               |   0
 .../freebsd/include/rte_os.h                  |   0
 .../freebsd/include/rte_os_shim.h             |   0
 lib/{librte_eal => eal}/freebsd/meson.build   |   0
 .../include/generic/rte_atomic.h              |   0
 .../include/generic/rte_byteorder.h           |   0
 .../include/generic/rte_cpuflags.h            |   0
 .../include/generic/rte_cycles.h              |   0
 .../include/generic/rte_io.h                  |   0
 .../include/generic/rte_mcslock.h             |   0
 .../include/generic/rte_memcpy.h              |   0
 .../include/generic/rte_pause.h               |   0
 .../include/generic/rte_pflock.h              |   0
 .../include/generic/rte_power_intrinsics.h    |   0
 .../include/generic/rte_prefetch.h            |   0
 .../include/generic/rte_rwlock.h              |   0
 .../include/generic/rte_spinlock.h            |   0
 .../include/generic/rte_ticketlock.h          |   0
 .../include/generic/rte_vect.h                |   0
 lib/{librte_eal => eal}/include/meson.build   |   0
 lib/{librte_eal => eal}/include/rte_alarm.h   |   0
 lib/{librte_eal => eal}/include/rte_bitmap.h  |   0
 lib/{librte_eal => eal}/include/rte_bitops.h  |   0
 .../include/rte_branch_prediction.h           |   0
 lib/{librte_eal => eal}/include/rte_bus.h     |   0
 lib/{librte_eal => eal}/include/rte_class.h   |   0
 lib/{librte_eal => eal}/include/rte_common.h  |   0
 lib/{librte_eal => eal}/include/rte_compat.h  |   0
 lib/{librte_eal => eal}/include/rte_debug.h   |   0
 lib/{librte_eal => eal}/include/rte_dev.h     |   0
 lib/{librte_eal => eal}/include/rte_devargs.h |   0
 lib/{librte_eal => eal}/include/rte_eal.h     |   0
 .../include/rte_eal_interrupts.h              |   0
 .../include/rte_eal_memconfig.h               |   0
 .../include/rte_eal_paging.h                  |   0
 .../include/rte_eal_trace.h                   |   0
 lib/{librte_eal => eal}/include/rte_errno.h   |   0
 lib/{librte_eal => eal}/include/rte_fbarray.h |   0
 .../include/rte_function_versioning.h         |   0
 lib/{librte_eal => eal}/include/rte_hexdump.h |   0
 .../include/rte_hypervisor.h                  |   0
 .../include/rte_interrupts.h                  |   0
 .../include/rte_keepalive.h                   |   0
 lib/{librte_eal => eal}/include/rte_launch.h  |   0
 lib/{librte_eal => eal}/include/rte_lcore.h   |   0
 lib/{librte_eal => eal}/include/rte_log.h     |   0
 lib/{librte_eal => eal}/include/rte_malloc.h  |   0
 lib/{librte_eal => eal}/include/rte_memory.h  |   0
 lib/{librte_eal => eal}/include/rte_memzone.h |   0
 .../include/rte_pci_dev_feature_defs.h        |   0
 .../include/rte_pci_dev_features.h            |   0
 .../include/rte_per_lcore.h                   |   0
 lib/{librte_eal => eal}/include/rte_random.h  |   0
 .../include/rte_reciprocal.h                  |   0
 lib/{librte_eal => eal}/include/rte_service.h |   0
 .../include/rte_service_component.h           |   0
 .../include/rte_string_fns.h                  |   0
 lib/{librte_eal => eal}/include/rte_tailq.h   |   0
 lib/{librte_eal => eal}/include/rte_test.h    |   0
 lib/{librte_eal => eal}/include/rte_thread.h  |   0
 lib/{librte_eal => eal}/include/rte_time.h    |   0
 lib/{librte_eal => eal}/include/rte_trace.h   |   0
 .../include/rte_trace_point.h                 |   0
 .../include/rte_trace_point_register.h        |   0
 lib/{librte_eal => eal}/include/rte_uuid.h    |   0
 lib/{librte_eal => eal}/include/rte_version.h |   0
 lib/{librte_eal => eal}/include/rte_vfio.h    |   0
 lib/{librte_eal => eal}/linux/eal.c           |   0
 lib/{librte_eal => eal}/linux/eal_alarm.c     |   0
 lib/{librte_eal => eal}/linux/eal_cpuflags.c  |   0
 lib/{librte_eal => eal}/linux/eal_debug.c     |   0
 lib/{librte_eal => eal}/linux/eal_dev.c       |   0
 .../linux/eal_hugepage_info.c                 |   0
 .../linux/eal_interrupts.c                    |   0
 lib/{librte_eal => eal}/linux/eal_lcore.c     |   0
 lib/{librte_eal => eal}/linux/eal_log.c       |   0
 lib/{librte_eal => eal}/linux/eal_memalloc.c  |   0
 lib/{librte_eal => eal}/linux/eal_memory.c    |   0
 lib/{librte_eal => eal}/linux/eal_thread.c    |   0
 lib/{librte_eal => eal}/linux/eal_timer.c     |   0
 lib/{librte_eal => eal}/linux/eal_vfio.c      |   0
 lib/{librte_eal => eal}/linux/eal_vfio.h      |   0
 .../linux/eal_vfio_mp_sync.c                  |   0
 .../linux/include/meson.build                 |   0
 .../linux/include/rte_os.h                    |   0
 .../linux/include/rte_os_shim.h               |   0
 lib/{librte_eal => eal}/linux/meson.build     |   0
 lib/{librte_eal => eal}/meson.build           |   0
 .../ppc/include/meson.build                   |   0
 .../ppc/include/rte_altivec.h                 |   0
 .../ppc/include/rte_atomic.h                  |   0
 .../ppc/include/rte_byteorder.h               |   0
 .../ppc/include/rte_cpuflags.h                |   0
 .../ppc/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/ppc/include/rte_io.h  |   0
 .../ppc/include/rte_mcslock.h                 |   0
 .../ppc/include/rte_memcpy.h                  |   0
 .../ppc/include/rte_pause.h                   |   0
 .../ppc/include/rte_pflock.h                  |   0
 .../ppc/include/rte_power_intrinsics.h        |   0
 .../ppc/include/rte_prefetch.h                |   0
 .../ppc/include/rte_rwlock.h                  |   0
 .../ppc/include/rte_spinlock.h                |   0
 .../ppc/include/rte_ticketlock.h              |   0
 .../ppc/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/ppc/meson.build       |   0
 lib/{librte_eal => eal}/ppc/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/ppc/rte_cycles.c      |   0
 lib/{librte_eal => eal}/ppc/rte_hypervisor.c  |   0
 .../ppc/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/unix/eal_file.c       |   0
 .../unix/eal_unix_memory.c                    |   0
 lib/{librte_eal => eal}/unix/eal_unix_timer.c |   0
 lib/{librte_eal => eal}/unix/meson.build      |   0
 lib/{librte_eal => eal}/unix/rte_thread.c     |   0
 lib/{librte_eal => eal}/version.map           |   0
 lib/{librte_eal => eal}/windows/eal.c         |   0
 lib/{librte_eal => eal}/windows/eal_alarm.c   |   0
 lib/{librte_eal => eal}/windows/eal_debug.c   |   0
 lib/{librte_eal => eal}/windows/eal_file.c    |   0
 .../windows/eal_hugepages.c                   |   0
 .../windows/eal_interrupts.c                  |   0
 lib/{librte_eal => eal}/windows/eal_lcore.c   |   0
 lib/{librte_eal => eal}/windows/eal_log.c     |   0
 .../windows/eal_memalloc.c                    |   0
 lib/{librte_eal => eal}/windows/eal_memory.c  |   0
 lib/{librte_eal => eal}/windows/eal_mp.c      |   0
 lib/{librte_eal => eal}/windows/eal_thread.c  |   0
 lib/{librte_eal => eal}/windows/eal_timer.c   |   0
 lib/{librte_eal => eal}/windows/eal_windows.h |   0
 lib/{librte_eal => eal}/windows/fnmatch.c     |   0
 lib/{librte_eal => eal}/windows/getopt.c      |   0
 .../windows/include/dirent.h                  |   0
 .../windows/include/fnmatch.h                 |   0
 .../windows/include/getopt.h                  |   0
 .../windows/include/meson.build               |   0
 .../windows/include/pthread.h                 |   0
 .../windows/include/regex.h                   |   0
 .../windows/include/rte_os.h                  |   0
 .../windows/include/rte_os_shim.h             |   0
 .../windows/include/rte_virt2phys.h           |   0
 .../windows/include/rte_windows.h             |   0
 .../windows/include/sched.h                   |   0
 .../windows/include/sys/queue.h               |   0
 .../windows/include/unistd.h                  |   0
 lib/{librte_eal => eal}/windows/meson.build   |   0
 lib/{librte_eal => eal}/windows/rte_thread.c  |   0
 .../x86/include/meson.build                   |   0
 .../x86/include/rte_atomic.h                  |   0
 .../x86/include/rte_atomic_32.h               |   0
 .../x86/include/rte_atomic_64.h               |   0
 .../x86/include/rte_byteorder.h               |   0
 .../x86/include/rte_byteorder_32.h            |   0
 .../x86/include/rte_byteorder_64.h            |   0
 .../x86/include/rte_cpuflags.h                |   0
 .../x86/include/rte_cycles.h                  |   0
 lib/{librte_eal => eal}/x86/include/rte_io.h  |   0
 .../x86/include/rte_mcslock.h                 |   0
 .../x86/include/rte_memcpy.h                  |   0
 .../x86/include/rte_pause.h                   |   0
 .../x86/include/rte_pflock.h                  |   0
 .../x86/include/rte_power_intrinsics.h        |   0
 .../x86/include/rte_prefetch.h                |   0
 lib/{librte_eal => eal}/x86/include/rte_rtm.h |   0
 .../x86/include/rte_rwlock.h                  |   0
 .../x86/include/rte_spinlock.h                |   0
 .../x86/include/rte_ticketlock.h              |   0
 .../x86/include/rte_vect.h                    |   0
 lib/{librte_eal => eal}/x86/meson.build       |   0
 lib/{librte_eal => eal}/x86/rte_cpuflags.c    |   0
 lib/{librte_eal => eal}/x86/rte_cpuid.h       |   0
 lib/{librte_eal => eal}/x86/rte_cycles.c      |   0
 lib/{librte_eal => eal}/x86/rte_hypervisor.c  |   0
 .../x86/rte_power_intrinsics.c                |   0
 lib/{librte_eal => eal}/x86/rte_spinlock.c    |   0
 lib/{librte_efd => efd}/meson.build           |   0
 lib/{librte_efd => efd}/rte_efd.c             |   0
 lib/{librte_efd => efd}/rte_efd.h             |   0
 lib/{librte_efd => efd}/rte_efd_arm64.h       |   0
 lib/{librte_efd => efd}/rte_efd_x86.h         |   0
 lib/{librte_efd => efd}/version.map           |   0
 lib/{librte_ethdev => ethdev}/ethdev_driver.h |   0
 lib/{librte_ethdev => ethdev}/ethdev_pci.h    |   0
 .../ethdev_private.c                          |   0
 .../ethdev_private.h                          |   0
 .../ethdev_profile.c                          |   0
 .../ethdev_profile.h                          |   0
 .../ethdev_trace_points.c                     |   0
 lib/{librte_ethdev => ethdev}/ethdev_vdev.h   |   0
 lib/{librte_ethdev => ethdev}/meson.build     |   0
 lib/{librte_ethdev => ethdev}/rte_class_eth.c |   0
 lib/{librte_ethdev => ethdev}/rte_dev_info.h  |   0
 lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h  |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.c    |   0
 lib/{librte_ethdev => ethdev}/rte_ethdev.h    |   0
 .../rte_ethdev_core.h                         |   0
 .../rte_ethdev_trace.h                        |   0
 .../rte_ethdev_trace_fp.h                     |   0
 lib/{librte_ethdev => ethdev}/rte_flow.c      |   0
 lib/{librte_ethdev => ethdev}/rte_flow.h      |   0
 .../rte_flow_driver.h                         |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.c       |   0
 lib/{librte_ethdev => ethdev}/rte_mtr.h       |   0
 .../rte_mtr_driver.h                          |   0
 lib/{librte_ethdev => ethdev}/rte_tm.c        |   0
 lib/{librte_ethdev => ethdev}/rte_tm.h        |   0
 lib/{librte_ethdev => ethdev}/rte_tm_driver.h |   0
 lib/{librte_ethdev => ethdev}/version.map     |   0
 .../eventdev_pmd.h                            |   0
 .../eventdev_pmd_pci.h                        |   0
 .../eventdev_pmd_vdev.h                       |   0
 .../eventdev_trace_points.c                   |   0
 lib/{librte_eventdev => eventdev}/meson.build |   0
 .../rte_event_crypto_adapter.c                |   0
 .../rte_event_crypto_adapter.h                |   0
 .../rte_event_eth_rx_adapter.c                |   0
 .../rte_event_eth_rx_adapter.h                |   0
 .../rte_event_eth_tx_adapter.c                |   0
 .../rte_event_eth_tx_adapter.h                |   0
 .../rte_event_ring.c                          |   0
 .../rte_event_ring.h                          |   0
 .../rte_event_timer_adapter.c                 |   0
 .../rte_event_timer_adapter.h                 |   0
 .../rte_event_timer_adapter_pmd.h             |   0
 .../rte_eventdev.c                            |   0
 .../rte_eventdev.h                            |   0
 .../rte_eventdev_trace.h                      |   0
 .../rte_eventdev_trace_fp.h                   |   0
 lib/{librte_eventdev => eventdev}/version.map |   0
 lib/{librte_fib => fib}/dir24_8.c             |   0
 lib/{librte_fib => fib}/dir24_8.h             |   0
 lib/{librte_fib => fib}/dir24_8_avx512.c      |   0
 lib/{librte_fib => fib}/dir24_8_avx512.h      |   0
 lib/{librte_fib => fib}/meson.build           |   0
 lib/{librte_fib => fib}/rte_fib.c             |   0
 lib/{librte_fib => fib}/rte_fib.h             |   0
 lib/{librte_fib => fib}/rte_fib6.c            |   0
 lib/{librte_fib => fib}/rte_fib6.h            |   0
 lib/{librte_fib => fib}/trie.c                |   0
 lib/{librte_fib => fib}/trie.h                |   0
 lib/{librte_fib => fib}/trie_avx512.c         |   0
 lib/{librte_fib => fib}/trie_avx512.h         |   0
 lib/{librte_fib => fib}/version.map           |   0
 .../meson.build                               |   0
 .../rte_flow_classify.c                       |   0
 .../rte_flow_classify.h                       |   0
 .../rte_flow_classify_parse.c                 |   0
 .../rte_flow_classify_parse.h                 |   0
 .../version.map                               |   0
 lib/{librte_graph => graph}/graph.c           |   0
 lib/{librte_graph => graph}/graph_debug.c     |   0
 lib/{librte_graph => graph}/graph_ops.c       |   0
 lib/{librte_graph => graph}/graph_populate.c  |   0
 lib/{librte_graph => graph}/graph_private.h   |   0
 lib/{librte_graph => graph}/graph_stats.c     |   0
 lib/{librte_graph => graph}/meson.build       |   0
 lib/{librte_graph => graph}/node.c            |   0
 lib/{librte_graph => graph}/rte_graph.h       |   0
 .../rte_graph_worker.h                        |   0
 lib/{librte_graph => graph}/version.map       |   0
 lib/{librte_gro => gro}/gro_tcp4.c            |   0
 lib/{librte_gro => gro}/gro_tcp4.h            |   0
 lib/{librte_gro => gro}/gro_udp4.c            |   0
 lib/{librte_gro => gro}/gro_udp4.h            |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_tcp4.h      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.c      |   0
 lib/{librte_gro => gro}/gro_vxlan_udp4.h      |   0
 lib/{librte_gro => gro}/meson.build           |   0
 lib/{librte_gro => gro}/rte_gro.c             |   0
 lib/{librte_gro => gro}/rte_gro.h             |   0
 lib/{librte_gro => gro}/version.map           |   0
 lib/{librte_gso => gso}/gso_common.c          |   0
 lib/{librte_gso => gso}/gso_common.h          |   0
 lib/{librte_gso => gso}/gso_tcp4.c            |   0
 lib/{librte_gso => gso}/gso_tcp4.h            |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_tcp4.h     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.c     |   0
 lib/{librte_gso => gso}/gso_tunnel_udp4.h     |   0
 lib/{librte_gso => gso}/gso_udp4.c            |   0
 lib/{librte_gso => gso}/gso_udp4.h            |   0
 lib/{librte_gso => gso}/meson.build           |   0
 lib/{librte_gso => gso}/rte_gso.c             |   0
 lib/{librte_gso => gso}/rte_gso.h             |   0
 lib/{librte_gso => gso}/version.map           |   0
 lib/{librte_hash => hash}/meson.build         |   0
 lib/{librte_hash => hash}/rte_cmp_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cmp_x86.h       |   0
 lib/{librte_hash => hash}/rte_crc_arm64.h     |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.c   |   0
 lib/{librte_hash => hash}/rte_cuckoo_hash.h   |   0
 lib/{librte_hash => hash}/rte_fbk_hash.c      |   0
 lib/{librte_hash => hash}/rte_fbk_hash.h      |   0
 lib/{librte_hash => hash}/rte_hash.h          |   0
 lib/{librte_hash => hash}/rte_hash_crc.h      |   0
 lib/{librte_hash => hash}/rte_jhash.h         |   0
 lib/{librte_hash => hash}/rte_thash.h         |   0
 lib/{librte_hash => hash}/version.map         |   0
 .../ip_frag_common.h                          |   0
 .../ip_frag_internal.c                        |   0
 lib/{librte_ip_frag => ip_frag}/meson.build   |   0
 lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h |   0
 .../rte_ip_frag_common.c                      |   0
 .../rte_ipv4_fragmentation.c                  |   0
 .../rte_ipv4_reassembly.c                     |   0
 .../rte_ipv6_fragmentation.c                  |   0
 .../rte_ipv6_reassembly.c                     |   0
 lib/{librte_ip_frag => ip_frag}/version.map   |   0
 lib/{librte_ipsec => ipsec}/crypto.h          |   0
 lib/{librte_ipsec => ipsec}/esp_inb.c         |   0
 lib/{librte_ipsec => ipsec}/esp_outb.c        |   0
 lib/{librte_ipsec => ipsec}/iph.h             |   0
 lib/{librte_ipsec => ipsec}/ipsec_sad.c       |   0
 lib/{librte_ipsec => ipsec}/ipsec_sqn.h       |   0
 lib/{librte_ipsec => ipsec}/meson.build       |   0
 lib/{librte_ipsec => ipsec}/misc.h            |   0
 lib/{librte_ipsec => ipsec}/pad.h             |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec.h       |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_group.h |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h    |   0
 lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h   |   0
 lib/{librte_ipsec => ipsec}/sa.c              |   0
 lib/{librte_ipsec => ipsec}/sa.h              |   0
 lib/{librte_ipsec => ipsec}/ses.c             |   0
 lib/{librte_ipsec => ipsec}/version.map       |   0
 lib/{librte_jobstats => jobstats}/meson.build |   0
 .../rte_jobstats.c                            |   0
 .../rte_jobstats.h                            |   0
 lib/{librte_jobstats => jobstats}/version.map |   0
 lib/{librte_kni => kni}/meson.build           |   0
 lib/{librte_kni => kni}/rte_kni.c             |   0
 lib/{librte_kni => kni}/rte_kni.h             |   0
 lib/{librte_kni => kni}/rte_kni_common.h      |   0
 lib/{librte_kni => kni}/rte_kni_fifo.h        |   0
 lib/{librte_kni => kni}/version.map           |   0
 lib/{librte_kvargs => kvargs}/meson.build     |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.c    |   0
 lib/{librte_kvargs => kvargs}/rte_kvargs.h    |   0
 lib/{librte_kvargs => kvargs}/version.map     |   0
 .../meson.build                               |   0
 .../rte_latencystats.c                        |   0
 .../rte_latencystats.h                        |   0
 .../version.map                               |   0
 lib/{librte_lpm => lpm}/meson.build           |   0
 lib/{librte_lpm => lpm}/rte_lpm.c             |   0
 lib/{librte_lpm => lpm}/rte_lpm.h             |   0
 lib/{librte_lpm => lpm}/rte_lpm6.c            |   0
 lib/{librte_lpm => lpm}/rte_lpm6.h            |   0
 lib/{librte_lpm => lpm}/rte_lpm_altivec.h     |   0
 lib/{librte_lpm => lpm}/rte_lpm_neon.h        |   0
 lib/{librte_lpm => lpm}/rte_lpm_sse.h         |   0
 lib/{librte_lpm => lpm}/rte_lpm_sve.h         |   0
 lib/{librte_lpm => lpm}/version.map           |   0
 lib/{librte_mbuf => mbuf}/meson.build         |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.c          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf.h          |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_core.h     |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h      |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c    |   0
 lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h    |   0
 lib/{librte_mbuf => mbuf}/version.map         |   0
 lib/{librte_member => member}/meson.build     |   0
 lib/{librte_member => member}/rte_member.c    |   0
 lib/{librte_member => member}/rte_member.h    |   0
 lib/{librte_member => member}/rte_member_ht.c |   0
 lib/{librte_member => member}/rte_member_ht.h |   0
 .../rte_member_vbf.c                          |   0
 .../rte_member_vbf.h                          |   0
 .../rte_member_x86.h                          |   0
 lib/{librte_member => member}/version.map     |   0
 .../mempool_trace_points.c                    |   0
 lib/{librte_mempool => mempool}/meson.build   |   0
 lib/{librte_mempool => mempool}/rte_mempool.c |   0
 lib/{librte_mempool => mempool}/rte_mempool.h |   0
 .../rte_mempool_ops.c                         |   0
 .../rte_mempool_ops_default.c                 |   0
 .../rte_mempool_trace.h                       |   0
 .../rte_mempool_trace_fp.h                    |   0
 lib/{librte_mempool => mempool}/version.map   |   0
 lib/meson.build                               |  16 +-
 lib/{librte_meter => meter}/meson.build       |   0
 lib/{librte_meter => meter}/rte_meter.c       |   0
 lib/{librte_meter => meter}/rte_meter.h       |   0
 lib/{librte_meter => meter}/version.map       |   0
 lib/{librte_metrics => metrics}/meson.build   |   0
 lib/{librte_metrics => metrics}/rte_metrics.c |   0
 lib/{librte_metrics => metrics}/rte_metrics.h |   0
 .../rte_metrics_telemetry.c                   |   0
 .../rte_metrics_telemetry.h                   |   0
 lib/{librte_metrics => metrics}/version.map   |   0
 lib/{librte_net => net}/meson.build           |   0
 lib/{librte_net => net}/net_crc.h             |   0
 lib/{librte_net => net}/net_crc_avx512.c      |   0
 lib/{librte_net => net}/net_crc_neon.c        |   0
 lib/{librte_net => net}/net_crc_sse.c         |   0
 lib/{librte_net => net}/rte_arp.c             |   0
 lib/{librte_net => net}/rte_arp.h             |   0
 lib/{librte_net => net}/rte_ecpri.h           |   0
 lib/{librte_net => net}/rte_esp.h             |   0
 lib/{librte_net => net}/rte_ether.c           |   0
 lib/{librte_net => net}/rte_ether.h           |   0
 lib/{librte_net => net}/rte_geneve.h          |   0
 lib/{librte_net => net}/rte_gre.h             |   0
 lib/{librte_net => net}/rte_gtp.h             |   0
 lib/{librte_net => net}/rte_higig.h           |   0
 lib/{librte_net => net}/rte_icmp.h            |   0
 lib/{librte_net => net}/rte_ip.h              |   0
 lib/{librte_net => net}/rte_mpls.h            |   0
 lib/{librte_net => net}/rte_net.c             |   0
 lib/{librte_net => net}/rte_net.h             |   0
 lib/{librte_net => net}/rte_net_crc.c         |   0
 lib/{librte_net => net}/rte_net_crc.h         |   0
 lib/{librte_net => net}/rte_sctp.h            |   0
 lib/{librte_net => net}/rte_tcp.h             |   0
 lib/{librte_net => net}/rte_udp.h             |   0
 lib/{librte_net => net}/rte_vxlan.h           |   0
 lib/{librte_net => net}/version.map           |   0
 lib/{librte_node => node}/ethdev_ctrl.c       |   0
 lib/{librte_node => node}/ethdev_rx.c         |   0
 lib/{librte_node => node}/ethdev_rx_priv.h    |   0
 lib/{librte_node => node}/ethdev_tx.c         |   0
 lib/{librte_node => node}/ethdev_tx_priv.h    |   0
 lib/{librte_node => node}/ip4_lookup.c        |   0
 lib/{librte_node => node}/ip4_lookup_neon.h   |   0
 lib/{librte_node => node}/ip4_lookup_sse.h    |   0
 lib/{librte_node => node}/ip4_rewrite.c       |   0
 lib/{librte_node => node}/ip4_rewrite_priv.h  |   0
 lib/{librte_node => node}/log.c               |   0
 lib/{librte_node => node}/meson.build         |   0
 lib/{librte_node => node}/node_private.h      |   0
 lib/{librte_node => node}/null.c              |   0
 lib/{librte_node => node}/pkt_cls.c           |   0
 lib/{librte_node => node}/pkt_cls_priv.h      |   0
 lib/{librte_node => node}/pkt_drop.c          |   0
 lib/{librte_node => node}/rte_node_eth_api.h  |   0
 lib/{librte_node => node}/rte_node_ip4_api.h  |   0
 lib/{librte_node => node}/version.map         |   0
 lib/{librte_pci => pci}/meson.build           |   0
 lib/{librte_pci => pci}/rte_pci.c             |   0
 lib/{librte_pci => pci}/rte_pci.h             |   0
 lib/{librte_pci => pci}/version.map           |   0
 lib/{librte_pdump => pdump}/meson.build       |   0
 lib/{librte_pdump => pdump}/rte_pdump.c       |   0
 lib/{librte_pdump => pdump}/rte_pdump.h       |   0
 lib/{librte_pdump => pdump}/version.map       |   0
 lib/{librte_pipeline => pipeline}/meson.build |   0
 .../rte_pipeline.c                            |   0
 .../rte_pipeline.h                            |   0
 .../rte_port_in_action.c                      |   0
 .../rte_port_in_action.h                      |   0
 .../rte_swx_ctl.c                             |   0
 .../rte_swx_ctl.h                             |   0
 .../rte_swx_extern.h                          |   0
 .../rte_swx_pipeline.c                        |   0
 .../rte_swx_pipeline.h                        |   0
 .../rte_swx_pipeline_spec.c                   |   0
 .../rte_table_action.c                        |   0
 .../rte_table_action.h                        |   0
 lib/{librte_pipeline => pipeline}/version.map |   0
 lib/{librte_port => port}/meson.build         |   0
 lib/{librte_port => port}/rte_port.h          |   0
 lib/{librte_port => port}/rte_port_ethdev.c   |   0
 lib/{librte_port => port}/rte_port_ethdev.h   |   0
 lib/{librte_port => port}/rte_port_eventdev.c |   0
 lib/{librte_port => port}/rte_port_eventdev.h |   0
 lib/{librte_port => port}/rte_port_fd.c       |   0
 lib/{librte_port => port}/rte_port_fd.h       |   0
 lib/{librte_port => port}/rte_port_frag.c     |   0
 lib/{librte_port => port}/rte_port_frag.h     |   0
 lib/{librte_port => port}/rte_port_kni.c      |   0
 lib/{librte_port => port}/rte_port_kni.h      |   0
 lib/{librte_port => port}/rte_port_ras.c      |   0
 lib/{librte_port => port}/rte_port_ras.h      |   0
 lib/{librte_port => port}/rte_port_ring.c     |   0
 lib/{librte_port => port}/rte_port_ring.h     |   0
 lib/{librte_port => port}/rte_port_sched.c    |   0
 lib/{librte_port => port}/rte_port_sched.h    |   0
 .../rte_port_source_sink.c                    |   0
 .../rte_port_source_sink.h                    |   0
 .../rte_port_sym_crypto.c                     |   0
 .../rte_port_sym_crypto.h                     |   0
 lib/{librte_port => port}/rte_swx_port.h      |   0
 .../rte_swx_port_ethdev.c                     |   0
 .../rte_swx_port_ethdev.h                     |   0
 lib/{librte_port => port}/rte_swx_port_fd.c   |   0
 lib/{librte_port => port}/rte_swx_port_fd.h   |   0
 lib/{librte_port => port}/rte_swx_port_ring.c |   0
 lib/{librte_port => port}/rte_swx_port_ring.h |   0
 .../rte_swx_port_source_sink.c                |   0
 .../rte_swx_port_source_sink.h                |   0
 lib/{librte_port => port}/version.map         |   0
 lib/{librte_power => power}/guest_channel.c   |   0
 lib/{librte_power => power}/guest_channel.h   |   0
 lib/{librte_power => power}/meson.build       |   0
 .../power_acpi_cpufreq.c                      |   0
 .../power_acpi_cpufreq.h                      |   0
 lib/{librte_power => power}/power_common.c    |   0
 lib/{librte_power => power}/power_common.h    |   0
 lib/{librte_power => power}/power_kvm_vm.c    |   0
 lib/{librte_power => power}/power_kvm_vm.h    |   0
 .../power_pstate_cpufreq.c                    |   0
 .../power_pstate_cpufreq.h                    |   0
 lib/{librte_power => power}/rte_power.c       |   0
 lib/{librte_power => power}/rte_power.h       |   0
 .../rte_power_empty_poll.c                    |   0
 .../rte_power_empty_poll.h                    |   0
 .../rte_power_guest_channel.h                 |   0
 .../rte_power_pmd_mgmt.c                      |   0
 .../rte_power_pmd_mgmt.h                      |   0
 lib/{librte_power => power}/version.map       |   0
 lib/{librte_rawdev => rawdev}/meson.build     |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.c    |   0
 lib/{librte_rawdev => rawdev}/rte_rawdev.h    |   0
 .../rte_rawdev_pmd.h                          |   0
 lib/{librte_rawdev => rawdev}/version.map     |   0
 lib/{librte_rcu => rcu}/meson.build           |   0
 lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.c        |   0
 lib/{librte_rcu => rcu}/rte_rcu_qsbr.h        |   0
 lib/{librte_rcu => rcu}/version.map           |   0
 lib/{librte_regexdev => regexdev}/meson.build |   0
 .../rte_regexdev.c                            |   0
 .../rte_regexdev.h                            |   0
 .../rte_regexdev_core.h                       |   0
 .../rte_regexdev_driver.h                     |   0
 lib/{librte_regexdev => regexdev}/version.map |   0
 lib/{librte_reorder => reorder}/meson.build   |   0
 lib/{librte_reorder => reorder}/rte_reorder.c |   0
 lib/{librte_reorder => reorder}/rte_reorder.h |   0
 lib/{librte_reorder => reorder}/version.map   |   0
 lib/{librte_rib => rib}/meson.build           |   0
 lib/{librte_rib => rib}/rte_rib.c             |   0
 lib/{librte_rib => rib}/rte_rib.h             |   0
 lib/{librte_rib => rib}/rte_rib6.c            |   0
 lib/{librte_rib => rib}/rte_rib6.h            |   0
 lib/{librte_rib => rib}/version.map           |   0
 lib/{librte_ring => ring}/meson.build         |   0
 lib/{librte_ring => ring}/rte_ring.c          |   0
 lib/{librte_ring => ring}/rte_ring.h          |   0
 lib/{librte_ring => ring}/rte_ring_c11_pvt.h  |   0
 lib/{librte_ring => ring}/rte_ring_core.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem.h     |   0
 lib/{librte_ring => ring}/rte_ring_elem_pvt.h |   0
 .../rte_ring_generic_pvt.h                    |   0
 lib/{librte_ring => ring}/rte_ring_hts.h      |   0
 .../rte_ring_hts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/rte_ring_peek.h     |   0
 .../rte_ring_peek_elem_pvt.h                  |   0
 lib/{librte_ring => ring}/rte_ring_peek_zc.h  |   0
 lib/{librte_ring => ring}/rte_ring_rts.h      |   0
 .../rte_ring_rts_elem_pvt.h                   |   0
 lib/{librte_ring => ring}/version.map         |   0
 lib/{librte_sched => sched}/meson.build       |   0
 lib/{librte_sched => sched}/rte_approx.c      |   0
 lib/{librte_sched => sched}/rte_approx.h      |   0
 lib/{librte_sched => sched}/rte_red.c         |   0
 lib/{librte_sched => sched}/rte_red.h         |   0
 lib/{librte_sched => sched}/rte_sched.c       |   0
 lib/{librte_sched => sched}/rte_sched.h       |   0
 .../rte_sched_common.h                        |   0
 lib/{librte_sched => sched}/version.map       |   0
 lib/{librte_security => security}/meson.build |   0
 .../rte_security.c                            |   0
 .../rte_security.h                            |   0
 .../rte_security_driver.h                     |   0
 lib/{librte_security => security}/version.map |   0
 lib/{librte_stack => stack}/meson.build       |   0
 lib/{librte_stack => stack}/rte_stack.c       |   0
 lib/{librte_stack => stack}/rte_stack.h       |   0
 lib/{librte_stack => stack}/rte_stack_lf.c    |   0
 lib/{librte_stack => stack}/rte_stack_lf.h    |   0
 .../rte_stack_lf_c11.h                        |   0
 .../rte_stack_lf_generic.h                    |   0
 .../rte_stack_lf_stubs.h                      |   0
 lib/{librte_stack => stack}/rte_stack_std.c   |   0
 lib/{librte_stack => stack}/rte_stack_std.h   |   0
 lib/{librte_stack => stack}/stack_pvt.h       |   0
 lib/{librte_stack => stack}/version.map       |   0
 lib/{librte_table => table}/meson.build       |   0
 lib/{librte_table => table}/rte_lru.h         |   0
 lib/{librte_table => table}/rte_lru_arm64.h   |   0
 lib/{librte_table => table}/rte_lru_x86.h     |   0
 lib/{librte_table => table}/rte_swx_table.h   |   0
 .../rte_swx_table_em.c                        |   0
 .../rte_swx_table_em.h                        |   0
 .../rte_swx_table_wm.c                        |   0
 .../rte_swx_table_wm.h                        |   0
 lib/{librte_table => table}/rte_table.h       |   0
 lib/{librte_table => table}/rte_table_acl.c   |   0
 lib/{librte_table => table}/rte_table_acl.h   |   0
 lib/{librte_table => table}/rte_table_array.c |   0
 lib/{librte_table => table}/rte_table_array.h |   0
 lib/{librte_table => table}/rte_table_hash.h  |   0
 .../rte_table_hash_cuckoo.c                   |   0
 .../rte_table_hash_cuckoo.h                   |   0
 .../rte_table_hash_ext.c                      |   0
 .../rte_table_hash_func.h                     |   0
 .../rte_table_hash_func_arm64.h               |   0
 .../rte_table_hash_key16.c                    |   0
 .../rte_table_hash_key32.c                    |   0
 .../rte_table_hash_key8.c                     |   0
 .../rte_table_hash_lru.c                      |   0
 lib/{librte_table => table}/rte_table_lpm.c   |   0
 lib/{librte_table => table}/rte_table_lpm.h   |   0
 .../rte_table_lpm_ipv6.c                      |   0
 .../rte_table_lpm_ipv6.h                      |   0
 lib/{librte_table => table}/rte_table_stub.c  |   0
 lib/{librte_table => table}/rte_table_stub.h  |   0
 lib/{librte_table => table}/version.map       |   0
 .../meson.build                               |   2 +-
 .../rte_telemetry.h                           |   0
 .../telemetry.c                               |   0
 .../telemetry_data.c                          |   0
 .../telemetry_data.h                          |   0
 .../telemetry_internal.h                      |   0
 .../telemetry_json.h                          |   0
 .../telemetry_legacy.c                        |   0
 .../version.map                               |   0
 lib/{librte_timer => timer}/meson.build       |   0
 lib/{librte_timer => timer}/rte_timer.c       |   0
 lib/{librte_timer => timer}/rte_timer.h       |   0
 lib/{librte_timer => timer}/version.map       |   0
 lib/{librte_vhost => vhost}/fd_man.c          |   0
 lib/{librte_vhost => vhost}/fd_man.h          |   0
 lib/{librte_vhost => vhost}/iotlb.c           |   0
 lib/{librte_vhost => vhost}/iotlb.h           |   0
 lib/{librte_vhost => vhost}/meson.build       |   0
 lib/{librte_vhost => vhost}/rte_vdpa.h        |   0
 lib/{librte_vhost => vhost}/rte_vdpa_dev.h    |   0
 lib/{librte_vhost => vhost}/rte_vhost.h       |   0
 lib/{librte_vhost => vhost}/rte_vhost_async.h |   0
 .../rte_vhost_crypto.h                        |   0
 lib/{librte_vhost => vhost}/socket.c          |   0
 lib/{librte_vhost => vhost}/vdpa.c            |   0
 lib/{librte_vhost => vhost}/version.map       |   0
 lib/{librte_vhost => vhost}/vhost.c           |   0
 lib/{librte_vhost => vhost}/vhost.h           |   0
 lib/{librte_vhost => vhost}/vhost_crypto.c    |   0
 lib/{librte_vhost => vhost}/vhost_user.c      |   0
 lib/{librte_vhost => vhost}/vhost_user.h      |   0
 lib/{librte_vhost => vhost}/virtio_crypto.h   |   0
 lib/{librte_vhost => vhost}/virtio_net.c      |   0
 license/exceptions.txt                        |   6 +-
 meson.build                                   |   6 +-
 877 files changed, 206 insertions(+), 204 deletions(-)
 rename lib/{librte_acl => acl}/acl.h (100%)
 rename lib/{librte_acl => acl}/acl_bld.c (100%)
 rename lib/{librte_acl => acl}/acl_gen.c (100%)
 rename lib/{librte_acl => acl}/acl_run.h (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.c (100%)
 rename lib/{librte_acl => acl}/acl_run_altivec.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx2.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512.c (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512_common.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x16.h (100%)
 rename lib/{librte_acl => acl}/acl_run_avx512x8.h (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.c (100%)
 rename lib/{librte_acl => acl}/acl_run_neon.h (100%)
 rename lib/{librte_acl => acl}/acl_run_scalar.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.c (100%)
 rename lib/{librte_acl => acl}/acl_run_sse.h (100%)
 rename lib/{librte_acl => acl}/acl_vect.h (100%)
 rename lib/{librte_acl => acl}/meson.build (100%)
 rename lib/{librte_acl => acl}/rte_acl.c (100%)
 rename lib/{librte_acl => acl}/rte_acl.h (100%)
 rename lib/{librte_acl => acl}/rte_acl_osdep.h (100%)
 rename lib/{librte_acl => acl}/tb_mem.c (100%)
 rename lib/{librte_acl => acl}/tb_mem.h (100%)
 rename lib/{librte_acl => acl}/version.map (100%)
 rename lib/{librte_bbdev => bbdev}/meson.build (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.c (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_op.h (100%)
 rename lib/{librte_bbdev => bbdev}/rte_bbdev_pmd.h (100%)
 rename lib/{librte_bbdev => bbdev}/version.map (100%)
 rename lib/{librte_bitratestats => bitratestats}/meson.build (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.c (100%)
 rename lib/{librte_bitratestats => bitratestats}/rte_bitrate.h (100%)
 rename lib/{librte_bitratestats => bitratestats}/version.map (100%)
 rename lib/{librte_bpf => bpf}/bpf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_def.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_exec.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_impl.h (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_arm64.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_jit_x86.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_load_elf.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_pkt.c (100%)
 rename lib/{librte_bpf => bpf}/bpf_validate.c (100%)
 rename lib/{librte_bpf => bpf}/meson.build (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf.h (100%)
 rename lib/{librte_bpf => bpf}/rte_bpf_ethdev.h (100%)
 rename lib/{librte_bpf => bpf}/version.map (100%)
 rename lib/{librte_cfgfile => cfgfile}/meson.build (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.c (100%)
 rename lib/{librte_cfgfile => cfgfile}/rte_cfgfile.h (100%)
 rename lib/{librte_cfgfile => cfgfile}/version.map (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_cirbuf.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_unix.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_os_windows.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_etheraddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_ipaddr.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_num.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_portlist.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_parse_string.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_private.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_rdline.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_socket.h (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.c (100%)
 rename lib/{librte_cmdline => cmdline}/cmdline_vt100.h (100%)
 rename lib/{librte_cmdline => cmdline}/meson.build (100%)
 rename lib/{librte_cmdline => cmdline}/version.map (100%)
 rename lib/{librte_compressdev => compressdev}/meson.build (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_comp.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_internal.h (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.c (100%)
 rename lib/{librte_compressdev => compressdev}/rte_compressdev_pmd.h (100%)
 rename lib/{librte_compressdev => compressdev}/version.map (100%)
 rename lib/{librte_cryptodev => cryptodev}/cryptodev_trace_points.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/meson.build (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_asym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_crypto_sym.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.c (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_pmd.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/rte_cryptodev_trace_fp.h (100%)
 rename lib/{librte_cryptodev => cryptodev}/version.map (100%)
 rename lib/{librte_distributor => distributor}/distributor_private.h (100%)
 rename lib/{librte_distributor => distributor}/meson.build (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor.h (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_generic.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_match_sse.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.c (100%)
 rename lib/{librte_distributor => distributor}/rte_distributor_single.h (100%)
 rename lib/{librte_distributor => distributor}/version.map (100%)
 rename lib/{librte_eal => eal}/arm/include/meson.build (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cpuflags_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_cycles_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_io_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_memcpy_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pause_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_32.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_prefetch_64.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/arm/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/arm/meson.build (100%)
 rename lib/{librte_eal => eal}/arm/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/arm/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_bus.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_class.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_config.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_debug.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dev.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_devargs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_dynmem.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_errno.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_fbarray.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hexdump.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_launch.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_lcore.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_log.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_mcfg.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memalloc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memory.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_memzone.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_options.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_proc.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_string_fns.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_tailqs.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_thread.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_timer.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_ctf.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_points.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_trace_utils.c (100%)
 rename lib/{librte_eal => eal}/common/eal_common_uuid.c (100%)
 rename lib/{librte_eal => eal}/common/eal_filesystem.h (100%)
 rename lib/{librte_eal => eal}/common/eal_hugepages.h (100%)
 rename lib/{librte_eal => eal}/common/eal_internal_cfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_log.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memalloc.h (100%)
 rename lib/{librte_eal => eal}/common/eal_memcfg.h (100%)
 rename lib/{librte_eal => eal}/common/eal_options.h (100%)
 rename lib/{librte_eal => eal}/common/eal_private.h (100%)
 rename lib/{librte_eal => eal}/common/eal_thread.h (100%)
 rename lib/{librte_eal => eal}/common/eal_trace.h (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.c (100%)
 rename lib/{librte_eal => eal}/common/hotplug_mp.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_elem.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_heap.h (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.c (100%)
 rename lib/{librte_eal => eal}/common/malloc_mp.h (100%)
 rename lib/{librte_eal => eal}/common/meson.build (100%)
 rename lib/{librte_eal => eal}/common/rte_keepalive.c (100%)
 rename lib/{librte_eal => eal}/common/rte_malloc.c (100%)
 rename lib/{librte_eal => eal}/common/rte_random.c (100%)
 rename lib/{librte_eal => eal}/common/rte_reciprocal.c (100%)
 rename lib/{librte_eal => eal}/common/rte_service.c (100%)
 rename lib/{librte_eal => eal}/common/rte_version.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_alarm_private.h (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/freebsd/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/freebsd/include/meson.build (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/freebsd/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/freebsd/meson.build (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_io.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/include/generic/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/include/meson.build (100%)
 rename lib/{librte_eal => eal}/include/rte_alarm.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitmap.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bitops.h (100%)
 rename lib/{librte_eal => eal}/include/rte_branch_prediction.h (100%)
 rename lib/{librte_eal => eal}/include/rte_bus.h (100%)
 rename lib/{librte_eal => eal}/include/rte_class.h (100%)
 rename lib/{librte_eal => eal}/include/rte_common.h (100%)
 rename lib/{librte_eal => eal}/include/rte_compat.h (100%)
 rename lib/{librte_eal => eal}/include/rte_debug.h (100%)
 rename lib/{librte_eal => eal}/include/rte_dev.h (100%)
 rename lib/{librte_eal => eal}/include/rte_devargs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_memconfig.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_paging.h (100%)
 rename lib/{librte_eal => eal}/include/rte_eal_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_errno.h (100%)
 rename lib/{librte_eal => eal}/include/rte_fbarray.h (100%)
 rename lib/{librte_eal => eal}/include/rte_function_versioning.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hexdump.h (100%)
 rename lib/{librte_eal => eal}/include/rte_hypervisor.h (100%)
 rename lib/{librte_eal => eal}/include/rte_interrupts.h (100%)
 rename lib/{librte_eal => eal}/include/rte_keepalive.h (100%)
 rename lib/{librte_eal => eal}/include/rte_launch.h (100%)
 rename lib/{librte_eal => eal}/include/rte_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_log.h (100%)
 rename lib/{librte_eal => eal}/include/rte_malloc.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memory.h (100%)
 rename lib/{librte_eal => eal}/include/rte_memzone.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_feature_defs.h (100%)
 rename lib/{librte_eal => eal}/include/rte_pci_dev_features.h (100%)
 rename lib/{librte_eal => eal}/include/rte_per_lcore.h (100%)
 rename lib/{librte_eal => eal}/include/rte_random.h (100%)
 rename lib/{librte_eal => eal}/include/rte_reciprocal.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service.h (100%)
 rename lib/{librte_eal => eal}/include/rte_service_component.h (100%)
 rename lib/{librte_eal => eal}/include/rte_string_fns.h (100%)
 rename lib/{librte_eal => eal}/include/rte_tailq.h (100%)
 rename lib/{librte_eal => eal}/include/rte_test.h (100%)
 rename lib/{librte_eal => eal}/include/rte_thread.h (100%)
 rename lib/{librte_eal => eal}/include/rte_time.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point.h (100%)
 rename lib/{librte_eal => eal}/include/rte_trace_point_register.h (100%)
 rename lib/{librte_eal => eal}/include/rte_uuid.h (100%)
 rename lib/{librte_eal => eal}/include/rte_version.h (100%)
 rename lib/{librte_eal => eal}/include/rte_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_dev.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_hugepage_info.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_log.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.c (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio.h (100%)
 rename lib/{librte_eal => eal}/linux/eal_vfio_mp_sync.c (100%)
 rename lib/{librte_eal => eal}/linux/include/meson.build (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/linux/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/linux/meson.build (100%)
 rename lib/{librte_eal => eal}/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/include/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_altivec.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/ppc/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/ppc/meson.build (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/ppc/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_file.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_memory.c (100%)
 rename lib/{librte_eal => eal}/unix/eal_unix_timer.c (100%)
 rename lib/{librte_eal => eal}/unix/meson.build (100%)
 rename lib/{librte_eal => eal}/unix/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/version.map (100%)
 rename lib/{librte_eal => eal}/windows/eal.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_alarm.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_debug.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_file.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_hugepages.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_interrupts.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_lcore.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_log.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memalloc.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_memory.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_mp.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_thread.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_timer.c (100%)
 rename lib/{librte_eal => eal}/windows/eal_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/fnmatch.c (100%)
 rename lib/{librte_eal => eal}/windows/getopt.c (100%)
 rename lib/{librte_eal => eal}/windows/include/dirent.h (100%)
 rename lib/{librte_eal => eal}/windows/include/fnmatch.h (100%)
 rename lib/{librte_eal => eal}/windows/include/getopt.h (100%)
 rename lib/{librte_eal => eal}/windows/include/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/include/pthread.h (100%)
 rename lib/{librte_eal => eal}/windows/include/regex.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_os_shim.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_virt2phys.h (100%)
 rename lib/{librte_eal => eal}/windows/include/rte_windows.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sched.h (100%)
 rename lib/{librte_eal => eal}/windows/include/sys/queue.h (100%)
 rename lib/{librte_eal => eal}/windows/include/unistd.h (100%)
 rename lib/{librte_eal => eal}/windows/meson.build (100%)
 rename lib/{librte_eal => eal}/windows/rte_thread.c (100%)
 rename lib/{librte_eal => eal}/x86/include/meson.build (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_atomic_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_32.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_byteorder_64.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cpuflags.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_cycles.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_io.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_mcslock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_memcpy.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pause.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_pflock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_power_intrinsics.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_prefetch.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rtm.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_rwlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_spinlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_ticketlock.h (100%)
 rename lib/{librte_eal => eal}/x86/include/rte_vect.h (100%)
 rename lib/{librte_eal => eal}/x86/meson.build (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuflags.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_cpuid.h (100%)
 rename lib/{librte_eal => eal}/x86/rte_cycles.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_hypervisor.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_power_intrinsics.c (100%)
 rename lib/{librte_eal => eal}/x86/rte_spinlock.c (100%)
 rename lib/{librte_efd => efd}/meson.build (100%)
 rename lib/{librte_efd => efd}/rte_efd.c (100%)
 rename lib/{librte_efd => efd}/rte_efd.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_arm64.h (100%)
 rename lib/{librte_efd => efd}/rte_efd_x86.h (100%)
 rename lib/{librte_efd => efd}/version.map (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_pci.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_private.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_profile.h (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_trace_points.c (100%)
 rename lib/{librte_ethdev => ethdev}/ethdev_vdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/meson.build (100%)
 rename lib/{librte_ethdev => ethdev}/rte_class_eth.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_dev_info.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_eth_ctrl.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_core.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_ethdev_trace_fp.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_flow_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_mtr_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.c (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm.h (100%)
 rename lib/{librte_ethdev => ethdev}/rte_tm_driver.h (100%)
 rename lib/{librte_ethdev => ethdev}/version.map (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_pci.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_pmd_vdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/eventdev_trace_points.c (100%)
 rename lib/{librte_eventdev => eventdev}/meson.build (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_crypto_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_rx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_eth_tx_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_ring.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_event_timer_adapter_pmd.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.c (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace.h (100%)
 rename lib/{librte_eventdev => eventdev}/rte_eventdev_trace_fp.h (100%)
 rename lib/{librte_eventdev => eventdev}/version.map (100%)
 rename lib/{librte_fib => fib}/dir24_8.c (100%)
 rename lib/{librte_fib => fib}/dir24_8.h (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.c (100%)
 rename lib/{librte_fib => fib}/dir24_8_avx512.h (100%)
 rename lib/{librte_fib => fib}/meson.build (100%)
 rename lib/{librte_fib => fib}/rte_fib.c (100%)
 rename lib/{librte_fib => fib}/rte_fib.h (100%)
 rename lib/{librte_fib => fib}/rte_fib6.c (100%)
 rename lib/{librte_fib => fib}/rte_fib6.h (100%)
 rename lib/{librte_fib => fib}/trie.c (100%)
 rename lib/{librte_fib => fib}/trie.h (100%)
 rename lib/{librte_fib => fib}/trie_avx512.c (100%)
 rename lib/{librte_fib => fib}/trie_avx512.h (100%)
 rename lib/{librte_fib => fib}/version.map (100%)
 rename lib/{librte_flow_classify => flow_classify}/meson.build (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.c (100%)
 rename lib/{librte_flow_classify => flow_classify}/rte_flow_classify_parse.h (100%)
 rename lib/{librte_flow_classify => flow_classify}/version.map (100%)
 rename lib/{librte_graph => graph}/graph.c (100%)
 rename lib/{librte_graph => graph}/graph_debug.c (100%)
 rename lib/{librte_graph => graph}/graph_ops.c (100%)
 rename lib/{librte_graph => graph}/graph_populate.c (100%)
 rename lib/{librte_graph => graph}/graph_private.h (100%)
 rename lib/{librte_graph => graph}/graph_stats.c (100%)
 rename lib/{librte_graph => graph}/meson.build (100%)
 rename lib/{librte_graph => graph}/node.c (100%)
 rename lib/{librte_graph => graph}/rte_graph.h (100%)
 rename lib/{librte_graph => graph}/rte_graph_worker.h (100%)
 rename lib/{librte_graph => graph}/version.map (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_udp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_tcp4.h (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.c (100%)
 rename lib/{librte_gro => gro}/gro_vxlan_udp4.h (100%)
 rename lib/{librte_gro => gro}/meson.build (100%)
 rename lib/{librte_gro => gro}/rte_gro.c (100%)
 rename lib/{librte_gro => gro}/rte_gro.h (100%)
 rename lib/{librte_gro => gro}/version.map (100%)
 rename lib/{librte_gso => gso}/gso_common.c (100%)
 rename lib/{librte_gso => gso}/gso_common.h (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_tcp4.h (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_tunnel_udp4.h (100%)
 rename lib/{librte_gso => gso}/gso_udp4.c (100%)
 rename lib/{librte_gso => gso}/gso_udp4.h (100%)
 rename lib/{librte_gso => gso}/meson.build (100%)
 rename lib/{librte_gso => gso}/rte_gso.c (100%)
 rename lib/{librte_gso => gso}/rte_gso.h (100%)
 rename lib/{librte_gso => gso}/version.map (100%)
 rename lib/{librte_hash => hash}/meson.build (100%)
 rename lib/{librte_hash => hash}/rte_cmp_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cmp_x86.h (100%)
 rename lib/{librte_hash => hash}/rte_crc_arm64.h (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_cuckoo_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.c (100%)
 rename lib/{librte_hash => hash}/rte_fbk_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash.h (100%)
 rename lib/{librte_hash => hash}/rte_hash_crc.h (100%)
 rename lib/{librte_hash => hash}/rte_jhash.h (100%)
 rename lib/{librte_hash => hash}/rte_thash.h (100%)
 rename lib/{librte_hash => hash}/version.map (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_common.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/ip_frag_internal.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/meson.build (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag.h (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ip_frag_common.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv4_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_fragmentation.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/rte_ipv6_reassembly.c (100%)
 rename lib/{librte_ip_frag => ip_frag}/version.map (100%)
 rename lib/{librte_ipsec => ipsec}/crypto.h (100%)
 rename lib/{librte_ipsec => ipsec}/esp_inb.c (100%)
 rename lib/{librte_ipsec => ipsec}/esp_outb.c (100%)
 rename lib/{librte_ipsec => ipsec}/iph.h (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sad.c (100%)
 rename lib/{librte_ipsec => ipsec}/ipsec_sqn.h (100%)
 rename lib/{librte_ipsec => ipsec}/meson.build (100%)
 rename lib/{librte_ipsec => ipsec}/misc.h (100%)
 rename lib/{librte_ipsec => ipsec}/pad.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_group.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/rte_ipsec_sad.h (100%)
 rename lib/{librte_ipsec => ipsec}/sa.c (100%)
 rename lib/{librte_ipsec => ipsec}/sa.h (100%)
 rename lib/{librte_ipsec => ipsec}/ses.c (100%)
 rename lib/{librte_ipsec => ipsec}/version.map (100%)
 rename lib/{librte_jobstats => jobstats}/meson.build (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.c (100%)
 rename lib/{librte_jobstats => jobstats}/rte_jobstats.h (100%)
 rename lib/{librte_jobstats => jobstats}/version.map (100%)
 rename lib/{librte_kni => kni}/meson.build (100%)
 rename lib/{librte_kni => kni}/rte_kni.c (100%)
 rename lib/{librte_kni => kni}/rte_kni.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_common.h (100%)
 rename lib/{librte_kni => kni}/rte_kni_fifo.h (100%)
 rename lib/{librte_kni => kni}/version.map (100%)
 rename lib/{librte_kvargs => kvargs}/meson.build (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.c (100%)
 rename lib/{librte_kvargs => kvargs}/rte_kvargs.h (100%)
 rename lib/{librte_kvargs => kvargs}/version.map (100%)
 rename lib/{librte_latencystats => latencystats}/meson.build (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.c (100%)
 rename lib/{librte_latencystats => latencystats}/rte_latencystats.h (100%)
 rename lib/{librte_latencystats => latencystats}/version.map (100%)
 rename lib/{librte_lpm => lpm}/meson.build (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.c (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm6.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_altivec.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_neon.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sse.h (100%)
 rename lib/{librte_lpm => lpm}/rte_lpm_sve.h (100%)
 rename lib/{librte_lpm => lpm}/version.map (100%)
 rename lib/{librte_mbuf => mbuf}/meson.build (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_core.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_dyn.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_pool_ops.h (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.c (100%)
 rename lib/{librte_mbuf => mbuf}/rte_mbuf_ptype.h (100%)
 rename lib/{librte_mbuf => mbuf}/version.map (100%)
 rename lib/{librte_member => member}/meson.build (100%)
 rename lib/{librte_member => member}/rte_member.c (100%)
 rename lib/{librte_member => member}/rte_member.h (100%)
 rename lib/{librte_member => member}/rte_member_ht.c (100%)
 rename lib/{librte_member => member}/rte_member_ht.h (100%)
 rename lib/{librte_member => member}/rte_member_vbf.c (100%)
 rename lib/{librte_member => member}/rte_member_vbf.h (100%)
 rename lib/{librte_member => member}/rte_member_x86.h (100%)
 rename lib/{librte_member => member}/version.map (100%)
 rename lib/{librte_mempool => mempool}/mempool_trace_points.c (100%)
 rename lib/{librte_mempool => mempool}/meson.build (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_ops_default.c (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace.h (100%)
 rename lib/{librte_mempool => mempool}/rte_mempool_trace_fp.h (100%)
 rename lib/{librte_mempool => mempool}/version.map (100%)
 rename lib/{librte_meter => meter}/meson.build (100%)
 rename lib/{librte_meter => meter}/rte_meter.c (100%)
 rename lib/{librte_meter => meter}/rte_meter.h (100%)
 rename lib/{librte_meter => meter}/version.map (100%)
 rename lib/{librte_metrics => metrics}/meson.build (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics.h (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.c (100%)
 rename lib/{librte_metrics => metrics}/rte_metrics_telemetry.h (100%)
 rename lib/{librte_metrics => metrics}/version.map (100%)
 rename lib/{librte_net => net}/meson.build (100%)
 rename lib/{librte_net => net}/net_crc.h (100%)
 rename lib/{librte_net => net}/net_crc_avx512.c (100%)
 rename lib/{librte_net => net}/net_crc_neon.c (100%)
 rename lib/{librte_net => net}/net_crc_sse.c (100%)
 rename lib/{librte_net => net}/rte_arp.c (100%)
 rename lib/{librte_net => net}/rte_arp.h (100%)
 rename lib/{librte_net => net}/rte_ecpri.h (100%)
 rename lib/{librte_net => net}/rte_esp.h (100%)
 rename lib/{librte_net => net}/rte_ether.c (100%)
 rename lib/{librte_net => net}/rte_ether.h (100%)
 rename lib/{librte_net => net}/rte_geneve.h (100%)
 rename lib/{librte_net => net}/rte_gre.h (100%)
 rename lib/{librte_net => net}/rte_gtp.h (100%)
 rename lib/{librte_net => net}/rte_higig.h (100%)
 rename lib/{librte_net => net}/rte_icmp.h (100%)
 rename lib/{librte_net => net}/rte_ip.h (100%)
 rename lib/{librte_net => net}/rte_mpls.h (100%)
 rename lib/{librte_net => net}/rte_net.c (100%)
 rename lib/{librte_net => net}/rte_net.h (100%)
 rename lib/{librte_net => net}/rte_net_crc.c (100%)
 rename lib/{librte_net => net}/rte_net_crc.h (100%)
 rename lib/{librte_net => net}/rte_sctp.h (100%)
 rename lib/{librte_net => net}/rte_tcp.h (100%)
 rename lib/{librte_net => net}/rte_udp.h (100%)
 rename lib/{librte_net => net}/rte_vxlan.h (100%)
 rename lib/{librte_net => net}/version.map (100%)
 rename lib/{librte_node => node}/ethdev_ctrl.c (100%)
 rename lib/{librte_node => node}/ethdev_rx.c (100%)
 rename lib/{librte_node => node}/ethdev_rx_priv.h (100%)
 rename lib/{librte_node => node}/ethdev_tx.c (100%)
 rename lib/{librte_node => node}/ethdev_tx_priv.h (100%)
 rename lib/{librte_node => node}/ip4_lookup.c (100%)
 rename lib/{librte_node => node}/ip4_lookup_neon.h (100%)
 rename lib/{librte_node => node}/ip4_lookup_sse.h (100%)
 rename lib/{librte_node => node}/ip4_rewrite.c (100%)
 rename lib/{librte_node => node}/ip4_rewrite_priv.h (100%)
 rename lib/{librte_node => node}/log.c (100%)
 rename lib/{librte_node => node}/meson.build (100%)
 rename lib/{librte_node => node}/node_private.h (100%)
 rename lib/{librte_node => node}/null.c (100%)
 rename lib/{librte_node => node}/pkt_cls.c (100%)
 rename lib/{librte_node => node}/pkt_cls_priv.h (100%)
 rename lib/{librte_node => node}/pkt_drop.c (100%)
 rename lib/{librte_node => node}/rte_node_eth_api.h (100%)
 rename lib/{librte_node => node}/rte_node_ip4_api.h (100%)
 rename lib/{librte_node => node}/version.map (100%)
 rename lib/{librte_pci => pci}/meson.build (100%)
 rename lib/{librte_pci => pci}/rte_pci.c (100%)
 rename lib/{librte_pci => pci}/rte_pci.h (100%)
 rename lib/{librte_pci => pci}/version.map (100%)
 rename lib/{librte_pdump => pdump}/meson.build (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.c (100%)
 rename lib/{librte_pdump => pdump}/rte_pdump.h (100%)
 rename lib/{librte_pdump => pdump}/version.map (100%)
 rename lib/{librte_pipeline => pipeline}/meson.build (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_port_in_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_ctl.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_extern.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline.h (100%)
 rename lib/{librte_pipeline => pipeline}/rte_swx_pipeline_spec.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.c (100%)
 rename lib/{librte_pipeline => pipeline}/rte_table_action.h (100%)
 rename lib/{librte_pipeline => pipeline}/version.map (100%)
 rename lib/{librte_port => port}/meson.build (100%)
 rename lib/{librte_port => port}/rte_port.h (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.c (100%)
 rename lib/{librte_port => port}/rte_port_eventdev.h (100%)
 rename lib/{librte_port => port}/rte_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_port_frag.c (100%)
 rename lib/{librte_port => port}/rte_port_frag.h (100%)
 rename lib/{librte_port => port}/rte_port_kni.c (100%)
 rename lib/{librte_port => port}/rte_port_kni.h (100%)
 rename lib/{librte_port => port}/rte_port_ras.c (100%)
 rename lib/{librte_port => port}/rte_port_ras.h (100%)
 rename lib/{librte_port => port}/rte_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_port_sched.c (100%)
 rename lib/{librte_port => port}/rte_port_sched.h (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_port_source_sink.h (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.c (100%)
 rename lib/{librte_port => port}/rte_port_sym_crypto.h (100%)
 rename lib/{librte_port => port}/rte_swx_port.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ethdev.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_fd.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_ring.h (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.c (100%)
 rename lib/{librte_port => port}/rte_swx_port_source_sink.h (100%)
 rename lib/{librte_port => port}/version.map (100%)
 rename lib/{librte_power => power}/guest_channel.c (100%)
 rename lib/{librte_power => power}/guest_channel.h (100%)
 rename lib/{librte_power => power}/meson.build (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_acpi_cpufreq.h (100%)
 rename lib/{librte_power => power}/power_common.c (100%)
 rename lib/{librte_power => power}/power_common.h (100%)
 rename lib/{librte_power => power}/power_kvm_vm.c (100%)
 rename lib/{librte_power => power}/power_kvm_vm.h (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.c (100%)
 rename lib/{librte_power => power}/power_pstate_cpufreq.h (100%)
 rename lib/{librte_power => power}/rte_power.c (100%)
 rename lib/{librte_power => power}/rte_power.h (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.c (100%)
 rename lib/{librte_power => power}/rte_power_empty_poll.h (100%)
 rename lib/{librte_power => power}/rte_power_guest_channel.h (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.c (100%)
 rename lib/{librte_power => power}/rte_power_pmd_mgmt.h (100%)
 rename lib/{librte_power => power}/version.map (100%)
 rename lib/{librte_rawdev => rawdev}/meson.build (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.c (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev.h (100%)
 rename lib/{librte_rawdev => rawdev}/rte_rawdev_pmd.h (100%)
 rename lib/{librte_rawdev => rawdev}/version.map (100%)
 rename lib/{librte_rcu => rcu}/meson.build (100%)
 rename lib/{librte_rcu => rcu}/rcu_qsbr_pvt.h (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.c (100%)
 rename lib/{librte_rcu => rcu}/rte_rcu_qsbr.h (100%)
 rename lib/{librte_rcu => rcu}/version.map (100%)
 rename lib/{librte_regexdev => regexdev}/meson.build (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.c (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_core.h (100%)
 rename lib/{librte_regexdev => regexdev}/rte_regexdev_driver.h (100%)
 rename lib/{librte_regexdev => regexdev}/version.map (100%)
 rename lib/{librte_reorder => reorder}/meson.build (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.c (100%)
 rename lib/{librte_reorder => reorder}/rte_reorder.h (100%)
 rename lib/{librte_reorder => reorder}/version.map (100%)
 rename lib/{librte_rib => rib}/meson.build (100%)
 rename lib/{librte_rib => rib}/rte_rib.c (100%)
 rename lib/{librte_rib => rib}/rte_rib.h (100%)
 rename lib/{librte_rib => rib}/rte_rib6.c (100%)
 rename lib/{librte_rib => rib}/rte_rib6.h (100%)
 rename lib/{librte_rib => rib}/version.map (100%)
 rename lib/{librte_ring => ring}/meson.build (100%)
 rename lib/{librte_ring => ring}/rte_ring.c (100%)
 rename lib/{librte_ring => ring}/rte_ring.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_c11_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_core.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_generic_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_hts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_peek_zc.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts.h (100%)
 rename lib/{librte_ring => ring}/rte_ring_rts_elem_pvt.h (100%)
 rename lib/{librte_ring => ring}/version.map (100%)
 rename lib/{librte_sched => sched}/meson.build (100%)
 rename lib/{librte_sched => sched}/rte_approx.c (100%)
 rename lib/{librte_sched => sched}/rte_approx.h (100%)
 rename lib/{librte_sched => sched}/rte_red.c (100%)
 rename lib/{librte_sched => sched}/rte_red.h (100%)
 rename lib/{librte_sched => sched}/rte_sched.c (100%)
 rename lib/{librte_sched => sched}/rte_sched.h (100%)
 rename lib/{librte_sched => sched}/rte_sched_common.h (100%)
 rename lib/{librte_sched => sched}/version.map (100%)
 rename lib/{librte_security => security}/meson.build (100%)
 rename lib/{librte_security => security}/rte_security.c (100%)
 rename lib/{librte_security => security}/rte_security.h (100%)
 rename lib/{librte_security => security}/rte_security_driver.h (100%)
 rename lib/{librte_security => security}/version.map (100%)
 rename lib/{librte_stack => stack}/meson.build (100%)
 rename lib/{librte_stack => stack}/rte_stack.c (100%)
 rename lib/{librte_stack => stack}/rte_stack.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_c11.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_generic.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_lf_stubs.h (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.c (100%)
 rename lib/{librte_stack => stack}/rte_stack_std.h (100%)
 rename lib/{librte_stack => stack}/stack_pvt.h (100%)
 rename lib/{librte_stack => stack}/version.map (100%)
 rename lib/{librte_table => table}/meson.build (100%)
 rename lib/{librte_table => table}/rte_lru.h (100%)
 rename lib/{librte_table => table}/rte_lru_arm64.h (100%)
 rename lib/{librte_table => table}/rte_lru_x86.h (100%)
 rename lib/{librte_table => table}/rte_swx_table.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_em.h (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.c (100%)
 rename lib/{librte_table => table}/rte_swx_table_wm.h (100%)
 rename lib/{librte_table => table}/rte_table.h (100%)
 rename lib/{librte_table => table}/rte_table_acl.c (100%)
 rename lib/{librte_table => table}/rte_table_acl.h (100%)
 rename lib/{librte_table => table}/rte_table_array.c (100%)
 rename lib/{librte_table => table}/rte_table_array.h (100%)
 rename lib/{librte_table => table}/rte_table_hash.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_cuckoo.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_ext.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_func.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_func_arm64.h (100%)
 rename lib/{librte_table => table}/rte_table_hash_key16.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key32.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_key8.c (100%)
 rename lib/{librte_table => table}/rte_table_hash_lru.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm.h (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.c (100%)
 rename lib/{librte_table => table}/rte_table_lpm_ipv6.h (100%)
 rename lib/{librte_table => table}/rte_table_stub.c (100%)
 rename lib/{librte_table => table}/rte_table_stub.h (100%)
 rename lib/{librte_table => table}/version.map (100%)
 rename lib/{librte_telemetry => telemetry}/meson.build (80%)
 rename lib/{librte_telemetry => telemetry}/rte_telemetry.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.c (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_data.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_internal.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_json.h (100%)
 rename lib/{librte_telemetry => telemetry}/telemetry_legacy.c (100%)
 rename lib/{librte_telemetry => telemetry}/version.map (100%)
 rename lib/{librte_timer => timer}/meson.build (100%)
 rename lib/{librte_timer => timer}/rte_timer.c (100%)
 rename lib/{librte_timer => timer}/rte_timer.h (100%)
 rename lib/{librte_timer => timer}/version.map (100%)
 rename lib/{librte_vhost => vhost}/fd_man.c (100%)
 rename lib/{librte_vhost => vhost}/fd_man.h (100%)
 rename lib/{librte_vhost => vhost}/iotlb.c (100%)
 rename lib/{librte_vhost => vhost}/iotlb.h (100%)
 rename lib/{librte_vhost => vhost}/meson.build (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vdpa_dev.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_async.h (100%)
 rename lib/{librte_vhost => vhost}/rte_vhost_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/socket.c (100%)
 rename lib/{librte_vhost => vhost}/vdpa.c (100%)
 rename lib/{librte_vhost => vhost}/version.map (100%)
 rename lib/{librte_vhost => vhost}/vhost.c (100%)
 rename lib/{librte_vhost => vhost}/vhost.h (100%)
 rename lib/{librte_vhost => vhost}/vhost_crypto.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.c (100%)
 rename lib/{librte_vhost => vhost}/vhost_user.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_crypto.h (100%)
 rename lib/{librte_vhost => vhost}/virtio_net.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2550d950de..6a80ef7fae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -114,8 +114,8 @@ F: .ci/
 ABI Policy & Versioning
 M: Ray Kinsella <mdr@ashroe.eu>
 M: Neil Horman <nhorman@tuxdriver.com>
-F: lib/librte_eal/include/rte_compat.h
-F: lib/librte_eal/include/rte_function_versioning.h
+F: lib/eal/include/rte_compat.h
+F: lib/eal/include/rte_function_versioning.h
 F: doc/guides/contributing/abi_*.rst
 F: doc/guides/rel_notes/deprecation.rst
 F: devtools/check-abi.sh
@@ -145,10 +145,10 @@ Environment Abstraction Layer
 T: git://dpdk.org/dpdk
 
 EAL API and common code
-F: lib/librte_eal/common/
-F: lib/librte_eal/unix/
-F: lib/librte_eal/include/
-F: lib/librte_eal/version.map
+F: lib/eal/common/
+F: lib/eal/unix/
+F: lib/eal/include/
+F: lib/eal/version.map
 F: doc/guides/prog_guide/env_abstraction_layer.rst
 F: app/test/test_alarm.c
 F: app/test/test_atomic.c
@@ -176,24 +176,24 @@ F: app/test/test_version.c
 Trace - EXPERIMENTAL
 M: Jerin Jacob <jerinj@marvell.com>
 M: Sunil Kumar Kori <skori@marvell.com>
-F: lib/librte_eal/include/rte_trace*.h
-F: lib/librte_eal/common/eal_common_trace*.c
-F: lib/librte_eal/common/eal_trace.h
+F: lib/eal/include/rte_trace*.h
+F: lib/eal/common/eal_common_trace*.c
+F: lib/eal/common/eal_trace.h
 F: doc/guides/prog_guide/trace_lib.rst
 F: app/test/test_trace*
 
 Memory Allocation
 M: Anatoly Burakov <anatoly.burakov@intel.com>
-F: lib/librte_eal/include/rte_fbarray.h
-F: lib/librte_eal/include/rte_mem*
-F: lib/librte_eal/include/rte_malloc.h
-F: lib/librte_eal/common/*malloc*
-F: lib/librte_eal/common/eal_common_dynmem.c
-F: lib/librte_eal/common/eal_common_fbarray.c
-F: lib/librte_eal/common/eal_common_mem*
-F: lib/librte_eal/common/eal_hugepages.h
-F: lib/librte_eal/linux/eal_mem*
-F: lib/librte_eal/freebsd/eal_mem*
+F: lib/eal/include/rte_fbarray.h
+F: lib/eal/include/rte_mem*
+F: lib/eal/include/rte_malloc.h
+F: lib/eal/common/*malloc*
+F: lib/eal/common/eal_common_dynmem.c
+F: lib/eal/common/eal_common_fbarray.c
+F: lib/eal/common/eal_common_mem*
+F: lib/eal/common/eal_hugepages.h
+F: lib/eal/linux/eal_mem*
+F: lib/eal/freebsd/eal_mem*
 F: doc/guides/prog_guide/env_abstraction_layer.rst
 F: app/test/test_external_mem.c
 F: app/test/test_func_reentrancy.c
@@ -204,19 +204,19 @@ F: app/test/test_memzone.c
 
 Interrupt Subsystem
 M: Harman Kalra <hkalra@marvell.com>
-F: lib/librte_eal/*/*interrupts.*
+F: lib/eal/*/*interrupts.*
 F: app/test/test_interrupts.c
 
 Keep alive
-F: lib/librte_eal/include/rte_keepalive.h
-F: lib/librte_eal/common/rte_keepalive.c
+F: lib/eal/include/rte_keepalive.h
+F: lib/eal/common/rte_keepalive.c
 F: examples/l2fwd-keepalive/
 F: doc/guides/sample_app_ug/keep_alive.rst
 
 Secondary process
 M: Anatoly Burakov <anatoly.burakov@intel.com>
 K: RTE_PROC_
-F: lib/librte_eal/common/eal_common_proc.c
+F: lib/eal/common/eal_common_proc.c
 F: doc/guides/prog_guide/multi_proc_support.rst
 F: app/test/test_mp_secondary.c
 F: examples/multi_process/
@@ -224,52 +224,52 @@ F: doc/guides/sample_app_ug/multi_process.rst
 
 Service Cores
 M: Harry van Haaren <harry.van.haaren@intel.com>
-F: lib/librte_eal/include/rte_service.h
-F: lib/librte_eal/include/rte_service_component.h
-F: lib/librte_eal/common/rte_service.c
+F: lib/eal/include/rte_service.h
+F: lib/eal/include/rte_service_component.h
+F: lib/eal/common/rte_service.c
 F: doc/guides/prog_guide/service_cores.rst
 F: app/test/test_service_cores.c
 
 Bitops
 M: Joyce Kong <joyce.kong@arm.com>
-F: lib/librte_eal/include/rte_bitops.h
+F: lib/eal/include/rte_bitops.h
 F: app/test/test_bitops.c
 
 Bitmap
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_eal/include/rte_bitmap.h
+F: lib/eal/include/rte_bitmap.h
 F: app/test/test_bitmap.c
 
 MCSlock
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/librte_eal/include/generic/rte_mcslock.h
+F: lib/eal/include/generic/rte_mcslock.h
 F: app/test/test_mcslock.c
 
 Ticketlock
 M: Joyce Kong <joyce.kong@arm.com>
-F: lib/librte_eal/include/generic/rte_ticketlock.h
+F: lib/eal/include/generic/rte_ticketlock.h
 F: app/test/test_ticketlock.c
 
 Pseudo-random Number Generation
 M: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
-F: lib/librte_eal/include/rte_random.h
-F: lib/librte_eal/common/rte_random.c
+F: lib/eal/include/rte_random.h
+F: lib/eal/common/rte_random.c
 F: app/test/test_rand_perf.c
 
 ARM v7
 M: Jan Viktorin <viktorin@rehivetech.com>
 M: Ruifeng Wang <ruifeng.wang@arm.com>
 F: config/arm/
-F: lib/librte_eal/arm/
-X: lib/librte_eal/arm/include/*_64.h
+F: lib/eal/arm/
+X: lib/eal/arm/include/*_64.h
 
 ARM v8
 M: Jerin Jacob <jerinj@marvell.com>
 M: Ruifeng Wang <ruifeng.wang@arm.com>
 F: config/arm/
 F: doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
-F: lib/librte_eal/arm/
-X: lib/librte_eal/arm/include/*_32.h
+F: lib/eal/arm/
+X: lib/eal/arm/include/*_32.h
 F: lib/*/*_arm64.*
 F: lib/*/*_neon.*
 F: drivers/*/*/*_neon.*
@@ -279,7 +279,7 @@ F: examples/*/*_neon.*
 IBM POWER (alpha)
 M: David Christensen <drc@linux.vnet.ibm.com>
 F: config/ppc/
-F: lib/librte_eal/ppc/
+F: lib/eal/ppc/
 F: lib/*/*_altivec*
 F: drivers/*/*/*_altivec.*
 F: app/*/*_altivec.*
@@ -292,7 +292,7 @@ F: config/x86/
 F: doc/guides/linux_gsg/nic_perf_intel_platform.rst
 F: buildtools/binutils-avx512-check.sh
 F: doc/guides/howto/avx512.rst
-F: lib/librte_eal/x86/
+F: lib/eal/x86/
 F: lib/*/*_sse*
 F: lib/*/*_avx*
 F: drivers/*/*/*_sse*
@@ -303,7 +303,7 @@ F: examples/*/*_sse*
 F: examples/*/*_avx*
 
 Linux EAL (with overlaps)
-F: lib/librte_eal/linux/
+F: lib/eal/linux/
 F: doc/guides/linux_gsg/
 
 Linux UIO
@@ -312,12 +312,12 @@ F: drivers/bus/pci/linux/*uio*
 
 Linux VFIO
 M: Anatoly Burakov <anatoly.burakov@intel.com>
-F: lib/librte_eal/linux/*vfio*
+F: lib/eal/linux/*vfio*
 F: drivers/bus/pci/linux/*vfio*
 
 FreeBSD EAL (with overlaps)
 M: Bruce Richardson <bruce.richardson@intel.com>
-F: lib/librte_eal/freebsd/
+F: lib/eal/freebsd/
 F: doc/guides/freebsd_gsg/
 
 FreeBSD contigmem
@@ -333,14 +333,14 @@ M: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
 M: Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>
 M: Dmitry Malloy <dmitrym@microsoft.com>
 M: Pallavi Kadam <pallavi.kadam@intel.com>
-F: lib/librte_eal/windows/
+F: lib/eal/windows/
 F: buildtools/map_to_win.py
 F: doc/guides/windows_gsg/
 
 Windows memory allocation
 M: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
-F: lib/librte_eal/windows/eal_hugepages.c
-F: lib/librte_eal/windows/eal_mem*
+F: lib/eal/windows/eal_hugepages.c
+F: lib/eal/windows/eal_mem*
 
 
 Core Libraries
@@ -350,7 +350,7 @@ T: git://dpdk.org/dpdk
 Memory pool
 M: Olivier Matz <olivier.matz@6wind.com>
 M: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
-F: lib/librte_mempool/
+F: lib/mempool/
 F: drivers/mempool/ring/
 F: doc/guides/prog_guide/mempool_lib.rst
 F: app/test/test_mempool*
@@ -359,21 +359,21 @@ F: app/test/test_func_reentrancy.c
 Ring queue
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_ring/
+F: lib/ring/
 F: doc/guides/prog_guide/ring_lib.rst
 F: app/test/test_ring*
 F: app/test/test_func_reentrancy.c
 
 Stack
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_stack/
+F: lib/stack/
 F: drivers/mempool/stack/
 F: app/test/test_stack*
 F: doc/guides/prog_guide/stack_lib.rst
 
 Packet buffer
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_mbuf/
+F: lib/mbuf/
 F: doc/guides/prog_guide/mbuf_lib.rst
 F: app/test/test_mbuf.c
 
@@ -382,7 +382,7 @@ M: Thomas Monjalon <thomas@monjalon.net>
 M: Ferruh Yigit <ferruh.yigit@intel.com>
 M: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/
+F: lib/ethdev/
 F: app/test/test_ethdev*
 F: devtools/test-null.sh
 F: doc/guides/prog_guide/switch_representation.rst
@@ -392,22 +392,22 @@ M: Ori Kam <orika@nvidia.com>
 T: git://dpdk.org/next/dpdk-next-net
 F: app/test-pmd/cmdline_flow.c
 F: doc/guides/prog_guide/rte_flow.rst
-F: lib/librte_ethdev/rte_flow*
+F: lib/ethdev/rte_flow*
 
 Traffic Management API - EXPERIMENTAL
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/rte_tm*
+F: lib/ethdev/rte_tm*
 
 Traffic Metering and Policing API - EXPERIMENTAL
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 T: git://dpdk.org/next/dpdk-next-net
-F: lib/librte_ethdev/rte_mtr*
+F: lib/ethdev/rte_mtr*
 
 Baseband API - EXPERIMENTAL
 M: Nicolas Chautru <nicolas.chautru@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_bbdev/
+F: lib/bbdev/
 F: doc/guides/prog_guide/bbdev.rst
 F: drivers/baseband/
 F: doc/guides/bbdevs/
@@ -419,7 +419,7 @@ F: doc/guides/sample_app_ug/bbdev_app.rst
 Crypto API
 M: Declan Doherty <declan.doherty@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_cryptodev/
+F: lib/cryptodev/
 F: app/test/test_cryptodev*
 F: examples/l2fwd-crypto/
 
@@ -427,7 +427,7 @@ Security API
 M: Akhil Goyal <gakhil@marvell.com>
 M: Declan Doherty <declan.doherty@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_security/
+F: lib/security/
 F: doc/guides/prog_guide/rte_security.rst
 F: app/test/test_security.c
 
@@ -435,7 +435,7 @@ Compression API - EXPERIMENTAL
 M: Fiona Trahe <fiona.trahe@intel.com>
 M: Ashish Gupta <ashish.gupta@marvell.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_compressdev/
+F: lib/compressdev/
 F: drivers/compress/
 F: app/test/test_compressdev*
 F: doc/guides/prog_guide/compressdev.rst
@@ -443,7 +443,7 @@ F: doc/guides/compressdevs/features/default.ini
 
 RegEx API - EXPERIMENTAL
 M: Ori Kam <orika@nvidia.com>
-F: lib/librte_regexdev/
+F: lib/regexdev/
 F: app/test-regex/
 F: doc/guides/prog_guide/regexdev.rst
 F: doc/guides/regexdevs/features/default.ini
@@ -451,7 +451,7 @@ F: doc/guides/regexdevs/features/default.ini
 Eventdev API
 M: Jerin Jacob <jerinj@marvell.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/
+F: lib/eventdev/
 F: drivers/event/skeleton/
 F: app/test/test_eventdev.c
 F: examples/l3fwd/l3fwd_event*
@@ -459,35 +459,35 @@ F: examples/l3fwd/l3fwd_event*
 Eventdev Ethdev Rx Adapter API
 M: Jay Jayatheerthan <jay.jayatheerthan@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*eth_rx_adapter*
+F: lib/eventdev/*eth_rx_adapter*
 F: app/test/test_event_eth_rx_adapter.c
 F: doc/guides/prog_guide/event_ethernet_rx_adapter.rst
 
 Eventdev Ethdev Tx Adapter API
 M: Jay Jayatheerthan <jay.jayatheerthan@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*eth_tx_adapter*
+F: lib/eventdev/*eth_tx_adapter*
 F: app/test/test_event_eth_tx_adapter.c
 F: doc/guides/prog_guide/event_ethernet_tx_adapter.rst
 
 Eventdev Timer Adapter API
 M: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*timer_adapter*
+F: lib/eventdev/*timer_adapter*
 F: app/test/test_event_timer_adapter.c
 F: doc/guides/prog_guide/event_timer_adapter.rst
 
 Eventdev Crypto Adapter API
 M: Abhinandan Gujjar <abhinandan.gujjar@intel.com>
 T: git://dpdk.org/next/dpdk-next-eventdev
-F: lib/librte_eventdev/*crypto_adapter*
+F: lib/eventdev/*crypto_adapter*
 F: app/test/test_event_crypto_adapter.c
 F: doc/guides/prog_guide/event_crypto_adapter.rst
 
 Raw device API
 M: Nipun Gupta <nipun.gupta@nxp.com>
 M: Hemant Agrawal <hemant.agrawal@nxp.com>
-F: lib/librte_rawdev/
+F: lib/rawdev/
 F: drivers/raw/skeleton/
 F: app/test/test_rawdev.c
 F: doc/guides/prog_guide/rawdev.rst
@@ -561,7 +561,7 @@ F: examples/bond/
 Linux KNI
 M: Ferruh Yigit <ferruh.yigit@intel.com>
 F: kernel/linux/kni/
-F: lib/librte_kni/
+F: lib/kni/
 F: doc/guides/prog_guide/kernel_nic_interface.rst
 F: app/test/test_kni.c
 F: examples/kni/
@@ -913,7 +913,7 @@ Vhost-user
 M: Maxime Coquelin <maxime.coquelin@redhat.com>
 M: Chenbo Xia <chenbo.xia@intel.com>
 T: git://dpdk.org/next/dpdk-next-virtio
-F: lib/librte_vhost/
+F: lib/vhost/
 F: doc/guides/prog_guide/vhost_lib.rst
 F: examples/vhost/
 F: doc/guides/sample_app_ug/vhost.rst
@@ -1307,19 +1307,19 @@ Packet processing
 
 Network headers
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_net/
+F: lib/net/
 
 Packet CRC
 M: Jasvinder Singh <jasvinder.singh@intel.com>
-F: lib/librte_net/net_crc.h
-F: lib/librte_net/rte_net_crc*
-F: lib/librte_net/net_crc_avx512.c
-F: lib/librte_net/net_crc_sse.c
+F: lib/net/net_crc.h
+F: lib/net/rte_net_crc*
+F: lib/net/net_crc_avx512.c
+F: lib/net/net_crc_sse.c
 F: app/test/test_crc.c
 
 IP fragmentation & reassembly
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_ip_frag/
+F: lib/ip_frag/
 F: doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
 F: app/test/test_ipfrag.c
 F: examples/ip_fragmentation/
@@ -1329,18 +1329,18 @@ F: doc/guides/sample_app_ug/ip_reassembly.rst
 
 Generic Receive Offload - EXPERIMENTAL
 M: Jiayu Hu <jiayu.hu@intel.com>
-F: lib/librte_gro/
+F: lib/gro/
 F: doc/guides/prog_guide/generic_receive_offload_lib.rst
 
 Generic Segmentation Offload
 M: Jiayu Hu <jiayu.hu@intel.com>
-F: lib/librte_gso/
+F: lib/gso/
 F: doc/guides/prog_guide/generic_segmentation_offload_lib.rst
 
 IPsec
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
 T: git://dpdk.org/next/dpdk-next-crypto
-F: lib/librte_ipsec/
+F: lib/ipsec/
 M: Bernard Iremonger <bernard.iremonger@intel.com>
 F: app/test/test_ipsec*
 F: doc/guides/prog_guide/ipsec_lib.rst
@@ -1349,7 +1349,7 @@ F: app/test-sad/
 
 Flow Classify - EXPERIMENTAL
 M: Bernard Iremonger <bernard.iremonger@intel.com>
-F: lib/librte_flow_classify/
+F: lib/flow_classify/
 F: app/test/test_flow_classify*
 F: doc/guides/prog_guide/flow_classify_lib.rst
 F: examples/flow_classify/
@@ -1357,7 +1357,7 @@ F: doc/guides/sample_app_ug/flow_classify.rst
 
 Distributor
 M: David Hunt <david.hunt@intel.com>
-F: lib/librte_distributor/
+F: lib/distributor/
 F: doc/guides/prog_guide/packet_distrib_lib.rst
 F: app/test/test_distributor*
 F: examples/distributor/
@@ -1365,7 +1365,7 @@ F: doc/guides/sample_app_ug/dist_app.rst
 
 Reorder
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_reorder/
+F: lib/reorder/
 F: doc/guides/prog_guide/reorder_lib.rst
 F: app/test/test_reorder*
 F: examples/packet_ordering/
@@ -1374,7 +1374,7 @@ F: doc/guides/sample_app_ug/packet_ordering.rst
 Hierarchical scheduler
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
 M: Jasvinder Singh <jasvinder.singh@intel.com>
-F: lib/librte_sched/
+F: lib/sched/
 F: doc/guides/prog_guide/qos_framework.rst
 F: app/test/test_red.c
 F: app/test/test_sched.c
@@ -1383,7 +1383,7 @@ F: doc/guides/sample_app_ug/qos_scheduler.rst
 
 Packet capture
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_pdump/
+F: lib/pdump/
 F: doc/guides/prog_guide/pdump_lib.rst
 F: app/test/test_pdump.*
 F: app/pdump/
@@ -1393,9 +1393,9 @@ F: doc/guides/tools/pdump.rst
 Packet Framework
 ----------------
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_pipeline/
-F: lib/librte_port/
-F: lib/librte_table/
+F: lib/pipeline/
+F: lib/port/
+F: lib/table/
 F: doc/guides/prog_guide/packet_framework.rst
 F: app/test/test_table*
 F: app/test-pipeline/
@@ -1410,7 +1410,7 @@ Algorithms
 
 ACL
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_acl/
+F: lib/acl/
 F: doc/guides/prog_guide/packet_classif_access_ctrl.rst
 F: app/test-acl/
 F: app/test/test_acl.*
@@ -1420,7 +1420,7 @@ F: doc/guides/sample_app_ug/l3_forward_access_ctrl.rst
 EFD
 M: Byron Marohn <byron.marohn@intel.com>
 M: Yipeng Wang <yipeng1.wang@intel.com>
-F: lib/librte_efd/
+F: lib/efd/
 F: doc/guides/prog_guide/efd_lib.rst
 F: app/test/test_efd*
 F: examples/server_node_efd/
@@ -1430,7 +1430,7 @@ Hashes
 M: Yipeng Wang <yipeng1.wang@intel.com>
 M: Sameh Gobriel <sameh.gobriel@intel.com>
 M: Bruce Richardson <bruce.richardson@intel.com>
-F: lib/librte_hash/
+F: lib/hash/
 F: doc/guides/prog_guide/hash_lib.rst
 F: app/test/test_*hash*
 F: app/test/test_func_reentrancy.c
@@ -1438,7 +1438,7 @@ F: app/test/test_func_reentrancy.c
 LPM
 M: Bruce Richardson <bruce.richardson@intel.com>
 M: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
-F: lib/librte_lpm/
+F: lib/lpm/
 F: doc/guides/prog_guide/lpm*
 F: app/test/test_lpm*
 F: app/test/test_func_reentrancy.c
@@ -1447,21 +1447,21 @@ F: app/test/test_xmmt_ops.h
 Membership - EXPERIMENTAL
 M: Yipeng Wang <yipeng1.wang@intel.com>
 M: Sameh Gobriel <sameh.gobriel@intel.com>
-F: lib/librte_member/
+F: lib/member/
 F: doc/guides/prog_guide/member_lib.rst
 F: app/test/test_member*
 
 RIB/FIB - EXPERIMENTAL
 M: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
-F: lib/librte_rib/
+F: lib/rib/
 F: app/test/test_rib*
-F: lib/librte_fib/
+F: lib/fib/
 F: app/test/test_fib*
 F: app/test-fib/
 
 Traffic metering
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_meter/
+F: lib/meter/
 F: doc/guides/sample_app_ug/qos_scheduler.rst
 F: app/test/test_meter.c
 F: examples/qos_meter/
@@ -1473,13 +1473,13 @@ Other libraries
 
 Configuration file
 M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-F: lib/librte_cfgfile/
+F: lib/cfgfile/
 F: app/test/test_cfgfile.c
 F: app/test/test_cfgfiles/
 
 Interactive command line
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_cmdline/
+F: lib/cmdline/
 F: app/test-cmdline/
 F: app/test/test_cmdline*
 F: examples/cmdline/
@@ -1487,22 +1487,22 @@ F: doc/guides/sample_app_ug/cmd_line.rst
 
 Key/Value parsing
 M: Olivier Matz <olivier.matz@6wind.com>
-F: lib/librte_kvargs/
+F: lib/kvargs/
 F: app/test/test_kvargs.c
 
 RCU
 M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/librte_rcu/
+F: lib/rcu/
 F: app/test/test_rcu*
 F: doc/guides/prog_guide/rcu_lib.rst
 
 PCI
 M: Gaetan Rivet <grive@u256.net>
-F: lib/librte_pci/
+F: lib/pci/
 
 Power management
 M: David Hunt <david.hunt@intel.com>
-F: lib/librte_power/
+F: lib/power/
 F: doc/guides/prog_guide/power_man.rst
 F: app/test/test_power*
 F: examples/l3fwd-power/
@@ -1513,40 +1513,40 @@ F: doc/guides/sample_app_ug/vm_power_management.rst
 Timers
 M: Robert Sanford <rsanford@akamai.com>
 M: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
-F: lib/librte_timer/
+F: lib/timer/
 F: doc/guides/prog_guide/timer_lib.rst
 F: app/test/test_timer*
 F: examples/timer/
 F: doc/guides/sample_app_ug/timer.rst
 
 Job statistics
-F: lib/librte_jobstats/
+F: lib/jobstats/
 F: examples/l2fwd-jobstats/
 F: doc/guides/sample_app_ug/l2_forward_job_stats.rst
 
 Metrics
-F: lib/librte_metrics/
+F: lib/metrics/
 F: app/test/test_metrics.c
 
 Bit-rate statistics
-F: lib/librte_bitratestats/
+F: lib/bitratestats/
 F: app/test/test_bitratestats.c
 
 Latency statistics
 M: Reshma Pattan <reshma.pattan@intel.com>
-F: lib/librte_latencystats/
+F: lib/latencystats/
 F: app/test/test_latencystats.c
 
 Telemetry - EXPERIMENTAL
 M: Ciara Power <ciara.power@intel.com>
-F: lib/librte_telemetry/
+F: lib/telemetry/
 F: app/test/test_telemetry*
 F: usertools/dpdk-telemetry*
 F: doc/guides/howto/telemetry.rst
 
 BPF
 M: Konstantin Ananyev <konstantin.ananyev@intel.com>
-F: lib/librte_bpf/
+F: lib/bpf/
 F: examples/bpf/
 F: app/test/test_bpf.c
 F: doc/guides/prog_guide/bpf_lib.rst
@@ -1554,7 +1554,7 @@ F: doc/guides/prog_guide/bpf_lib.rst
 Graph - EXPERIMENTAL
 M: Jerin Jacob <jerinj@marvell.com>
 M: Kiran Kumar K <kirankumark@marvell.com>
-F: lib/librte_graph/
+F: lib/graph/
 F: doc/guides/prog_guide/graph_lib.rst
 F: app/test/test_graph*
 M: Nithin Dabilpuram <ndabilpuram@marvell.com>
@@ -1564,7 +1564,7 @@ F: doc/guides/sample_app_ug/l3_forward_graph.rst
 Nodes - EXPERIMENTAL
 M: Nithin Dabilpuram <ndabilpuram@marvell.com>
 M: Pavan Nikhilesh <pbhagavatula@marvell.com>
-F: lib/librte_node/
+F: lib/node/
 
 
 Test Applications
diff --git a/app/test/test_eal_fs.c b/app/test/test_eal_fs.c
index cae624f82a..bb93b82a43 100644
--- a/app/test/test_eal_fs.c
+++ b/app/test/test_eal_fs.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 /* eal_filesystem.h is not a public header file, so use relative path */
-#include "../../lib/librte_eal/common/eal_filesystem.h"
+#include "../../lib/eal/common/eal_filesystem.h"
 
 static int
 test_parse_sysfs_value(void)
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 0343b0326e..03a9d1d3bb 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -18,7 +18,7 @@
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
-#include "../../lib/librte_eal/common/malloc_elem.h"
+#include "../../lib/eal/common/malloc_elem.h"
 
 #include "test.h"
 
diff --git a/app/test/test_telemetry_json.c b/app/test/test_telemetry_json.c
index 7a91490f4c..3171ab12ec 100644
--- a/app/test/test_telemetry_json.c
+++ b/app/test/test_telemetry_json.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include "../../lib/librte_telemetry/telemetry_json.h"
+#include "../../lib/telemetry/telemetry_json.h"
 #include "test.h"
 
 static int
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 400b80eafc..e840b0af1a 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -7,7 +7,7 @@
 flags_common = [
         # Accelerate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
         # to determine the best threshold in code. Refer to notes in source file
-        # (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
+        # (lib/eal/arm/include/rte_memcpy_64.h) for more info.
         ['RTE_ARCH_ARM64_MEMCPY', false],
         #    ['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
         #    ['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
index 8fa01ad177..0361135d6e 100755
--- a/devtools/build-tags.sh
+++ b/devtools/build-tags.sh
@@ -67,13 +67,13 @@ common_sources()
 
 linux_sources()
 {
-	find_sources "lib/librte_eal/linux" '*.[chS]'
+	find_sources "lib/eal/linux" '*.[chS]'
 	find_sources "kernel/linux" '*.[chS]'
 }
 
 bsd_sources()
 {
-	find_sources "lib/librte_eal/freebsd" '*.[chS]'
+	find_sources "lib/eal/freebsd" '*.[chS]'
 	find_sources "kernel/freebsd" '*.[chS]'
 }
 
@@ -85,14 +85,14 @@ arm_common()
 arm_32_sources()
 {
 	arm_common
-	find_sources "lib/librte_eal/arm" '*.[chS]' \
+	find_sources "lib/eal/arm" '*.[chS]' \
 					"$skip_64b_files"
 }
 
 arm_64_sources()
 {
 	arm_common
-	find_sources "lib/librte_eal/arm" '*.[chS]' \
+	find_sources "lib/eal/arm" '*.[chS]' \
 					 "$skip_32b_files"
 	find_sources "$source_dirs" '*arm64.[chS]'
 }
@@ -108,20 +108,20 @@ x86_common()
 x86_32_sources()
 {
 	x86_common
-	find_sources "lib/librte_eal/x86" '*.[chS]' \
+	find_sources "lib/eal/x86" '*.[chS]' \
 					"$skip_64b_files"
 }
 
 x86_64_sources()
 {
 	x86_common
-	find_sources "lib/librte_eal/x86" '*.[chS]' \
+	find_sources "lib/eal/x86" '*.[chS]' \
 					"$skip_32b_files"
 }
 
 ppc_64_sources()
 {
-	find_sources "lib/librte_eal/ppc" '*.[chS]'
+	find_sources "lib/eal/ppc" '*.[chS]'
 	find_sources "$source_dirs" '*altivec*.[chS]'
 }
 
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 3c7ee4608b..325a0195c6 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -24,58 +24,58 @@ INPUT                   = @TOPDIR@/doc/api/doxy-api-index.md \
                           @TOPDIR@/drivers/raw/dpaa2_qdma \
                           @TOPDIR@/drivers/raw/ifpga \
                           @TOPDIR@/drivers/raw/ioat \
-                          @TOPDIR@/lib/librte_eal/include \
-                          @TOPDIR@/lib/librte_eal/include/generic \
-                          @TOPDIR@/lib/librte_acl \
-                          @TOPDIR@/lib/librte_bbdev \
-                          @TOPDIR@/lib/librte_bitratestats \
-                          @TOPDIR@/lib/librte_bpf \
-                          @TOPDIR@/lib/librte_cfgfile \
-                          @TOPDIR@/lib/librte_cmdline \
-                          @TOPDIR@/lib/librte_compressdev \
-                          @TOPDIR@/lib/librte_cryptodev \
-                          @TOPDIR@/lib/librte_distributor \
-                          @TOPDIR@/lib/librte_efd \
-                          @TOPDIR@/lib/librte_ethdev \
-                          @TOPDIR@/lib/librte_eventdev \
-                          @TOPDIR@/lib/librte_fib \
-                          @TOPDIR@/lib/librte_flow_classify \
-                          @TOPDIR@/lib/librte_graph \
-                          @TOPDIR@/lib/librte_gro \
-                          @TOPDIR@/lib/librte_gso \
-                          @TOPDIR@/lib/librte_hash \
-                          @TOPDIR@/lib/librte_ip_frag \
-                          @TOPDIR@/lib/librte_ipsec \
-                          @TOPDIR@/lib/librte_jobstats \
-                          @TOPDIR@/lib/librte_kni \
-                          @TOPDIR@/lib/librte_kvargs \
-                          @TOPDIR@/lib/librte_latencystats \
-                          @TOPDIR@/lib/librte_lpm \
-                          @TOPDIR@/lib/librte_mbuf \
-                          @TOPDIR@/lib/librte_member \
-                          @TOPDIR@/lib/librte_mempool \
-                          @TOPDIR@/lib/librte_meter \
-                          @TOPDIR@/lib/librte_metrics \
-                          @TOPDIR@/lib/librte_node \
-                          @TOPDIR@/lib/librte_net \
-                          @TOPDIR@/lib/librte_pci \
-                          @TOPDIR@/lib/librte_pdump \
-                          @TOPDIR@/lib/librte_pipeline \
-                          @TOPDIR@/lib/librte_port \
-                          @TOPDIR@/lib/librte_power \
-                          @TOPDIR@/lib/librte_rawdev \
-                          @TOPDIR@/lib/librte_rcu \
-                          @TOPDIR@/lib/librte_regexdev \
-                          @TOPDIR@/lib/librte_reorder \
-                          @TOPDIR@/lib/librte_rib \
-                          @TOPDIR@/lib/librte_ring \
-                          @TOPDIR@/lib/librte_sched \
-                          @TOPDIR@/lib/librte_security \
-                          @TOPDIR@/lib/librte_stack \
-                          @TOPDIR@/lib/librte_table \
-                          @TOPDIR@/lib/librte_telemetry \
-                          @TOPDIR@/lib/librte_timer \
-                          @TOPDIR@/lib/librte_vhost
+                          @TOPDIR@/lib/eal/include \
+                          @TOPDIR@/lib/eal/include/generic \
+                          @TOPDIR@/lib/acl \
+                          @TOPDIR@/lib/bbdev \
+                          @TOPDIR@/lib/bitratestats \
+                          @TOPDIR@/lib/bpf \
+                          @TOPDIR@/lib/cfgfile \
+                          @TOPDIR@/lib/cmdline \
+                          @TOPDIR@/lib/compressdev \
+                          @TOPDIR@/lib/cryptodev \
+                          @TOPDIR@/lib/distributor \
+                          @TOPDIR@/lib/efd \
+                          @TOPDIR@/lib/ethdev \
+                          @TOPDIR@/lib/eventdev \
+                          @TOPDIR@/lib/fib \
+                          @TOPDIR@/lib/flow_classify \
+                          @TOPDIR@/lib/graph \
+                          @TOPDIR@/lib/gro \
+                          @TOPDIR@/lib/gso \
+                          @TOPDIR@/lib/hash \
+                          @TOPDIR@/lib/ip_frag \
+                          @TOPDIR@/lib/ipsec \
+                          @TOPDIR@/lib/jobstats \
+                          @TOPDIR@/lib/kni \
+                          @TOPDIR@/lib/kvargs \
+                          @TOPDIR@/lib/latencystats \
+                          @TOPDIR@/lib/lpm \
+                          @TOPDIR@/lib/mbuf \
+                          @TOPDIR@/lib/member \
+                          @TOPDIR@/lib/mempool \
+                          @TOPDIR@/lib/meter \
+                          @TOPDIR@/lib/metrics \
+                          @TOPDIR@/lib/node \
+                          @TOPDIR@/lib/net \
+                          @TOPDIR@/lib/pci \
+                          @TOPDIR@/lib/pdump \
+                          @TOPDIR@/lib/pipeline \
+                          @TOPDIR@/lib/port \
+                          @TOPDIR@/lib/power \
+                          @TOPDIR@/lib/rawdev \
+                          @TOPDIR@/lib/rcu \
+                          @TOPDIR@/lib/regexdev \
+                          @TOPDIR@/lib/reorder \
+                          @TOPDIR@/lib/rib \
+                          @TOPDIR@/lib/ring \
+                          @TOPDIR@/lib/sched \
+                          @TOPDIR@/lib/security \
+                          @TOPDIR@/lib/stack \
+                          @TOPDIR@/lib/table \
+                          @TOPDIR@/lib/telemetry \
+                          @TOPDIR@/lib/timer \
+                          @TOPDIR@/lib/vhost
 INPUT                   += @API_EXAMPLES@
 FILE_PATTERNS           = rte_*.h \
                           cmdline.h
diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
index 91ada18dd7..7ff18f4f74 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -58,12 +58,12 @@ persists over multiple releases.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_21 {
         global:
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_21 {
         global:
  ...
@@ -77,7 +77,7 @@ that library.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_21 {
         global:
  ...
@@ -88,7 +88,7 @@ that library.
  } DPDK_21;
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_21 {
         global:
  ...
@@ -100,12 +100,12 @@ how this may be done.
 
 .. code-block:: none
 
- $ head ./lib/librte_acl/version.map
+ $ head ./lib/acl/version.map
  DPDK_22 {
         global:
  ...
 
- $ head ./lib/librte_eal/version.map
+ $ head ./lib/eal/version.map
  DPDK_22 {
         global:
  ...
diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index dae1bd3245..7601162c4f 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -759,7 +759,7 @@ Examples:
  * The virtio network PMD in ``drivers/net/virtio`` uses ``pmd.net.virtio``
  * The eventdev software poll mode driver in ``drivers/event/sw`` uses ``pmd.event.sw``
  * The octeontx mempool driver in ``drivers/mempool/octeontx`` uses ``pmd.mempool.octeontx``
- * The DPDK hash library in ``lib/librte_hash`` uses ``lib.hash``
+ * The DPDK hash library in ``lib/hash`` uses ``lib.hash``
 
 Specializations
 ~~~~~~~~~~~~~~~
@@ -926,7 +926,7 @@ name
 	If a library's .so or .a file differs from that given in the directory
 	name, the name should be specified using this variable. In practice,
 	since the convention is that for a library called ``librte_xyz.so``, the
-	sources are stored in a directory ``lib/librte_xyz``, this value should
+	sources are stored in a directory ``lib/xyz``, this value should
 	never be needed for new libraries.
 
 .. note::
diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index a4e6be6aca..842549a4c8 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -19,10 +19,10 @@ The DPDK source code repository contains input files to build the API documentat
 The main directories that contain files related to documentation are shown below::
 
    lib
-   |-- librte_acl
-   |-- librte_cfgfile
-   |-- librte_cmdline
-   |-- librte_eal
+   |-- acl
+   |-- cfgfile
+   |-- cmdline
+   |-- eal
    |   |-- ...
    ...
    doc
@@ -40,7 +40,7 @@ The main directories that contain files related to documentation are shown below
 
 
 The API documentation is built from `Doxygen <http://www.doxygen.nl>`_ comments in the header files.
-These files are mainly in the ``lib/librte_*`` directories although some of the Poll Mode Drivers in ``drivers/net``
+These files are mainly in the ``lib/*`` directories although some of the Poll Mode Drivers in ``drivers/net``
 are also documented with Doxygen.
 
 The configuration files that are used to control the Doxygen output are in the ``doc/api`` directory.
diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst
index 8b18cd169d..7547059a05 100644
--- a/doc/guides/prog_guide/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/event_timer_adapter.rst
@@ -35,7 +35,7 @@ device upon timer expiration.
 
 The Event Timer Adapter API represents each event timer with a generic struct,
 which contains an event and user metadata.  The ``rte_event_timer`` struct is
-defined in ``lib/librte_event/librte_event_timer_adapter.h``.
+defined in ``lib/event/librte_event_timer_adapter.h``.
 
 .. _timer_expiry_event:
 
diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst
index 4e4ea33ccb..7d410d3cc6 100644
--- a/doc/guides/prog_guide/qos_framework.rst
+++ b/doc/guides/prog_guide/qos_framework.rst
@@ -1517,9 +1517,9 @@ Source Files Location
 
 The source files for the DPDK dropper are located at:
 
-*   DPDK/lib/librte_sched/rte_red.h
+*   DPDK/lib/sched/rte_red.h
 
-*   DPDK/lib/librte_sched/rte_red.c
+*   DPDK/lib/sched/rte_red.c
 
 Integration with the DPDK QoS Scheduler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/guides/prog_guide/rawdev.rst b/doc/guides/prog_guide/rawdev.rst
index a712c7fa99..488e0a7ef6 100644
--- a/doc/guides/prog_guide/rawdev.rst
+++ b/doc/guides/prog_guide/rawdev.rst
@@ -13,7 +13,7 @@ In terms of device flavor (type) support, DPDK currently has ethernet
 
 For a new type of device, for example an accelerator, there are not many
 options except:
-1. create another lib/librte_MySpecialDev, driver/MySpecialDrv and use it
+1. create another lib/MySpecialDev, driver/MySpecialDrv and use it
 through Bus/PMD model.
 2. Or, create a vdev and implement necessary custom APIs which are directly
 exposed from driver layer. However this may still require changes in bus code
diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst
index ee3ed1e658..43323e1a43 100644
--- a/doc/guides/rel_notes/known_issues.rst
+++ b/doc/guides/rel_notes/known_issues.rst
@@ -127,7 +127,7 @@ HPET timers do not work on the Osage customer reference platform
    work correctly, provided the BIOS supports HPET.
 
 **Driver/Module**:
-   ``lib/librte_eal/include/rte_cycles.h``
+   ``lib/eal/include/rte_cycles.h``
 
 
 Not all variants of supported NIC types have been used in testing
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 3ca24988fc..7953684cf5 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -206,7 +206,7 @@ if dlopen_ibverbs
     dlopen_sources = files('mlx5_glue.c')
     dlopen_install_dir = [ eal_pmd_path + '-glue' ]
     dlopen_includes = [global_inc]
-    dlopen_includes += include_directories('../../../../lib/librte_eal/include/generic')
+    dlopen_includes += include_directories('../../../../lib/eal/include/generic')
     shared_lib = shared_library(
             dlopen_lib_name,
             dlopen_sources,
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 950f411327..7ecf3aa33d 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
 
-includes += include_directories('../../../lib/librte_vhost')
+includes += include_directories('../../../lib/vhost')
 deps += 'bus_pci'
 sources = files('virtio_cryptodev.c', 'virtio_pci.c',
         'virtio_rxtx.c', 'virtqueue.c')
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index f43860bcbb..c15c78b0b4 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -18,8 +18,8 @@ custom_target('rte_kni',
             'M=' + meson.current_build_dir(),
             'src=' + meson.current_source_dir(),
             'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
-            ' -I' + meson.source_root() + '/lib/librte_eal/include' +
-            ' -I' + meson.source_root() + '/lib/librte_kni' +
+            ' -I' + meson.source_root() + '/lib/eal/include' +
+            ' -I' + meson.source_root() + '/lib/kni' +
             ' -I' + meson.build_root() +
             ' -I' + meson.current_source_dir(),
             'modules'] + cross_args,
diff --git a/lib/librte_acl/acl.h b/lib/acl/acl.h
similarity index 100%
rename from lib/librte_acl/acl.h
rename to lib/acl/acl.h
diff --git a/lib/librte_acl/acl_bld.c b/lib/acl/acl_bld.c
similarity index 100%
rename from lib/librte_acl/acl_bld.c
rename to lib/acl/acl_bld.c
diff --git a/lib/librte_acl/acl_gen.c b/lib/acl/acl_gen.c
similarity index 100%
rename from lib/librte_acl/acl_gen.c
rename to lib/acl/acl_gen.c
diff --git a/lib/librte_acl/acl_run.h b/lib/acl/acl_run.h
similarity index 100%
rename from lib/librte_acl/acl_run.h
rename to lib/acl/acl_run.h
diff --git a/lib/librte_acl/acl_run_altivec.c b/lib/acl/acl_run_altivec.c
similarity index 100%
rename from lib/librte_acl/acl_run_altivec.c
rename to lib/acl/acl_run_altivec.c
diff --git a/lib/librte_acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h
similarity index 100%
rename from lib/librte_acl/acl_run_altivec.h
rename to lib/acl/acl_run_altivec.h
diff --git a/lib/librte_acl/acl_run_avx2.c b/lib/acl/acl_run_avx2.c
similarity index 100%
rename from lib/librte_acl/acl_run_avx2.c
rename to lib/acl/acl_run_avx2.c
diff --git a/lib/librte_acl/acl_run_avx2.h b/lib/acl/acl_run_avx2.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx2.h
rename to lib/acl/acl_run_avx2.h
diff --git a/lib/librte_acl/acl_run_avx512.c b/lib/acl/acl_run_avx512.c
similarity index 100%
rename from lib/librte_acl/acl_run_avx512.c
rename to lib/acl/acl_run_avx512.c
diff --git a/lib/librte_acl/acl_run_avx512_common.h b/lib/acl/acl_run_avx512_common.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512_common.h
rename to lib/acl/acl_run_avx512_common.h
diff --git a/lib/librte_acl/acl_run_avx512x16.h b/lib/acl/acl_run_avx512x16.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512x16.h
rename to lib/acl/acl_run_avx512x16.h
diff --git a/lib/librte_acl/acl_run_avx512x8.h b/lib/acl/acl_run_avx512x8.h
similarity index 100%
rename from lib/librte_acl/acl_run_avx512x8.h
rename to lib/acl/acl_run_avx512x8.h
diff --git a/lib/librte_acl/acl_run_neon.c b/lib/acl/acl_run_neon.c
similarity index 100%
rename from lib/librte_acl/acl_run_neon.c
rename to lib/acl/acl_run_neon.c
diff --git a/lib/librte_acl/acl_run_neon.h b/lib/acl/acl_run_neon.h
similarity index 100%
rename from lib/librte_acl/acl_run_neon.h
rename to lib/acl/acl_run_neon.h
diff --git a/lib/librte_acl/acl_run_scalar.c b/lib/acl/acl_run_scalar.c
similarity index 100%
rename from lib/librte_acl/acl_run_scalar.c
rename to lib/acl/acl_run_scalar.c
diff --git a/lib/librte_acl/acl_run_sse.c b/lib/acl/acl_run_sse.c
similarity index 100%
rename from lib/librte_acl/acl_run_sse.c
rename to lib/acl/acl_run_sse.c
diff --git a/lib/librte_acl/acl_run_sse.h b/lib/acl/acl_run_sse.h
similarity index 100%
rename from lib/librte_acl/acl_run_sse.h
rename to lib/acl/acl_run_sse.h
diff --git a/lib/librte_acl/acl_vect.h b/lib/acl/acl_vect.h
similarity index 100%
rename from lib/librte_acl/acl_vect.h
rename to lib/acl/acl_vect.h
diff --git a/lib/librte_acl/meson.build b/lib/acl/meson.build
similarity index 100%
rename from lib/librte_acl/meson.build
rename to lib/acl/meson.build
diff --git a/lib/librte_acl/rte_acl.c b/lib/acl/rte_acl.c
similarity index 100%
rename from lib/librte_acl/rte_acl.c
rename to lib/acl/rte_acl.c
diff --git a/lib/librte_acl/rte_acl.h b/lib/acl/rte_acl.h
similarity index 100%
rename from lib/librte_acl/rte_acl.h
rename to lib/acl/rte_acl.h
diff --git a/lib/librte_acl/rte_acl_osdep.h b/lib/acl/rte_acl_osdep.h
similarity index 100%
rename from lib/librte_acl/rte_acl_osdep.h
rename to lib/acl/rte_acl_osdep.h
diff --git a/lib/librte_acl/tb_mem.c b/lib/acl/tb_mem.c
similarity index 100%
rename from lib/librte_acl/tb_mem.c
rename to lib/acl/tb_mem.c
diff --git a/lib/librte_acl/tb_mem.h b/lib/acl/tb_mem.h
similarity index 100%
rename from lib/librte_acl/tb_mem.h
rename to lib/acl/tb_mem.h
diff --git a/lib/librte_acl/version.map b/lib/acl/version.map
similarity index 100%
rename from lib/librte_acl/version.map
rename to lib/acl/version.map
diff --git a/lib/librte_bbdev/meson.build b/lib/bbdev/meson.build
similarity index 100%
rename from lib/librte_bbdev/meson.build
rename to lib/bbdev/meson.build
diff --git a/lib/librte_bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev.c
rename to lib/bbdev/rte_bbdev.c
diff --git a/lib/librte_bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev.h
rename to lib/bbdev/rte_bbdev.h
diff --git a/lib/librte_bbdev/rte_bbdev_op.h b/lib/bbdev/rte_bbdev_op.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev_op.h
rename to lib/bbdev/rte_bbdev_op.h
diff --git a/lib/librte_bbdev/rte_bbdev_pmd.h b/lib/bbdev/rte_bbdev_pmd.h
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev_pmd.h
rename to lib/bbdev/rte_bbdev_pmd.h
diff --git a/lib/librte_bbdev/version.map b/lib/bbdev/version.map
similarity index 100%
rename from lib/librte_bbdev/version.map
rename to lib/bbdev/version.map
diff --git a/lib/librte_bitratestats/meson.build b/lib/bitratestats/meson.build
similarity index 100%
rename from lib/librte_bitratestats/meson.build
rename to lib/bitratestats/meson.build
diff --git a/lib/librte_bitratestats/rte_bitrate.c b/lib/bitratestats/rte_bitrate.c
similarity index 100%
rename from lib/librte_bitratestats/rte_bitrate.c
rename to lib/bitratestats/rte_bitrate.c
diff --git a/lib/librte_bitratestats/rte_bitrate.h b/lib/bitratestats/rte_bitrate.h
similarity index 100%
rename from lib/librte_bitratestats/rte_bitrate.h
rename to lib/bitratestats/rte_bitrate.h
diff --git a/lib/librte_bitratestats/version.map b/lib/bitratestats/version.map
similarity index 100%
rename from lib/librte_bitratestats/version.map
rename to lib/bitratestats/version.map
diff --git a/lib/librte_bpf/bpf.c b/lib/bpf/bpf.c
similarity index 100%
rename from lib/librte_bpf/bpf.c
rename to lib/bpf/bpf.c
diff --git a/lib/librte_bpf/bpf_def.h b/lib/bpf/bpf_def.h
similarity index 100%
rename from lib/librte_bpf/bpf_def.h
rename to lib/bpf/bpf_def.h
diff --git a/lib/librte_bpf/bpf_exec.c b/lib/bpf/bpf_exec.c
similarity index 100%
rename from lib/librte_bpf/bpf_exec.c
rename to lib/bpf/bpf_exec.c
diff --git a/lib/librte_bpf/bpf_impl.h b/lib/bpf/bpf_impl.h
similarity index 100%
rename from lib/librte_bpf/bpf_impl.h
rename to lib/bpf/bpf_impl.h
diff --git a/lib/librte_bpf/bpf_jit_arm64.c b/lib/bpf/bpf_jit_arm64.c
similarity index 100%
rename from lib/librte_bpf/bpf_jit_arm64.c
rename to lib/bpf/bpf_jit_arm64.c
diff --git a/lib/librte_bpf/bpf_jit_x86.c b/lib/bpf/bpf_jit_x86.c
similarity index 100%
rename from lib/librte_bpf/bpf_jit_x86.c
rename to lib/bpf/bpf_jit_x86.c
diff --git a/lib/librte_bpf/bpf_load.c b/lib/bpf/bpf_load.c
similarity index 100%
rename from lib/librte_bpf/bpf_load.c
rename to lib/bpf/bpf_load.c
diff --git a/lib/librte_bpf/bpf_load_elf.c b/lib/bpf/bpf_load_elf.c
similarity index 100%
rename from lib/librte_bpf/bpf_load_elf.c
rename to lib/bpf/bpf_load_elf.c
diff --git a/lib/librte_bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c
similarity index 100%
rename from lib/librte_bpf/bpf_pkt.c
rename to lib/bpf/bpf_pkt.c
diff --git a/lib/librte_bpf/bpf_validate.c b/lib/bpf/bpf_validate.c
similarity index 100%
rename from lib/librte_bpf/bpf_validate.c
rename to lib/bpf/bpf_validate.c
diff --git a/lib/librte_bpf/meson.build b/lib/bpf/meson.build
similarity index 100%
rename from lib/librte_bpf/meson.build
rename to lib/bpf/meson.build
diff --git a/lib/librte_bpf/rte_bpf.h b/lib/bpf/rte_bpf.h
similarity index 100%
rename from lib/librte_bpf/rte_bpf.h
rename to lib/bpf/rte_bpf.h
diff --git a/lib/librte_bpf/rte_bpf_ethdev.h b/lib/bpf/rte_bpf_ethdev.h
similarity index 100%
rename from lib/librte_bpf/rte_bpf_ethdev.h
rename to lib/bpf/rte_bpf_ethdev.h
diff --git a/lib/librte_bpf/version.map b/lib/bpf/version.map
similarity index 100%
rename from lib/librte_bpf/version.map
rename to lib/bpf/version.map
diff --git a/lib/librte_cfgfile/meson.build b/lib/cfgfile/meson.build
similarity index 100%
rename from lib/librte_cfgfile/meson.build
rename to lib/cfgfile/meson.build
diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
similarity index 100%
rename from lib/librte_cfgfile/rte_cfgfile.c
rename to lib/cfgfile/rte_cfgfile.c
diff --git a/lib/librte_cfgfile/rte_cfgfile.h b/lib/cfgfile/rte_cfgfile.h
similarity index 100%
rename from lib/librte_cfgfile/rte_cfgfile.h
rename to lib/cfgfile/rte_cfgfile.h
diff --git a/lib/librte_cfgfile/version.map b/lib/cfgfile/version.map
similarity index 100%
rename from lib/librte_cfgfile/version.map
rename to lib/cfgfile/version.map
diff --git a/lib/librte_cmdline/cmdline.c b/lib/cmdline/cmdline.c
similarity index 100%
rename from lib/librte_cmdline/cmdline.c
rename to lib/cmdline/cmdline.c
diff --git a/lib/librte_cmdline/cmdline.h b/lib/cmdline/cmdline.h
similarity index 100%
rename from lib/librte_cmdline/cmdline.h
rename to lib/cmdline/cmdline.h
diff --git a/lib/librte_cmdline/cmdline_cirbuf.c b/lib/cmdline/cmdline_cirbuf.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_cirbuf.c
rename to lib/cmdline/cmdline_cirbuf.c
diff --git a/lib/librte_cmdline/cmdline_cirbuf.h b/lib/cmdline/cmdline_cirbuf.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_cirbuf.h
rename to lib/cmdline/cmdline_cirbuf.h
diff --git a/lib/librte_cmdline/cmdline_os_unix.c b/lib/cmdline/cmdline_os_unix.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_os_unix.c
rename to lib/cmdline/cmdline_os_unix.c
diff --git a/lib/librte_cmdline/cmdline_os_windows.c b/lib/cmdline/cmdline_os_windows.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_os_windows.c
rename to lib/cmdline/cmdline_os_windows.c
diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/cmdline/cmdline_parse.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse.c
rename to lib/cmdline/cmdline_parse.c
diff --git a/lib/librte_cmdline/cmdline_parse.h b/lib/cmdline/cmdline_parse.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse.h
rename to lib/cmdline/cmdline_parse.h
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/cmdline/cmdline_parse_etheraddr.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_etheraddr.c
rename to lib/cmdline/cmdline_parse_etheraddr.c
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.h b/lib/cmdline/cmdline_parse_etheraddr.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_etheraddr.h
rename to lib/cmdline/cmdline_parse_etheraddr.h
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/cmdline/cmdline_parse_ipaddr.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_ipaddr.c
rename to lib/cmdline/cmdline_parse_ipaddr.c
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.h b/lib/cmdline/cmdline_parse_ipaddr.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_ipaddr.h
rename to lib/cmdline/cmdline_parse_ipaddr.h
diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/cmdline/cmdline_parse_num.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_num.c
rename to lib/cmdline/cmdline_parse_num.c
diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/cmdline/cmdline_parse_num.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_num.h
rename to lib/cmdline/cmdline_parse_num.h
diff --git a/lib/librte_cmdline/cmdline_parse_portlist.c b/lib/cmdline/cmdline_parse_portlist.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_portlist.c
rename to lib/cmdline/cmdline_parse_portlist.c
diff --git a/lib/librte_cmdline/cmdline_parse_portlist.h b/lib/cmdline/cmdline_parse_portlist.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_portlist.h
rename to lib/cmdline/cmdline_parse_portlist.h
diff --git a/lib/librte_cmdline/cmdline_parse_string.c b/lib/cmdline/cmdline_parse_string.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_string.c
rename to lib/cmdline/cmdline_parse_string.c
diff --git a/lib/librte_cmdline/cmdline_parse_string.h b/lib/cmdline/cmdline_parse_string.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_parse_string.h
rename to lib/cmdline/cmdline_parse_string.h
diff --git a/lib/librte_cmdline/cmdline_private.h b/lib/cmdline/cmdline_private.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_private.h
rename to lib/cmdline/cmdline_private.h
diff --git a/lib/librte_cmdline/cmdline_rdline.c b/lib/cmdline/cmdline_rdline.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_rdline.c
rename to lib/cmdline/cmdline_rdline.c
diff --git a/lib/librte_cmdline/cmdline_rdline.h b/lib/cmdline/cmdline_rdline.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_rdline.h
rename to lib/cmdline/cmdline_rdline.h
diff --git a/lib/librte_cmdline/cmdline_socket.c b/lib/cmdline/cmdline_socket.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_socket.c
rename to lib/cmdline/cmdline_socket.c
diff --git a/lib/librte_cmdline/cmdline_socket.h b/lib/cmdline/cmdline_socket.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_socket.h
rename to lib/cmdline/cmdline_socket.h
diff --git a/lib/librte_cmdline/cmdline_vt100.c b/lib/cmdline/cmdline_vt100.c
similarity index 100%
rename from lib/librte_cmdline/cmdline_vt100.c
rename to lib/cmdline/cmdline_vt100.c
diff --git a/lib/librte_cmdline/cmdline_vt100.h b/lib/cmdline/cmdline_vt100.h
similarity index 100%
rename from lib/librte_cmdline/cmdline_vt100.h
rename to lib/cmdline/cmdline_vt100.h
diff --git a/lib/librte_cmdline/meson.build b/lib/cmdline/meson.build
similarity index 100%
rename from lib/librte_cmdline/meson.build
rename to lib/cmdline/meson.build
diff --git a/lib/librte_cmdline/version.map b/lib/cmdline/version.map
similarity index 100%
rename from lib/librte_cmdline/version.map
rename to lib/cmdline/version.map
diff --git a/lib/librte_compressdev/meson.build b/lib/compressdev/meson.build
similarity index 100%
rename from lib/librte_compressdev/meson.build
rename to lib/compressdev/meson.build
diff --git a/lib/librte_compressdev/rte_comp.c b/lib/compressdev/rte_comp.c
similarity index 100%
rename from lib/librte_compressdev/rte_comp.c
rename to lib/compressdev/rte_comp.c
diff --git a/lib/librte_compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
similarity index 100%
rename from lib/librte_compressdev/rte_comp.h
rename to lib/compressdev/rte_comp.h
diff --git a/lib/librte_compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev.c
rename to lib/compressdev/rte_compressdev.c
diff --git a/lib/librte_compressdev/rte_compressdev.h b/lib/compressdev/rte_compressdev.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev.h
rename to lib/compressdev/rte_compressdev.h
diff --git a/lib/librte_compressdev/rte_compressdev_internal.h b/lib/compressdev/rte_compressdev_internal.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_internal.h
rename to lib/compressdev/rte_compressdev_internal.h
diff --git a/lib/librte_compressdev/rte_compressdev_pmd.c b/lib/compressdev/rte_compressdev_pmd.c
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_pmd.c
rename to lib/compressdev/rte_compressdev_pmd.c
diff --git a/lib/librte_compressdev/rte_compressdev_pmd.h b/lib/compressdev/rte_compressdev_pmd.h
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_pmd.h
rename to lib/compressdev/rte_compressdev_pmd.h
diff --git a/lib/librte_compressdev/version.map b/lib/compressdev/version.map
similarity index 100%
rename from lib/librte_compressdev/version.map
rename to lib/compressdev/version.map
diff --git a/lib/librte_cryptodev/cryptodev_trace_points.c b/lib/cryptodev/cryptodev_trace_points.c
similarity index 100%
rename from lib/librte_cryptodev/cryptodev_trace_points.c
rename to lib/cryptodev/cryptodev_trace_points.c
diff --git a/lib/librte_cryptodev/meson.build b/lib/cryptodev/meson.build
similarity index 100%
rename from lib/librte_cryptodev/meson.build
rename to lib/cryptodev/meson.build
diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/cryptodev/rte_crypto.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto.h
rename to lib/cryptodev/rte_crypto.h
diff --git a/lib/librte_cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto_asym.h
rename to lib/cryptodev/rte_crypto_asym.h
diff --git a/lib/librte_cryptodev/rte_crypto_sym.h b/lib/cryptodev/rte_crypto_sym.h
similarity index 100%
rename from lib/librte_cryptodev/rte_crypto_sym.h
rename to lib/cryptodev/rte_crypto_sym.h
diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev.c
rename to lib/cryptodev/rte_cryptodev.c
diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev.h
rename to lib/cryptodev/rte_cryptodev.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/cryptodev/rte_cryptodev_pmd.c
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_pmd.c
rename to lib/cryptodev/rte_cryptodev_pmd.c
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/cryptodev/rte_cryptodev_pmd.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_pmd.h
rename to lib/cryptodev/rte_cryptodev_pmd.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_trace.h b/lib/cryptodev/rte_cryptodev_trace.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_trace.h
rename to lib/cryptodev/rte_cryptodev_trace.h
diff --git a/lib/librte_cryptodev/rte_cryptodev_trace_fp.h b/lib/cryptodev/rte_cryptodev_trace_fp.h
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_trace_fp.h
rename to lib/cryptodev/rte_cryptodev_trace_fp.h
diff --git a/lib/librte_cryptodev/version.map b/lib/cryptodev/version.map
similarity index 100%
rename from lib/librte_cryptodev/version.map
rename to lib/cryptodev/version.map
diff --git a/lib/librte_distributor/distributor_private.h b/lib/distributor/distributor_private.h
similarity index 100%
rename from lib/librte_distributor/distributor_private.h
rename to lib/distributor/distributor_private.h
diff --git a/lib/librte_distributor/meson.build b/lib/distributor/meson.build
similarity index 100%
rename from lib/librte_distributor/meson.build
rename to lib/distributor/meson.build
diff --git a/lib/librte_distributor/rte_distributor.c b/lib/distributor/rte_distributor.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor.c
rename to lib/distributor/rte_distributor.c
diff --git a/lib/librte_distributor/rte_distributor.h b/lib/distributor/rte_distributor.h
similarity index 100%
rename from lib/librte_distributor/rte_distributor.h
rename to lib/distributor/rte_distributor.h
diff --git a/lib/librte_distributor/rte_distributor_match_generic.c b/lib/distributor/rte_distributor_match_generic.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_match_generic.c
rename to lib/distributor/rte_distributor_match_generic.c
diff --git a/lib/librte_distributor/rte_distributor_match_sse.c b/lib/distributor/rte_distributor_match_sse.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_match_sse.c
rename to lib/distributor/rte_distributor_match_sse.c
diff --git a/lib/librte_distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c
similarity index 100%
rename from lib/librte_distributor/rte_distributor_single.c
rename to lib/distributor/rte_distributor_single.c
diff --git a/lib/librte_distributor/rte_distributor_single.h b/lib/distributor/rte_distributor_single.h
similarity index 100%
rename from lib/librte_distributor/rte_distributor_single.h
rename to lib/distributor/rte_distributor_single.h
diff --git a/lib/librte_distributor/version.map b/lib/distributor/version.map
similarity index 100%
rename from lib/librte_distributor/version.map
rename to lib/distributor/version.map
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/eal/arm/include/meson.build
similarity index 100%
rename from lib/librte_eal/arm/include/meson.build
rename to lib/eal/arm/include/meson.build
diff --git a/lib/librte_eal/arm/include/rte_atomic.h b/lib/eal/arm/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic.h
rename to lib/eal/arm/include/rte_atomic.h
diff --git a/lib/librte_eal/arm/include/rte_atomic_32.h b/lib/eal/arm/include/rte_atomic_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic_32.h
rename to lib/eal/arm/include/rte_atomic_32.h
diff --git a/lib/librte_eal/arm/include/rte_atomic_64.h b/lib/eal/arm/include/rte_atomic_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_atomic_64.h
rename to lib/eal/arm/include/rte_atomic_64.h
diff --git a/lib/librte_eal/arm/include/rte_byteorder.h b/lib/eal/arm/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_byteorder.h
rename to lib/eal/arm/include/rte_byteorder.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags.h b/lib/eal/arm/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags.h
rename to lib/eal/arm/include/rte_cpuflags.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags_32.h b/lib/eal/arm/include/rte_cpuflags_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags_32.h
rename to lib/eal/arm/include/rte_cpuflags_32.h
diff --git a/lib/librte_eal/arm/include/rte_cpuflags_64.h b/lib/eal/arm/include/rte_cpuflags_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cpuflags_64.h
rename to lib/eal/arm/include/rte_cpuflags_64.h
diff --git a/lib/librte_eal/arm/include/rte_cycles.h b/lib/eal/arm/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles.h
rename to lib/eal/arm/include/rte_cycles.h
diff --git a/lib/librte_eal/arm/include/rte_cycles_32.h b/lib/eal/arm/include/rte_cycles_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles_32.h
rename to lib/eal/arm/include/rte_cycles_32.h
diff --git a/lib/librte_eal/arm/include/rte_cycles_64.h b/lib/eal/arm/include/rte_cycles_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_cycles_64.h
rename to lib/eal/arm/include/rte_cycles_64.h
diff --git a/lib/librte_eal/arm/include/rte_io.h b/lib/eal/arm/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_io.h
rename to lib/eal/arm/include/rte_io.h
diff --git a/lib/librte_eal/arm/include/rte_io_64.h b/lib/eal/arm/include/rte_io_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_io_64.h
rename to lib/eal/arm/include/rte_io_64.h
diff --git a/lib/librte_eal/arm/include/rte_mcslock.h b/lib/eal/arm/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_mcslock.h
rename to lib/eal/arm/include/rte_mcslock.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy.h b/lib/eal/arm/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy.h
rename to lib/eal/arm/include/rte_memcpy.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy_32.h b/lib/eal/arm/include/rte_memcpy_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy_32.h
rename to lib/eal/arm/include/rte_memcpy_32.h
diff --git a/lib/librte_eal/arm/include/rte_memcpy_64.h b/lib/eal/arm/include/rte_memcpy_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_memcpy_64.h
rename to lib/eal/arm/include/rte_memcpy_64.h
diff --git a/lib/librte_eal/arm/include/rte_pause.h b/lib/eal/arm/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause.h
rename to lib/eal/arm/include/rte_pause.h
diff --git a/lib/librte_eal/arm/include/rte_pause_32.h b/lib/eal/arm/include/rte_pause_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause_32.h
rename to lib/eal/arm/include/rte_pause_32.h
diff --git a/lib/librte_eal/arm/include/rte_pause_64.h b/lib/eal/arm/include/rte_pause_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pause_64.h
rename to lib/eal/arm/include/rte_pause_64.h
diff --git a/lib/librte_eal/arm/include/rte_pflock.h b/lib/eal/arm/include/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_pflock.h
rename to lib/eal/arm/include/rte_pflock.h
diff --git a/lib/librte_eal/arm/include/rte_power_intrinsics.h b/lib/eal/arm/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_power_intrinsics.h
rename to lib/eal/arm/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch.h b/lib/eal/arm/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch.h
rename to lib/eal/arm/include/rte_prefetch.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch_32.h b/lib/eal/arm/include/rte_prefetch_32.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch_32.h
rename to lib/eal/arm/include/rte_prefetch_32.h
diff --git a/lib/librte_eal/arm/include/rte_prefetch_64.h b/lib/eal/arm/include/rte_prefetch_64.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_prefetch_64.h
rename to lib/eal/arm/include/rte_prefetch_64.h
diff --git a/lib/librte_eal/arm/include/rte_rwlock.h b/lib/eal/arm/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_rwlock.h
rename to lib/eal/arm/include/rte_rwlock.h
diff --git a/lib/librte_eal/arm/include/rte_spinlock.h b/lib/eal/arm/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_spinlock.h
rename to lib/eal/arm/include/rte_spinlock.h
diff --git a/lib/librte_eal/arm/include/rte_ticketlock.h b/lib/eal/arm/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_ticketlock.h
rename to lib/eal/arm/include/rte_ticketlock.h
diff --git a/lib/librte_eal/arm/include/rte_vect.h b/lib/eal/arm/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/arm/include/rte_vect.h
rename to lib/eal/arm/include/rte_vect.h
diff --git a/lib/librte_eal/arm/meson.build b/lib/eal/arm/meson.build
similarity index 100%
rename from lib/librte_eal/arm/meson.build
rename to lib/eal/arm/meson.build
diff --git a/lib/librte_eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/arm/rte_cpuflags.c
rename to lib/eal/arm/rte_cpuflags.c
diff --git a/lib/librte_eal/arm/rte_cycles.c b/lib/eal/arm/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/arm/rte_cycles.c
rename to lib/eal/arm/rte_cycles.c
diff --git a/lib/librte_eal/arm/rte_hypervisor.c b/lib/eal/arm/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/arm/rte_hypervisor.c
rename to lib/eal/arm/rte_hypervisor.c
diff --git a/lib/librte_eal/arm/rte_power_intrinsics.c b/lib/eal/arm/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/arm/rte_power_intrinsics.c
rename to lib/eal/arm/rte_power_intrinsics.c
diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/eal/common/eal_common_bus.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_bus.c
rename to lib/eal/common/eal_common_bus.c
diff --git a/lib/librte_eal/common/eal_common_class.c b/lib/eal/common/eal_common_class.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_class.c
rename to lib/eal/common/eal_common_class.c
diff --git a/lib/librte_eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_config.c
rename to lib/eal/common/eal_common_config.c
diff --git a/lib/librte_eal/common/eal_common_cpuflags.c b/lib/eal/common/eal_common_cpuflags.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_cpuflags.c
rename to lib/eal/common/eal_common_cpuflags.c
diff --git a/lib/librte_eal/common/eal_common_debug.c b/lib/eal/common/eal_common_debug.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_debug.c
rename to lib/eal/common/eal_common_debug.c
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_dev.c
rename to lib/eal/common/eal_common_dev.c
diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_devargs.c
rename to lib/eal/common/eal_common_devargs.c
diff --git a/lib/librte_eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_dynmem.c
rename to lib/eal/common/eal_common_dynmem.c
diff --git a/lib/librte_eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_errno.c
rename to lib/eal/common/eal_common_errno.c
diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_fbarray.c
rename to lib/eal/common/eal_common_fbarray.c
diff --git a/lib/librte_eal/common/eal_common_hexdump.c b/lib/eal/common/eal_common_hexdump.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_hexdump.c
rename to lib/eal/common/eal_common_hexdump.c
diff --git a/lib/librte_eal/common/eal_common_hypervisor.c b/lib/eal/common/eal_common_hypervisor.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_hypervisor.c
rename to lib/eal/common/eal_common_hypervisor.c
diff --git a/lib/librte_eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_launch.c
rename to lib/eal/common/eal_common_launch.c
diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_lcore.c
rename to lib/eal/common/eal_common_lcore.c
diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_log.c
rename to lib/eal/common/eal_common_log.c
diff --git a/lib/librte_eal/common/eal_common_mcfg.c b/lib/eal/common/eal_common_mcfg.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_mcfg.c
rename to lib/eal/common/eal_common_mcfg.c
diff --git a/lib/librte_eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memalloc.c
rename to lib/eal/common/eal_common_memalloc.c
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memory.c
rename to lib/eal/common/eal_common_memory.c
diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_memzone.c
rename to lib/eal/common/eal_common_memzone.c
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_options.c
rename to lib/eal/common/eal_common_options.c
diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_proc.c
rename to lib/eal/common/eal_common_proc.c
diff --git a/lib/librte_eal/common/eal_common_string_fns.c b/lib/eal/common/eal_common_string_fns.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_string_fns.c
rename to lib/eal/common/eal_common_string_fns.c
diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/eal/common/eal_common_tailqs.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_tailqs.c
rename to lib/eal/common/eal_common_tailqs.c
diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_thread.c
rename to lib/eal/common/eal_common_thread.c
diff --git a/lib/librte_eal/common/eal_common_timer.c b/lib/eal/common/eal_common_timer.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_timer.c
rename to lib/eal/common/eal_common_timer.c
diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace.c
rename to lib/eal/common/eal_common_trace.c
diff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/eal/common/eal_common_trace_ctf.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_ctf.c
rename to lib/eal/common/eal_common_trace_ctf.c
diff --git a/lib/librte_eal/common/eal_common_trace_points.c b/lib/eal/common/eal_common_trace_points.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_points.c
rename to lib/eal/common/eal_common_trace_points.c
diff --git a/lib/librte_eal/common/eal_common_trace_utils.c b/lib/eal/common/eal_common_trace_utils.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_trace_utils.c
rename to lib/eal/common/eal_common_trace_utils.c
diff --git a/lib/librte_eal/common/eal_common_uuid.c b/lib/eal/common/eal_common_uuid.c
similarity index 100%
rename from lib/librte_eal/common/eal_common_uuid.c
rename to lib/eal/common/eal_common_uuid.c
diff --git a/lib/librte_eal/common/eal_filesystem.h b/lib/eal/common/eal_filesystem.h
similarity index 100%
rename from lib/librte_eal/common/eal_filesystem.h
rename to lib/eal/common/eal_filesystem.h
diff --git a/lib/librte_eal/common/eal_hugepages.h b/lib/eal/common/eal_hugepages.h
similarity index 100%
rename from lib/librte_eal/common/eal_hugepages.h
rename to lib/eal/common/eal_hugepages.h
diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h
similarity index 100%
rename from lib/librte_eal/common/eal_internal_cfg.h
rename to lib/eal/common/eal_internal_cfg.h
diff --git a/lib/librte_eal/common/eal_log.h b/lib/eal/common/eal_log.h
similarity index 100%
rename from lib/librte_eal/common/eal_log.h
rename to lib/eal/common/eal_log.h
diff --git a/lib/librte_eal/common/eal_memalloc.h b/lib/eal/common/eal_memalloc.h
similarity index 100%
rename from lib/librte_eal/common/eal_memalloc.h
rename to lib/eal/common/eal_memalloc.h
diff --git a/lib/librte_eal/common/eal_memcfg.h b/lib/eal/common/eal_memcfg.h
similarity index 100%
rename from lib/librte_eal/common/eal_memcfg.h
rename to lib/eal/common/eal_memcfg.h
diff --git a/lib/librte_eal/common/eal_options.h b/lib/eal/common/eal_options.h
similarity index 100%
rename from lib/librte_eal/common/eal_options.h
rename to lib/eal/common/eal_options.h
diff --git a/lib/librte_eal/common/eal_private.h b/lib/eal/common/eal_private.h
similarity index 100%
rename from lib/librte_eal/common/eal_private.h
rename to lib/eal/common/eal_private.h
diff --git a/lib/librte_eal/common/eal_thread.h b/lib/eal/common/eal_thread.h
similarity index 100%
rename from lib/librte_eal/common/eal_thread.h
rename to lib/eal/common/eal_thread.h
diff --git a/lib/librte_eal/common/eal_trace.h b/lib/eal/common/eal_trace.h
similarity index 100%
rename from lib/librte_eal/common/eal_trace.h
rename to lib/eal/common/eal_trace.h
diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/eal/common/hotplug_mp.c
similarity index 100%
rename from lib/librte_eal/common/hotplug_mp.c
rename to lib/eal/common/hotplug_mp.c
diff --git a/lib/librte_eal/common/hotplug_mp.h b/lib/eal/common/hotplug_mp.h
similarity index 100%
rename from lib/librte_eal/common/hotplug_mp.h
rename to lib/eal/common/hotplug_mp.h
diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c
similarity index 100%
rename from lib/librte_eal/common/malloc_elem.c
rename to lib/eal/common/malloc_elem.c
diff --git a/lib/librte_eal/common/malloc_elem.h b/lib/eal/common/malloc_elem.h
similarity index 100%
rename from lib/librte_eal/common/malloc_elem.h
rename to lib/eal/common/malloc_elem.h
diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
similarity index 100%
rename from lib/librte_eal/common/malloc_heap.c
rename to lib/eal/common/malloc_heap.c
diff --git a/lib/librte_eal/common/malloc_heap.h b/lib/eal/common/malloc_heap.h
similarity index 100%
rename from lib/librte_eal/common/malloc_heap.h
rename to lib/eal/common/malloc_heap.h
diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
similarity index 100%
rename from lib/librte_eal/common/malloc_mp.c
rename to lib/eal/common/malloc_mp.c
diff --git a/lib/librte_eal/common/malloc_mp.h b/lib/eal/common/malloc_mp.h
similarity index 100%
rename from lib/librte_eal/common/malloc_mp.h
rename to lib/eal/common/malloc_mp.h
diff --git a/lib/librte_eal/common/meson.build b/lib/eal/common/meson.build
similarity index 100%
rename from lib/librte_eal/common/meson.build
rename to lib/eal/common/meson.build
diff --git a/lib/librte_eal/common/rte_keepalive.c b/lib/eal/common/rte_keepalive.c
similarity index 100%
rename from lib/librte_eal/common/rte_keepalive.c
rename to lib/eal/common/rte_keepalive.c
diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
similarity index 100%
rename from lib/librte_eal/common/rte_malloc.c
rename to lib/eal/common/rte_malloc.c
diff --git a/lib/librte_eal/common/rte_random.c b/lib/eal/common/rte_random.c
similarity index 100%
rename from lib/librte_eal/common/rte_random.c
rename to lib/eal/common/rte_random.c
diff --git a/lib/librte_eal/common/rte_reciprocal.c b/lib/eal/common/rte_reciprocal.c
similarity index 100%
rename from lib/librte_eal/common/rte_reciprocal.c
rename to lib/eal/common/rte_reciprocal.c
diff --git a/lib/librte_eal/common/rte_service.c b/lib/eal/common/rte_service.c
similarity index 100%
rename from lib/librte_eal/common/rte_service.c
rename to lib/eal/common/rte_service.c
diff --git a/lib/librte_eal/common/rte_version.c b/lib/eal/common/rte_version.c
similarity index 100%
rename from lib/librte_eal/common/rte_version.c
rename to lib/eal/common/rte_version.c
diff --git a/lib/librte_eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal.c
rename to lib/eal/freebsd/eal.c
diff --git a/lib/librte_eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_alarm.c
rename to lib/eal/freebsd/eal_alarm.c
diff --git a/lib/librte_eal/freebsd/eal_alarm_private.h b/lib/eal/freebsd/eal_alarm_private.h
similarity index 100%
rename from lib/librte_eal/freebsd/eal_alarm_private.h
rename to lib/eal/freebsd/eal_alarm_private.h
diff --git a/lib/librte_eal/freebsd/eal_cpuflags.c b/lib/eal/freebsd/eal_cpuflags.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_cpuflags.c
rename to lib/eal/freebsd/eal_cpuflags.c
diff --git a/lib/librte_eal/freebsd/eal_debug.c b/lib/eal/freebsd/eal_debug.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_debug.c
rename to lib/eal/freebsd/eal_debug.c
diff --git a/lib/librte_eal/freebsd/eal_dev.c b/lib/eal/freebsd/eal_dev.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_dev.c
rename to lib/eal/freebsd/eal_dev.c
diff --git a/lib/librte_eal/freebsd/eal_hugepage_info.c b/lib/eal/freebsd/eal_hugepage_info.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_hugepage_info.c
rename to lib/eal/freebsd/eal_hugepage_info.c
diff --git a/lib/librte_eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_interrupts.c
rename to lib/eal/freebsd/eal_interrupts.c
diff --git a/lib/librte_eal/freebsd/eal_lcore.c b/lib/eal/freebsd/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_lcore.c
rename to lib/eal/freebsd/eal_lcore.c
diff --git a/lib/librte_eal/freebsd/eal_memalloc.c b/lib/eal/freebsd/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_memalloc.c
rename to lib/eal/freebsd/eal_memalloc.c
diff --git a/lib/librte_eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_memory.c
rename to lib/eal/freebsd/eal_memory.c
diff --git a/lib/librte_eal/freebsd/eal_thread.c b/lib/eal/freebsd/eal_thread.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_thread.c
rename to lib/eal/freebsd/eal_thread.c
diff --git a/lib/librte_eal/freebsd/eal_timer.c b/lib/eal/freebsd/eal_timer.c
similarity index 100%
rename from lib/librte_eal/freebsd/eal_timer.c
rename to lib/eal/freebsd/eal_timer.c
diff --git a/lib/librte_eal/freebsd/include/meson.build b/lib/eal/freebsd/include/meson.build
similarity index 100%
rename from lib/librte_eal/freebsd/include/meson.build
rename to lib/eal/freebsd/include/meson.build
diff --git a/lib/librte_eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/freebsd/include/rte_os.h
rename to lib/eal/freebsd/include/rte_os.h
diff --git a/lib/librte_eal/freebsd/include/rte_os_shim.h b/lib/eal/freebsd/include/rte_os_shim.h
similarity index 100%
rename from lib/librte_eal/freebsd/include/rte_os_shim.h
rename to lib/eal/freebsd/include/rte_os_shim.h
diff --git a/lib/librte_eal/freebsd/meson.build b/lib/eal/freebsd/meson.build
similarity index 100%
rename from lib/librte_eal/freebsd/meson.build
rename to lib/eal/freebsd/meson.build
diff --git a/lib/librte_eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_atomic.h
rename to lib/eal/include/generic/rte_atomic.h
diff --git a/lib/librte_eal/include/generic/rte_byteorder.h b/lib/eal/include/generic/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_byteorder.h
rename to lib/eal/include/generic/rte_byteorder.h
diff --git a/lib/librte_eal/include/generic/rte_cpuflags.h b/lib/eal/include/generic/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_cpuflags.h
rename to lib/eal/include/generic/rte_cpuflags.h
diff --git a/lib/librte_eal/include/generic/rte_cycles.h b/lib/eal/include/generic/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_cycles.h
rename to lib/eal/include/generic/rte_cycles.h
diff --git a/lib/librte_eal/include/generic/rte_io.h b/lib/eal/include/generic/rte_io.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_io.h
rename to lib/eal/include/generic/rte_io.h
diff --git a/lib/librte_eal/include/generic/rte_mcslock.h b/lib/eal/include/generic/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_mcslock.h
rename to lib/eal/include/generic/rte_mcslock.h
diff --git a/lib/librte_eal/include/generic/rte_memcpy.h b/lib/eal/include/generic/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_memcpy.h
rename to lib/eal/include/generic/rte_memcpy.h
diff --git a/lib/librte_eal/include/generic/rte_pause.h b/lib/eal/include/generic/rte_pause.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_pause.h
rename to lib/eal/include/generic/rte_pause.h
diff --git a/lib/librte_eal/include/generic/rte_pflock.h b/lib/eal/include/generic/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_pflock.h
rename to lib/eal/include/generic/rte_pflock.h
diff --git a/lib/librte_eal/include/generic/rte_power_intrinsics.h b/lib/eal/include/generic/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_power_intrinsics.h
rename to lib/eal/include/generic/rte_power_intrinsics.h
diff --git a/lib/librte_eal/include/generic/rte_prefetch.h b/lib/eal/include/generic/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_prefetch.h
rename to lib/eal/include/generic/rte_prefetch.h
diff --git a/lib/librte_eal/include/generic/rte_rwlock.h b/lib/eal/include/generic/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_rwlock.h
rename to lib/eal/include/generic/rte_rwlock.h
diff --git a/lib/librte_eal/include/generic/rte_spinlock.h b/lib/eal/include/generic/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_spinlock.h
rename to lib/eal/include/generic/rte_spinlock.h
diff --git a/lib/librte_eal/include/generic/rte_ticketlock.h b/lib/eal/include/generic/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_ticketlock.h
rename to lib/eal/include/generic/rte_ticketlock.h
diff --git a/lib/librte_eal/include/generic/rte_vect.h b/lib/eal/include/generic/rte_vect.h
similarity index 100%
rename from lib/librte_eal/include/generic/rte_vect.h
rename to lib/eal/include/generic/rte_vect.h
diff --git a/lib/librte_eal/include/meson.build b/lib/eal/include/meson.build
similarity index 100%
rename from lib/librte_eal/include/meson.build
rename to lib/eal/include/meson.build
diff --git a/lib/librte_eal/include/rte_alarm.h b/lib/eal/include/rte_alarm.h
similarity index 100%
rename from lib/librte_eal/include/rte_alarm.h
rename to lib/eal/include/rte_alarm.h
diff --git a/lib/librte_eal/include/rte_bitmap.h b/lib/eal/include/rte_bitmap.h
similarity index 100%
rename from lib/librte_eal/include/rte_bitmap.h
rename to lib/eal/include/rte_bitmap.h
diff --git a/lib/librte_eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
similarity index 100%
rename from lib/librte_eal/include/rte_bitops.h
rename to lib/eal/include/rte_bitops.h
diff --git a/lib/librte_eal/include/rte_branch_prediction.h b/lib/eal/include/rte_branch_prediction.h
similarity index 100%
rename from lib/librte_eal/include/rte_branch_prediction.h
rename to lib/eal/include/rte_branch_prediction.h
diff --git a/lib/librte_eal/include/rte_bus.h b/lib/eal/include/rte_bus.h
similarity index 100%
rename from lib/librte_eal/include/rte_bus.h
rename to lib/eal/include/rte_bus.h
diff --git a/lib/librte_eal/include/rte_class.h b/lib/eal/include/rte_class.h
similarity index 100%
rename from lib/librte_eal/include/rte_class.h
rename to lib/eal/include/rte_class.h
diff --git a/lib/librte_eal/include/rte_common.h b/lib/eal/include/rte_common.h
similarity index 100%
rename from lib/librte_eal/include/rte_common.h
rename to lib/eal/include/rte_common.h
diff --git a/lib/librte_eal/include/rte_compat.h b/lib/eal/include/rte_compat.h
similarity index 100%
rename from lib/librte_eal/include/rte_compat.h
rename to lib/eal/include/rte_compat.h
diff --git a/lib/librte_eal/include/rte_debug.h b/lib/eal/include/rte_debug.h
similarity index 100%
rename from lib/librte_eal/include/rte_debug.h
rename to lib/eal/include/rte_debug.h
diff --git a/lib/librte_eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
similarity index 100%
rename from lib/librte_eal/include/rte_dev.h
rename to lib/eal/include/rte_dev.h
diff --git a/lib/librte_eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h
similarity index 100%
rename from lib/librte_eal/include/rte_devargs.h
rename to lib/eal/include/rte_devargs.h
diff --git a/lib/librte_eal/include/rte_eal.h b/lib/eal/include/rte_eal.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal.h
rename to lib/eal/include/rte_eal.h
diff --git a/lib/librte_eal/include/rte_eal_interrupts.h b/lib/eal/include/rte_eal_interrupts.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_interrupts.h
rename to lib/eal/include/rte_eal_interrupts.h
diff --git a/lib/librte_eal/include/rte_eal_memconfig.h b/lib/eal/include/rte_eal_memconfig.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_memconfig.h
rename to lib/eal/include/rte_eal_memconfig.h
diff --git a/lib/librte_eal/include/rte_eal_paging.h b/lib/eal/include/rte_eal_paging.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_paging.h
rename to lib/eal/include/rte_eal_paging.h
diff --git a/lib/librte_eal/include/rte_eal_trace.h b/lib/eal/include/rte_eal_trace.h
similarity index 100%
rename from lib/librte_eal/include/rte_eal_trace.h
rename to lib/eal/include/rte_eal_trace.h
diff --git a/lib/librte_eal/include/rte_errno.h b/lib/eal/include/rte_errno.h
similarity index 100%
rename from lib/librte_eal/include/rte_errno.h
rename to lib/eal/include/rte_errno.h
diff --git a/lib/librte_eal/include/rte_fbarray.h b/lib/eal/include/rte_fbarray.h
similarity index 100%
rename from lib/librte_eal/include/rte_fbarray.h
rename to lib/eal/include/rte_fbarray.h
diff --git a/lib/librte_eal/include/rte_function_versioning.h b/lib/eal/include/rte_function_versioning.h
similarity index 100%
rename from lib/librte_eal/include/rte_function_versioning.h
rename to lib/eal/include/rte_function_versioning.h
diff --git a/lib/librte_eal/include/rte_hexdump.h b/lib/eal/include/rte_hexdump.h
similarity index 100%
rename from lib/librte_eal/include/rte_hexdump.h
rename to lib/eal/include/rte_hexdump.h
diff --git a/lib/librte_eal/include/rte_hypervisor.h b/lib/eal/include/rte_hypervisor.h
similarity index 100%
rename from lib/librte_eal/include/rte_hypervisor.h
rename to lib/eal/include/rte_hypervisor.h
diff --git a/lib/librte_eal/include/rte_interrupts.h b/lib/eal/include/rte_interrupts.h
similarity index 100%
rename from lib/librte_eal/include/rte_interrupts.h
rename to lib/eal/include/rte_interrupts.h
diff --git a/lib/librte_eal/include/rte_keepalive.h b/lib/eal/include/rte_keepalive.h
similarity index 100%
rename from lib/librte_eal/include/rte_keepalive.h
rename to lib/eal/include/rte_keepalive.h
diff --git a/lib/librte_eal/include/rte_launch.h b/lib/eal/include/rte_launch.h
similarity index 100%
rename from lib/librte_eal/include/rte_launch.h
rename to lib/eal/include/rte_launch.h
diff --git a/lib/librte_eal/include/rte_lcore.h b/lib/eal/include/rte_lcore.h
similarity index 100%
rename from lib/librte_eal/include/rte_lcore.h
rename to lib/eal/include/rte_lcore.h
diff --git a/lib/librte_eal/include/rte_log.h b/lib/eal/include/rte_log.h
similarity index 100%
rename from lib/librte_eal/include/rte_log.h
rename to lib/eal/include/rte_log.h
diff --git a/lib/librte_eal/include/rte_malloc.h b/lib/eal/include/rte_malloc.h
similarity index 100%
rename from lib/librte_eal/include/rte_malloc.h
rename to lib/eal/include/rte_malloc.h
diff --git a/lib/librte_eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
similarity index 100%
rename from lib/librte_eal/include/rte_memory.h
rename to lib/eal/include/rte_memory.h
diff --git a/lib/librte_eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
similarity index 100%
rename from lib/librte_eal/include/rte_memzone.h
rename to lib/eal/include/rte_memzone.h
diff --git a/lib/librte_eal/include/rte_pci_dev_feature_defs.h b/lib/eal/include/rte_pci_dev_feature_defs.h
similarity index 100%
rename from lib/librte_eal/include/rte_pci_dev_feature_defs.h
rename to lib/eal/include/rte_pci_dev_feature_defs.h
diff --git a/lib/librte_eal/include/rte_pci_dev_features.h b/lib/eal/include/rte_pci_dev_features.h
similarity index 100%
rename from lib/librte_eal/include/rte_pci_dev_features.h
rename to lib/eal/include/rte_pci_dev_features.h
diff --git a/lib/librte_eal/include/rte_per_lcore.h b/lib/eal/include/rte_per_lcore.h
similarity index 100%
rename from lib/librte_eal/include/rte_per_lcore.h
rename to lib/eal/include/rte_per_lcore.h
diff --git a/lib/librte_eal/include/rte_random.h b/lib/eal/include/rte_random.h
similarity index 100%
rename from lib/librte_eal/include/rte_random.h
rename to lib/eal/include/rte_random.h
diff --git a/lib/librte_eal/include/rte_reciprocal.h b/lib/eal/include/rte_reciprocal.h
similarity index 100%
rename from lib/librte_eal/include/rte_reciprocal.h
rename to lib/eal/include/rte_reciprocal.h
diff --git a/lib/librte_eal/include/rte_service.h b/lib/eal/include/rte_service.h
similarity index 100%
rename from lib/librte_eal/include/rte_service.h
rename to lib/eal/include/rte_service.h
diff --git a/lib/librte_eal/include/rte_service_component.h b/lib/eal/include/rte_service_component.h
similarity index 100%
rename from lib/librte_eal/include/rte_service_component.h
rename to lib/eal/include/rte_service_component.h
diff --git a/lib/librte_eal/include/rte_string_fns.h b/lib/eal/include/rte_string_fns.h
similarity index 100%
rename from lib/librte_eal/include/rte_string_fns.h
rename to lib/eal/include/rte_string_fns.h
diff --git a/lib/librte_eal/include/rte_tailq.h b/lib/eal/include/rte_tailq.h
similarity index 100%
rename from lib/librte_eal/include/rte_tailq.h
rename to lib/eal/include/rte_tailq.h
diff --git a/lib/librte_eal/include/rte_test.h b/lib/eal/include/rte_test.h
similarity index 100%
rename from lib/librte_eal/include/rte_test.h
rename to lib/eal/include/rte_test.h
diff --git a/lib/librte_eal/include/rte_thread.h b/lib/eal/include/rte_thread.h
similarity index 100%
rename from lib/librte_eal/include/rte_thread.h
rename to lib/eal/include/rte_thread.h
diff --git a/lib/librte_eal/include/rte_time.h b/lib/eal/include/rte_time.h
similarity index 100%
rename from lib/librte_eal/include/rte_time.h
rename to lib/eal/include/rte_time.h
diff --git a/lib/librte_eal/include/rte_trace.h b/lib/eal/include/rte_trace.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace.h
rename to lib/eal/include/rte_trace.h
diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/eal/include/rte_trace_point.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace_point.h
rename to lib/eal/include/rte_trace_point.h
diff --git a/lib/librte_eal/include/rte_trace_point_register.h b/lib/eal/include/rte_trace_point_register.h
similarity index 100%
rename from lib/librte_eal/include/rte_trace_point_register.h
rename to lib/eal/include/rte_trace_point_register.h
diff --git a/lib/librte_eal/include/rte_uuid.h b/lib/eal/include/rte_uuid.h
similarity index 100%
rename from lib/librte_eal/include/rte_uuid.h
rename to lib/eal/include/rte_uuid.h
diff --git a/lib/librte_eal/include/rte_version.h b/lib/eal/include/rte_version.h
similarity index 100%
rename from lib/librte_eal/include/rte_version.h
rename to lib/eal/include/rte_version.h
diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
similarity index 100%
rename from lib/librte_eal/include/rte_vfio.h
rename to lib/eal/include/rte_vfio.h
diff --git a/lib/librte_eal/linux/eal.c b/lib/eal/linux/eal.c
similarity index 100%
rename from lib/librte_eal/linux/eal.c
rename to lib/eal/linux/eal.c
diff --git a/lib/librte_eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/linux/eal_alarm.c
rename to lib/eal/linux/eal_alarm.c
diff --git a/lib/librte_eal/linux/eal_cpuflags.c b/lib/eal/linux/eal_cpuflags.c
similarity index 100%
rename from lib/librte_eal/linux/eal_cpuflags.c
rename to lib/eal/linux/eal_cpuflags.c
diff --git a/lib/librte_eal/linux/eal_debug.c b/lib/eal/linux/eal_debug.c
similarity index 100%
rename from lib/librte_eal/linux/eal_debug.c
rename to lib/eal/linux/eal_debug.c
diff --git a/lib/librte_eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c
similarity index 100%
rename from lib/librte_eal/linux/eal_dev.c
rename to lib/eal/linux/eal_dev.c
diff --git a/lib/librte_eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c
similarity index 100%
rename from lib/librte_eal/linux/eal_hugepage_info.c
rename to lib/eal/linux/eal_hugepage_info.c
diff --git a/lib/librte_eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/linux/eal_interrupts.c
rename to lib/eal/linux/eal_interrupts.c
diff --git a/lib/librte_eal/linux/eal_lcore.c b/lib/eal/linux/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/linux/eal_lcore.c
rename to lib/eal/linux/eal_lcore.c
diff --git a/lib/librte_eal/linux/eal_log.c b/lib/eal/linux/eal_log.c
similarity index 100%
rename from lib/librte_eal/linux/eal_log.c
rename to lib/eal/linux/eal_log.c
diff --git a/lib/librte_eal/linux/eal_memalloc.c b/lib/eal/linux/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/linux/eal_memalloc.c
rename to lib/eal/linux/eal_memalloc.c
diff --git a/lib/librte_eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
similarity index 100%
rename from lib/librte_eal/linux/eal_memory.c
rename to lib/eal/linux/eal_memory.c
diff --git a/lib/librte_eal/linux/eal_thread.c b/lib/eal/linux/eal_thread.c
similarity index 100%
rename from lib/librte_eal/linux/eal_thread.c
rename to lib/eal/linux/eal_thread.c
diff --git a/lib/librte_eal/linux/eal_timer.c b/lib/eal/linux/eal_timer.c
similarity index 100%
rename from lib/librte_eal/linux/eal_timer.c
rename to lib/eal/linux/eal_timer.c
diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio.c
rename to lib/eal/linux/eal_vfio.c
diff --git a/lib/librte_eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio.h
rename to lib/eal/linux/eal_vfio.h
diff --git a/lib/librte_eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c
similarity index 100%
rename from lib/librte_eal/linux/eal_vfio_mp_sync.c
rename to lib/eal/linux/eal_vfio_mp_sync.c
diff --git a/lib/librte_eal/linux/include/meson.build b/lib/eal/linux/include/meson.build
similarity index 100%
rename from lib/librte_eal/linux/include/meson.build
rename to lib/eal/linux/include/meson.build
diff --git a/lib/librte_eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/linux/include/rte_os.h
rename to lib/eal/linux/include/rte_os.h
diff --git a/lib/librte_eal/linux/include/rte_os_shim.h b/lib/eal/linux/include/rte_os_shim.h
similarity index 100%
rename from lib/librte_eal/linux/include/rte_os_shim.h
rename to lib/eal/linux/include/rte_os_shim.h
diff --git a/lib/librte_eal/linux/meson.build b/lib/eal/linux/meson.build
similarity index 100%
rename from lib/librte_eal/linux/meson.build
rename to lib/eal/linux/meson.build
diff --git a/lib/librte_eal/meson.build b/lib/eal/meson.build
similarity index 100%
rename from lib/librte_eal/meson.build
rename to lib/eal/meson.build
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/eal/ppc/include/meson.build
similarity index 100%
rename from lib/librte_eal/ppc/include/meson.build
rename to lib/eal/ppc/include/meson.build
diff --git a/lib/librte_eal/ppc/include/rte_altivec.h b/lib/eal/ppc/include/rte_altivec.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_altivec.h
rename to lib/eal/ppc/include/rte_altivec.h
diff --git a/lib/librte_eal/ppc/include/rte_atomic.h b/lib/eal/ppc/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_atomic.h
rename to lib/eal/ppc/include/rte_atomic.h
diff --git a/lib/librte_eal/ppc/include/rte_byteorder.h b/lib/eal/ppc/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_byteorder.h
rename to lib/eal/ppc/include/rte_byteorder.h
diff --git a/lib/librte_eal/ppc/include/rte_cpuflags.h b/lib/eal/ppc/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_cpuflags.h
rename to lib/eal/ppc/include/rte_cpuflags.h
diff --git a/lib/librte_eal/ppc/include/rte_cycles.h b/lib/eal/ppc/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_cycles.h
rename to lib/eal/ppc/include/rte_cycles.h
diff --git a/lib/librte_eal/ppc/include/rte_io.h b/lib/eal/ppc/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_io.h
rename to lib/eal/ppc/include/rte_io.h
diff --git a/lib/librte_eal/ppc/include/rte_mcslock.h b/lib/eal/ppc/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_mcslock.h
rename to lib/eal/ppc/include/rte_mcslock.h
diff --git a/lib/librte_eal/ppc/include/rte_memcpy.h b/lib/eal/ppc/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_memcpy.h
rename to lib/eal/ppc/include/rte_memcpy.h
diff --git a/lib/librte_eal/ppc/include/rte_pause.h b/lib/eal/ppc/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_pause.h
rename to lib/eal/ppc/include/rte_pause.h
diff --git a/lib/librte_eal/ppc/include/rte_pflock.h b/lib/eal/ppc/include/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_pflock.h
rename to lib/eal/ppc/include/rte_pflock.h
diff --git a/lib/librte_eal/ppc/include/rte_power_intrinsics.h b/lib/eal/ppc/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_power_intrinsics.h
rename to lib/eal/ppc/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/ppc/include/rte_prefetch.h b/lib/eal/ppc/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_prefetch.h
rename to lib/eal/ppc/include/rte_prefetch.h
diff --git a/lib/librte_eal/ppc/include/rte_rwlock.h b/lib/eal/ppc/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_rwlock.h
rename to lib/eal/ppc/include/rte_rwlock.h
diff --git a/lib/librte_eal/ppc/include/rte_spinlock.h b/lib/eal/ppc/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_spinlock.h
rename to lib/eal/ppc/include/rte_spinlock.h
diff --git a/lib/librte_eal/ppc/include/rte_ticketlock.h b/lib/eal/ppc/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_ticketlock.h
rename to lib/eal/ppc/include/rte_ticketlock.h
diff --git a/lib/librte_eal/ppc/include/rte_vect.h b/lib/eal/ppc/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/ppc/include/rte_vect.h
rename to lib/eal/ppc/include/rte_vect.h
diff --git a/lib/librte_eal/ppc/meson.build b/lib/eal/ppc/meson.build
similarity index 100%
rename from lib/librte_eal/ppc/meson.build
rename to lib/eal/ppc/meson.build
diff --git a/lib/librte_eal/ppc/rte_cpuflags.c b/lib/eal/ppc/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_cpuflags.c
rename to lib/eal/ppc/rte_cpuflags.c
diff --git a/lib/librte_eal/ppc/rte_cycles.c b/lib/eal/ppc/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_cycles.c
rename to lib/eal/ppc/rte_cycles.c
diff --git a/lib/librte_eal/ppc/rte_hypervisor.c b/lib/eal/ppc/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_hypervisor.c
rename to lib/eal/ppc/rte_hypervisor.c
diff --git a/lib/librte_eal/ppc/rte_power_intrinsics.c b/lib/eal/ppc/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/ppc/rte_power_intrinsics.c
rename to lib/eal/ppc/rte_power_intrinsics.c
diff --git a/lib/librte_eal/unix/eal_file.c b/lib/eal/unix/eal_file.c
similarity index 100%
rename from lib/librte_eal/unix/eal_file.c
rename to lib/eal/unix/eal_file.c
diff --git a/lib/librte_eal/unix/eal_unix_memory.c b/lib/eal/unix/eal_unix_memory.c
similarity index 100%
rename from lib/librte_eal/unix/eal_unix_memory.c
rename to lib/eal/unix/eal_unix_memory.c
diff --git a/lib/librte_eal/unix/eal_unix_timer.c b/lib/eal/unix/eal_unix_timer.c
similarity index 100%
rename from lib/librte_eal/unix/eal_unix_timer.c
rename to lib/eal/unix/eal_unix_timer.c
diff --git a/lib/librte_eal/unix/meson.build b/lib/eal/unix/meson.build
similarity index 100%
rename from lib/librte_eal/unix/meson.build
rename to lib/eal/unix/meson.build
diff --git a/lib/librte_eal/unix/rte_thread.c b/lib/eal/unix/rte_thread.c
similarity index 100%
rename from lib/librte_eal/unix/rte_thread.c
rename to lib/eal/unix/rte_thread.c
diff --git a/lib/librte_eal/version.map b/lib/eal/version.map
similarity index 100%
rename from lib/librte_eal/version.map
rename to lib/eal/version.map
diff --git a/lib/librte_eal/windows/eal.c b/lib/eal/windows/eal.c
similarity index 100%
rename from lib/librte_eal/windows/eal.c
rename to lib/eal/windows/eal.c
diff --git a/lib/librte_eal/windows/eal_alarm.c b/lib/eal/windows/eal_alarm.c
similarity index 100%
rename from lib/librte_eal/windows/eal_alarm.c
rename to lib/eal/windows/eal_alarm.c
diff --git a/lib/librte_eal/windows/eal_debug.c b/lib/eal/windows/eal_debug.c
similarity index 100%
rename from lib/librte_eal/windows/eal_debug.c
rename to lib/eal/windows/eal_debug.c
diff --git a/lib/librte_eal/windows/eal_file.c b/lib/eal/windows/eal_file.c
similarity index 100%
rename from lib/librte_eal/windows/eal_file.c
rename to lib/eal/windows/eal_file.c
diff --git a/lib/librte_eal/windows/eal_hugepages.c b/lib/eal/windows/eal_hugepages.c
similarity index 100%
rename from lib/librte_eal/windows/eal_hugepages.c
rename to lib/eal/windows/eal_hugepages.c
diff --git a/lib/librte_eal/windows/eal_interrupts.c b/lib/eal/windows/eal_interrupts.c
similarity index 100%
rename from lib/librte_eal/windows/eal_interrupts.c
rename to lib/eal/windows/eal_interrupts.c
diff --git a/lib/librte_eal/windows/eal_lcore.c b/lib/eal/windows/eal_lcore.c
similarity index 100%
rename from lib/librte_eal/windows/eal_lcore.c
rename to lib/eal/windows/eal_lcore.c
diff --git a/lib/librte_eal/windows/eal_log.c b/lib/eal/windows/eal_log.c
similarity index 100%
rename from lib/librte_eal/windows/eal_log.c
rename to lib/eal/windows/eal_log.c
diff --git a/lib/librte_eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
similarity index 100%
rename from lib/librte_eal/windows/eal_memalloc.c
rename to lib/eal/windows/eal_memalloc.c
diff --git a/lib/librte_eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c
similarity index 100%
rename from lib/librte_eal/windows/eal_memory.c
rename to lib/eal/windows/eal_memory.c
diff --git a/lib/librte_eal/windows/eal_mp.c b/lib/eal/windows/eal_mp.c
similarity index 100%
rename from lib/librte_eal/windows/eal_mp.c
rename to lib/eal/windows/eal_mp.c
diff --git a/lib/librte_eal/windows/eal_thread.c b/lib/eal/windows/eal_thread.c
similarity index 100%
rename from lib/librte_eal/windows/eal_thread.c
rename to lib/eal/windows/eal_thread.c
diff --git a/lib/librte_eal/windows/eal_timer.c b/lib/eal/windows/eal_timer.c
similarity index 100%
rename from lib/librte_eal/windows/eal_timer.c
rename to lib/eal/windows/eal_timer.c
diff --git a/lib/librte_eal/windows/eal_windows.h b/lib/eal/windows/eal_windows.h
similarity index 100%
rename from lib/librte_eal/windows/eal_windows.h
rename to lib/eal/windows/eal_windows.h
diff --git a/lib/librte_eal/windows/fnmatch.c b/lib/eal/windows/fnmatch.c
similarity index 100%
rename from lib/librte_eal/windows/fnmatch.c
rename to lib/eal/windows/fnmatch.c
diff --git a/lib/librte_eal/windows/getopt.c b/lib/eal/windows/getopt.c
similarity index 100%
rename from lib/librte_eal/windows/getopt.c
rename to lib/eal/windows/getopt.c
diff --git a/lib/librte_eal/windows/include/dirent.h b/lib/eal/windows/include/dirent.h
similarity index 100%
rename from lib/librte_eal/windows/include/dirent.h
rename to lib/eal/windows/include/dirent.h
diff --git a/lib/librte_eal/windows/include/fnmatch.h b/lib/eal/windows/include/fnmatch.h
similarity index 100%
rename from lib/librte_eal/windows/include/fnmatch.h
rename to lib/eal/windows/include/fnmatch.h
diff --git a/lib/librte_eal/windows/include/getopt.h b/lib/eal/windows/include/getopt.h
similarity index 100%
rename from lib/librte_eal/windows/include/getopt.h
rename to lib/eal/windows/include/getopt.h
diff --git a/lib/librte_eal/windows/include/meson.build b/lib/eal/windows/include/meson.build
similarity index 100%
rename from lib/librte_eal/windows/include/meson.build
rename to lib/eal/windows/include/meson.build
diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/eal/windows/include/pthread.h
similarity index 100%
rename from lib/librte_eal/windows/include/pthread.h
rename to lib/eal/windows/include/pthread.h
diff --git a/lib/librte_eal/windows/include/regex.h b/lib/eal/windows/include/regex.h
similarity index 100%
rename from lib/librte_eal/windows/include/regex.h
rename to lib/eal/windows/include/regex.h
diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_os.h
rename to lib/eal/windows/include/rte_os.h
diff --git a/lib/librte_eal/windows/include/rte_os_shim.h b/lib/eal/windows/include/rte_os_shim.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_os_shim.h
rename to lib/eal/windows/include/rte_os_shim.h
diff --git a/lib/librte_eal/windows/include/rte_virt2phys.h b/lib/eal/windows/include/rte_virt2phys.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_virt2phys.h
rename to lib/eal/windows/include/rte_virt2phys.h
diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/eal/windows/include/rte_windows.h
similarity index 100%
rename from lib/librte_eal/windows/include/rte_windows.h
rename to lib/eal/windows/include/rte_windows.h
diff --git a/lib/librte_eal/windows/include/sched.h b/lib/eal/windows/include/sched.h
similarity index 100%
rename from lib/librte_eal/windows/include/sched.h
rename to lib/eal/windows/include/sched.h
diff --git a/lib/librte_eal/windows/include/sys/queue.h b/lib/eal/windows/include/sys/queue.h
similarity index 100%
rename from lib/librte_eal/windows/include/sys/queue.h
rename to lib/eal/windows/include/sys/queue.h
diff --git a/lib/librte_eal/windows/include/unistd.h b/lib/eal/windows/include/unistd.h
similarity index 100%
rename from lib/librte_eal/windows/include/unistd.h
rename to lib/eal/windows/include/unistd.h
diff --git a/lib/librte_eal/windows/meson.build b/lib/eal/windows/meson.build
similarity index 100%
rename from lib/librte_eal/windows/meson.build
rename to lib/eal/windows/meson.build
diff --git a/lib/librte_eal/windows/rte_thread.c b/lib/eal/windows/rte_thread.c
similarity index 100%
rename from lib/librte_eal/windows/rte_thread.c
rename to lib/eal/windows/rte_thread.c
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/eal/x86/include/meson.build
similarity index 100%
rename from lib/librte_eal/x86/include/meson.build
rename to lib/eal/x86/include/meson.build
diff --git a/lib/librte_eal/x86/include/rte_atomic.h b/lib/eal/x86/include/rte_atomic.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic.h
rename to lib/eal/x86/include/rte_atomic.h
diff --git a/lib/librte_eal/x86/include/rte_atomic_32.h b/lib/eal/x86/include/rte_atomic_32.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic_32.h
rename to lib/eal/x86/include/rte_atomic_32.h
diff --git a/lib/librte_eal/x86/include/rte_atomic_64.h b/lib/eal/x86/include/rte_atomic_64.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_atomic_64.h
rename to lib/eal/x86/include/rte_atomic_64.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder.h b/lib/eal/x86/include/rte_byteorder.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder.h
rename to lib/eal/x86/include/rte_byteorder.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder_32.h b/lib/eal/x86/include/rte_byteorder_32.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder_32.h
rename to lib/eal/x86/include/rte_byteorder_32.h
diff --git a/lib/librte_eal/x86/include/rte_byteorder_64.h b/lib/eal/x86/include/rte_byteorder_64.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_byteorder_64.h
rename to lib/eal/x86/include/rte_byteorder_64.h
diff --git a/lib/librte_eal/x86/include/rte_cpuflags.h b/lib/eal/x86/include/rte_cpuflags.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_cpuflags.h
rename to lib/eal/x86/include/rte_cpuflags.h
diff --git a/lib/librte_eal/x86/include/rte_cycles.h b/lib/eal/x86/include/rte_cycles.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_cycles.h
rename to lib/eal/x86/include/rte_cycles.h
diff --git a/lib/librte_eal/x86/include/rte_io.h b/lib/eal/x86/include/rte_io.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_io.h
rename to lib/eal/x86/include/rte_io.h
diff --git a/lib/librte_eal/x86/include/rte_mcslock.h b/lib/eal/x86/include/rte_mcslock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_mcslock.h
rename to lib/eal/x86/include/rte_mcslock.h
diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_memcpy.h
rename to lib/eal/x86/include/rte_memcpy.h
diff --git a/lib/librte_eal/x86/include/rte_pause.h b/lib/eal/x86/include/rte_pause.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_pause.h
rename to lib/eal/x86/include/rte_pause.h
diff --git a/lib/librte_eal/x86/include/rte_pflock.h b/lib/eal/x86/include/rte_pflock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_pflock.h
rename to lib/eal/x86/include/rte_pflock.h
diff --git a/lib/librte_eal/x86/include/rte_power_intrinsics.h b/lib/eal/x86/include/rte_power_intrinsics.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_power_intrinsics.h
rename to lib/eal/x86/include/rte_power_intrinsics.h
diff --git a/lib/librte_eal/x86/include/rte_prefetch.h b/lib/eal/x86/include/rte_prefetch.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_prefetch.h
rename to lib/eal/x86/include/rte_prefetch.h
diff --git a/lib/librte_eal/x86/include/rte_rtm.h b/lib/eal/x86/include/rte_rtm.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_rtm.h
rename to lib/eal/x86/include/rte_rtm.h
diff --git a/lib/librte_eal/x86/include/rte_rwlock.h b/lib/eal/x86/include/rte_rwlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_rwlock.h
rename to lib/eal/x86/include/rte_rwlock.h
diff --git a/lib/librte_eal/x86/include/rte_spinlock.h b/lib/eal/x86/include/rte_spinlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_spinlock.h
rename to lib/eal/x86/include/rte_spinlock.h
diff --git a/lib/librte_eal/x86/include/rte_ticketlock.h b/lib/eal/x86/include/rte_ticketlock.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_ticketlock.h
rename to lib/eal/x86/include/rte_ticketlock.h
diff --git a/lib/librte_eal/x86/include/rte_vect.h b/lib/eal/x86/include/rte_vect.h
similarity index 100%
rename from lib/librte_eal/x86/include/rte_vect.h
rename to lib/eal/x86/include/rte_vect.h
diff --git a/lib/librte_eal/x86/meson.build b/lib/eal/x86/meson.build
similarity index 100%
rename from lib/librte_eal/x86/meson.build
rename to lib/eal/x86/meson.build
diff --git a/lib/librte_eal/x86/rte_cpuflags.c b/lib/eal/x86/rte_cpuflags.c
similarity index 100%
rename from lib/librte_eal/x86/rte_cpuflags.c
rename to lib/eal/x86/rte_cpuflags.c
diff --git a/lib/librte_eal/x86/rte_cpuid.h b/lib/eal/x86/rte_cpuid.h
similarity index 100%
rename from lib/librte_eal/x86/rte_cpuid.h
rename to lib/eal/x86/rte_cpuid.h
diff --git a/lib/librte_eal/x86/rte_cycles.c b/lib/eal/x86/rte_cycles.c
similarity index 100%
rename from lib/librte_eal/x86/rte_cycles.c
rename to lib/eal/x86/rte_cycles.c
diff --git a/lib/librte_eal/x86/rte_hypervisor.c b/lib/eal/x86/rte_hypervisor.c
similarity index 100%
rename from lib/librte_eal/x86/rte_hypervisor.c
rename to lib/eal/x86/rte_hypervisor.c
diff --git a/lib/librte_eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c
similarity index 100%
rename from lib/librte_eal/x86/rte_power_intrinsics.c
rename to lib/eal/x86/rte_power_intrinsics.c
diff --git a/lib/librte_eal/x86/rte_spinlock.c b/lib/eal/x86/rte_spinlock.c
similarity index 100%
rename from lib/librte_eal/x86/rte_spinlock.c
rename to lib/eal/x86/rte_spinlock.c
diff --git a/lib/librte_efd/meson.build b/lib/efd/meson.build
similarity index 100%
rename from lib/librte_efd/meson.build
rename to lib/efd/meson.build
diff --git a/lib/librte_efd/rte_efd.c b/lib/efd/rte_efd.c
similarity index 100%
rename from lib/librte_efd/rte_efd.c
rename to lib/efd/rte_efd.c
diff --git a/lib/librte_efd/rte_efd.h b/lib/efd/rte_efd.h
similarity index 100%
rename from lib/librte_efd/rte_efd.h
rename to lib/efd/rte_efd.h
diff --git a/lib/librte_efd/rte_efd_arm64.h b/lib/efd/rte_efd_arm64.h
similarity index 100%
rename from lib/librte_efd/rte_efd_arm64.h
rename to lib/efd/rte_efd_arm64.h
diff --git a/lib/librte_efd/rte_efd_x86.h b/lib/efd/rte_efd_x86.h
similarity index 100%
rename from lib/librte_efd/rte_efd_x86.h
rename to lib/efd/rte_efd_x86.h
diff --git a/lib/librte_efd/version.map b/lib/efd/version.map
similarity index 100%
rename from lib/librte_efd/version.map
rename to lib/efd/version.map
diff --git a/lib/librte_ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_driver.h
rename to lib/ethdev/ethdev_driver.h
diff --git a/lib/librte_ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_pci.h
rename to lib/ethdev/ethdev_pci.h
diff --git a/lib/librte_ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_private.c
rename to lib/ethdev/ethdev_private.c
diff --git a/lib/librte_ethdev/ethdev_private.h b/lib/ethdev/ethdev_private.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_private.h
rename to lib/ethdev/ethdev_private.h
diff --git a/lib/librte_ethdev/ethdev_profile.c b/lib/ethdev/ethdev_profile.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_profile.c
rename to lib/ethdev/ethdev_profile.c
diff --git a/lib/librte_ethdev/ethdev_profile.h b/lib/ethdev/ethdev_profile.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_profile.h
rename to lib/ethdev/ethdev_profile.h
diff --git a/lib/librte_ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c
similarity index 100%
rename from lib/librte_ethdev/ethdev_trace_points.c
rename to lib/ethdev/ethdev_trace_points.c
diff --git a/lib/librte_ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h
similarity index 100%
rename from lib/librte_ethdev/ethdev_vdev.h
rename to lib/ethdev/ethdev_vdev.h
diff --git a/lib/librte_ethdev/meson.build b/lib/ethdev/meson.build
similarity index 100%
rename from lib/librte_ethdev/meson.build
rename to lib/ethdev/meson.build
diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
similarity index 100%
rename from lib/librte_ethdev/rte_class_eth.c
rename to lib/ethdev/rte_class_eth.c
diff --git a/lib/librte_ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h
similarity index 100%
rename from lib/librte_ethdev/rte_dev_info.h
rename to lib/ethdev/rte_dev_info.h
diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/ethdev/rte_eth_ctrl.h
similarity index 100%
rename from lib/librte_ethdev/rte_eth_ctrl.h
rename to lib/ethdev/rte_eth_ctrl.h
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev.c
rename to lib/ethdev/rte_ethdev.c
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev.h
rename to lib/ethdev/rte_ethdev.h
diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/ethdev/rte_ethdev_core.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_core.h
rename to lib/ethdev/rte_ethdev_core.h
diff --git a/lib/librte_ethdev/rte_ethdev_trace.h b/lib/ethdev/rte_ethdev_trace.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_trace.h
rename to lib/ethdev/rte_ethdev_trace.h
diff --git a/lib/librte_ethdev/rte_ethdev_trace_fp.h b/lib/ethdev/rte_ethdev_trace_fp.h
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_trace_fp.h
rename to lib/ethdev/rte_ethdev_trace_fp.h
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
similarity index 100%
rename from lib/librte_ethdev/rte_flow.c
rename to lib/ethdev/rte_flow.c
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
similarity index 100%
rename from lib/librte_ethdev/rte_flow.h
rename to lib/ethdev/rte_flow.h
diff --git a/lib/librte_ethdev/rte_flow_driver.h b/lib/ethdev/rte_flow_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_flow_driver.h
rename to lib/ethdev/rte_flow_driver.h
diff --git a/lib/librte_ethdev/rte_mtr.c b/lib/ethdev/rte_mtr.c
similarity index 100%
rename from lib/librte_ethdev/rte_mtr.c
rename to lib/ethdev/rte_mtr.c
diff --git a/lib/librte_ethdev/rte_mtr.h b/lib/ethdev/rte_mtr.h
similarity index 100%
rename from lib/librte_ethdev/rte_mtr.h
rename to lib/ethdev/rte_mtr.h
diff --git a/lib/librte_ethdev/rte_mtr_driver.h b/lib/ethdev/rte_mtr_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_mtr_driver.h
rename to lib/ethdev/rte_mtr_driver.h
diff --git a/lib/librte_ethdev/rte_tm.c b/lib/ethdev/rte_tm.c
similarity index 100%
rename from lib/librte_ethdev/rte_tm.c
rename to lib/ethdev/rte_tm.c
diff --git a/lib/librte_ethdev/rte_tm.h b/lib/ethdev/rte_tm.h
similarity index 100%
rename from lib/librte_ethdev/rte_tm.h
rename to lib/ethdev/rte_tm.h
diff --git a/lib/librte_ethdev/rte_tm_driver.h b/lib/ethdev/rte_tm_driver.h
similarity index 100%
rename from lib/librte_ethdev/rte_tm_driver.h
rename to lib/ethdev/rte_tm_driver.h
diff --git a/lib/librte_ethdev/version.map b/lib/ethdev/version.map
similarity index 100%
rename from lib/librte_ethdev/version.map
rename to lib/ethdev/version.map
diff --git a/lib/librte_eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd.h
rename to lib/eventdev/eventdev_pmd.h
diff --git a/lib/librte_eventdev/eventdev_pmd_pci.h b/lib/eventdev/eventdev_pmd_pci.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd_pci.h
rename to lib/eventdev/eventdev_pmd_pci.h
diff --git a/lib/librte_eventdev/eventdev_pmd_vdev.h b/lib/eventdev/eventdev_pmd_vdev.h
similarity index 100%
rename from lib/librte_eventdev/eventdev_pmd_vdev.h
rename to lib/eventdev/eventdev_pmd_vdev.h
diff --git a/lib/librte_eventdev/eventdev_trace_points.c b/lib/eventdev/eventdev_trace_points.c
similarity index 100%
rename from lib/librte_eventdev/eventdev_trace_points.c
rename to lib/eventdev/eventdev_trace_points.c
diff --git a/lib/librte_eventdev/meson.build b/lib/eventdev/meson.build
similarity index 100%
rename from lib/librte_eventdev/meson.build
rename to lib/eventdev/meson.build
diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_crypto_adapter.c
rename to lib/eventdev/rte_event_crypto_adapter.c
diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.h b/lib/eventdev/rte_event_crypto_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_crypto_adapter.h
rename to lib/eventdev/rte_event_crypto_adapter.h
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_rx_adapter.c
rename to lib/eventdev/rte_event_eth_rx_adapter.c
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.h b/lib/eventdev/rte_event_eth_rx_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_rx_adapter.h
rename to lib/eventdev/rte_event_eth_rx_adapter.h
diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_tx_adapter.c
rename to lib/eventdev/rte_event_eth_tx_adapter.c
diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/eventdev/rte_event_eth_tx_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_eth_tx_adapter.h
rename to lib/eventdev/rte_event_eth_tx_adapter.h
diff --git a/lib/librte_eventdev/rte_event_ring.c b/lib/eventdev/rte_event_ring.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_ring.c
rename to lib/eventdev/rte_event_ring.c
diff --git a/lib/librte_eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_ring.h
rename to lib/eventdev/rte_event_ring.h
diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter.c
rename to lib/eventdev/rte_event_timer_adapter.c
diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter.h
rename to lib/eventdev/rte_event_timer_adapter.h
diff --git a/lib/librte_eventdev/rte_event_timer_adapter_pmd.h b/lib/eventdev/rte_event_timer_adapter_pmd.h
similarity index 100%
rename from lib/librte_eventdev/rte_event_timer_adapter_pmd.h
rename to lib/eventdev/rte_event_timer_adapter_pmd.h
diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev.c
rename to lib/eventdev/rte_eventdev.c
diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev.h
rename to lib/eventdev/rte_eventdev.h
diff --git a/lib/librte_eventdev/rte_eventdev_trace.h b/lib/eventdev/rte_eventdev_trace.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_trace.h
rename to lib/eventdev/rte_eventdev_trace.h
diff --git a/lib/librte_eventdev/rte_eventdev_trace_fp.h b/lib/eventdev/rte_eventdev_trace_fp.h
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_trace_fp.h
rename to lib/eventdev/rte_eventdev_trace_fp.h
diff --git a/lib/librte_eventdev/version.map b/lib/eventdev/version.map
similarity index 100%
rename from lib/librte_eventdev/version.map
rename to lib/eventdev/version.map
diff --git a/lib/librte_fib/dir24_8.c b/lib/fib/dir24_8.c
similarity index 100%
rename from lib/librte_fib/dir24_8.c
rename to lib/fib/dir24_8.c
diff --git a/lib/librte_fib/dir24_8.h b/lib/fib/dir24_8.h
similarity index 100%
rename from lib/librte_fib/dir24_8.h
rename to lib/fib/dir24_8.h
diff --git a/lib/librte_fib/dir24_8_avx512.c b/lib/fib/dir24_8_avx512.c
similarity index 100%
rename from lib/librte_fib/dir24_8_avx512.c
rename to lib/fib/dir24_8_avx512.c
diff --git a/lib/librte_fib/dir24_8_avx512.h b/lib/fib/dir24_8_avx512.h
similarity index 100%
rename from lib/librte_fib/dir24_8_avx512.h
rename to lib/fib/dir24_8_avx512.h
diff --git a/lib/librte_fib/meson.build b/lib/fib/meson.build
similarity index 100%
rename from lib/librte_fib/meson.build
rename to lib/fib/meson.build
diff --git a/lib/librte_fib/rte_fib.c b/lib/fib/rte_fib.c
similarity index 100%
rename from lib/librte_fib/rte_fib.c
rename to lib/fib/rte_fib.c
diff --git a/lib/librte_fib/rte_fib.h b/lib/fib/rte_fib.h
similarity index 100%
rename from lib/librte_fib/rte_fib.h
rename to lib/fib/rte_fib.h
diff --git a/lib/librte_fib/rte_fib6.c b/lib/fib/rte_fib6.c
similarity index 100%
rename from lib/librte_fib/rte_fib6.c
rename to lib/fib/rte_fib6.c
diff --git a/lib/librte_fib/rte_fib6.h b/lib/fib/rte_fib6.h
similarity index 100%
rename from lib/librte_fib/rte_fib6.h
rename to lib/fib/rte_fib6.h
diff --git a/lib/librte_fib/trie.c b/lib/fib/trie.c
similarity index 100%
rename from lib/librte_fib/trie.c
rename to lib/fib/trie.c
diff --git a/lib/librte_fib/trie.h b/lib/fib/trie.h
similarity index 100%
rename from lib/librte_fib/trie.h
rename to lib/fib/trie.h
diff --git a/lib/librte_fib/trie_avx512.c b/lib/fib/trie_avx512.c
similarity index 100%
rename from lib/librte_fib/trie_avx512.c
rename to lib/fib/trie_avx512.c
diff --git a/lib/librte_fib/trie_avx512.h b/lib/fib/trie_avx512.h
similarity index 100%
rename from lib/librte_fib/trie_avx512.h
rename to lib/fib/trie_avx512.h
diff --git a/lib/librte_fib/version.map b/lib/fib/version.map
similarity index 100%
rename from lib/librte_fib/version.map
rename to lib/fib/version.map
diff --git a/lib/librte_flow_classify/meson.build b/lib/flow_classify/meson.build
similarity index 100%
rename from lib/librte_flow_classify/meson.build
rename to lib/flow_classify/meson.build
diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/flow_classify/rte_flow_classify.c
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify.c
rename to lib/flow_classify/rte_flow_classify.c
diff --git a/lib/librte_flow_classify/rte_flow_classify.h b/lib/flow_classify/rte_flow_classify.h
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify.h
rename to lib/flow_classify/rte_flow_classify.h
diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.c b/lib/flow_classify/rte_flow_classify_parse.c
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify_parse.c
rename to lib/flow_classify/rte_flow_classify_parse.c
diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.h b/lib/flow_classify/rte_flow_classify_parse.h
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify_parse.h
rename to lib/flow_classify/rte_flow_classify_parse.h
diff --git a/lib/librte_flow_classify/version.map b/lib/flow_classify/version.map
similarity index 100%
rename from lib/librte_flow_classify/version.map
rename to lib/flow_classify/version.map
diff --git a/lib/librte_graph/graph.c b/lib/graph/graph.c
similarity index 100%
rename from lib/librte_graph/graph.c
rename to lib/graph/graph.c
diff --git a/lib/librte_graph/graph_debug.c b/lib/graph/graph_debug.c
similarity index 100%
rename from lib/librte_graph/graph_debug.c
rename to lib/graph/graph_debug.c
diff --git a/lib/librte_graph/graph_ops.c b/lib/graph/graph_ops.c
similarity index 100%
rename from lib/librte_graph/graph_ops.c
rename to lib/graph/graph_ops.c
diff --git a/lib/librte_graph/graph_populate.c b/lib/graph/graph_populate.c
similarity index 100%
rename from lib/librte_graph/graph_populate.c
rename to lib/graph/graph_populate.c
diff --git a/lib/librte_graph/graph_private.h b/lib/graph/graph_private.h
similarity index 100%
rename from lib/librte_graph/graph_private.h
rename to lib/graph/graph_private.h
diff --git a/lib/librte_graph/graph_stats.c b/lib/graph/graph_stats.c
similarity index 100%
rename from lib/librte_graph/graph_stats.c
rename to lib/graph/graph_stats.c
diff --git a/lib/librte_graph/meson.build b/lib/graph/meson.build
similarity index 100%
rename from lib/librte_graph/meson.build
rename to lib/graph/meson.build
diff --git a/lib/librte_graph/node.c b/lib/graph/node.c
similarity index 100%
rename from lib/librte_graph/node.c
rename to lib/graph/node.c
diff --git a/lib/librte_graph/rte_graph.h b/lib/graph/rte_graph.h
similarity index 100%
rename from lib/librte_graph/rte_graph.h
rename to lib/graph/rte_graph.h
diff --git a/lib/librte_graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h
similarity index 100%
rename from lib/librte_graph/rte_graph_worker.h
rename to lib/graph/rte_graph_worker.h
diff --git a/lib/librte_graph/version.map b/lib/graph/version.map
similarity index 100%
rename from lib/librte_graph/version.map
rename to lib/graph/version.map
diff --git a/lib/librte_gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
similarity index 100%
rename from lib/librte_gro/gro_tcp4.c
rename to lib/gro/gro_tcp4.c
diff --git a/lib/librte_gro/gro_tcp4.h b/lib/gro/gro_tcp4.h
similarity index 100%
rename from lib/librte_gro/gro_tcp4.h
rename to lib/gro/gro_tcp4.h
diff --git a/lib/librte_gro/gro_udp4.c b/lib/gro/gro_udp4.c
similarity index 100%
rename from lib/librte_gro/gro_udp4.c
rename to lib/gro/gro_udp4.c
diff --git a/lib/librte_gro/gro_udp4.h b/lib/gro/gro_udp4.h
similarity index 100%
rename from lib/librte_gro/gro_udp4.h
rename to lib/gro/gro_udp4.h
diff --git a/lib/librte_gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c
similarity index 100%
rename from lib/librte_gro/gro_vxlan_tcp4.c
rename to lib/gro/gro_vxlan_tcp4.c
diff --git a/lib/librte_gro/gro_vxlan_tcp4.h b/lib/gro/gro_vxlan_tcp4.h
similarity index 100%
rename from lib/librte_gro/gro_vxlan_tcp4.h
rename to lib/gro/gro_vxlan_tcp4.h
diff --git a/lib/librte_gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c
similarity index 100%
rename from lib/librte_gro/gro_vxlan_udp4.c
rename to lib/gro/gro_vxlan_udp4.c
diff --git a/lib/librte_gro/gro_vxlan_udp4.h b/lib/gro/gro_vxlan_udp4.h
similarity index 100%
rename from lib/librte_gro/gro_vxlan_udp4.h
rename to lib/gro/gro_vxlan_udp4.h
diff --git a/lib/librte_gro/meson.build b/lib/gro/meson.build
similarity index 100%
rename from lib/librte_gro/meson.build
rename to lib/gro/meson.build
diff --git a/lib/librte_gro/rte_gro.c b/lib/gro/rte_gro.c
similarity index 100%
rename from lib/librte_gro/rte_gro.c
rename to lib/gro/rte_gro.c
diff --git a/lib/librte_gro/rte_gro.h b/lib/gro/rte_gro.h
similarity index 100%
rename from lib/librte_gro/rte_gro.h
rename to lib/gro/rte_gro.h
diff --git a/lib/librte_gro/version.map b/lib/gro/version.map
similarity index 100%
rename from lib/librte_gro/version.map
rename to lib/gro/version.map
diff --git a/lib/librte_gso/gso_common.c b/lib/gso/gso_common.c
similarity index 100%
rename from lib/librte_gso/gso_common.c
rename to lib/gso/gso_common.c
diff --git a/lib/librte_gso/gso_common.h b/lib/gso/gso_common.h
similarity index 100%
rename from lib/librte_gso/gso_common.h
rename to lib/gso/gso_common.h
diff --git a/lib/librte_gso/gso_tcp4.c b/lib/gso/gso_tcp4.c
similarity index 100%
rename from lib/librte_gso/gso_tcp4.c
rename to lib/gso/gso_tcp4.c
diff --git a/lib/librte_gso/gso_tcp4.h b/lib/gso/gso_tcp4.h
similarity index 100%
rename from lib/librte_gso/gso_tcp4.h
rename to lib/gso/gso_tcp4.h
diff --git a/lib/librte_gso/gso_tunnel_tcp4.c b/lib/gso/gso_tunnel_tcp4.c
similarity index 100%
rename from lib/librte_gso/gso_tunnel_tcp4.c
rename to lib/gso/gso_tunnel_tcp4.c
diff --git a/lib/librte_gso/gso_tunnel_tcp4.h b/lib/gso/gso_tunnel_tcp4.h
similarity index 100%
rename from lib/librte_gso/gso_tunnel_tcp4.h
rename to lib/gso/gso_tunnel_tcp4.h
diff --git a/lib/librte_gso/gso_tunnel_udp4.c b/lib/gso/gso_tunnel_udp4.c
similarity index 100%
rename from lib/librte_gso/gso_tunnel_udp4.c
rename to lib/gso/gso_tunnel_udp4.c
diff --git a/lib/librte_gso/gso_tunnel_udp4.h b/lib/gso/gso_tunnel_udp4.h
similarity index 100%
rename from lib/librte_gso/gso_tunnel_udp4.h
rename to lib/gso/gso_tunnel_udp4.h
diff --git a/lib/librte_gso/gso_udp4.c b/lib/gso/gso_udp4.c
similarity index 100%
rename from lib/librte_gso/gso_udp4.c
rename to lib/gso/gso_udp4.c
diff --git a/lib/librte_gso/gso_udp4.h b/lib/gso/gso_udp4.h
similarity index 100%
rename from lib/librte_gso/gso_udp4.h
rename to lib/gso/gso_udp4.h
diff --git a/lib/librte_gso/meson.build b/lib/gso/meson.build
similarity index 100%
rename from lib/librte_gso/meson.build
rename to lib/gso/meson.build
diff --git a/lib/librte_gso/rte_gso.c b/lib/gso/rte_gso.c
similarity index 100%
rename from lib/librte_gso/rte_gso.c
rename to lib/gso/rte_gso.c
diff --git a/lib/librte_gso/rte_gso.h b/lib/gso/rte_gso.h
similarity index 100%
rename from lib/librte_gso/rte_gso.h
rename to lib/gso/rte_gso.h
diff --git a/lib/librte_gso/version.map b/lib/gso/version.map
similarity index 100%
rename from lib/librte_gso/version.map
rename to lib/gso/version.map
diff --git a/lib/librte_hash/meson.build b/lib/hash/meson.build
similarity index 100%
rename from lib/librte_hash/meson.build
rename to lib/hash/meson.build
diff --git a/lib/librte_hash/rte_cmp_arm64.h b/lib/hash/rte_cmp_arm64.h
similarity index 100%
rename from lib/librte_hash/rte_cmp_arm64.h
rename to lib/hash/rte_cmp_arm64.h
diff --git a/lib/librte_hash/rte_cmp_x86.h b/lib/hash/rte_cmp_x86.h
similarity index 100%
rename from lib/librte_hash/rte_cmp_x86.h
rename to lib/hash/rte_cmp_x86.h
diff --git a/lib/librte_hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h
similarity index 100%
rename from lib/librte_hash/rte_crc_arm64.h
rename to lib/hash/rte_crc_arm64.h
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
similarity index 100%
rename from lib/librte_hash/rte_cuckoo_hash.c
rename to lib/hash/rte_cuckoo_hash.c
diff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
similarity index 100%
rename from lib/librte_hash/rte_cuckoo_hash.h
rename to lib/hash/rte_cuckoo_hash.h
diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
similarity index 100%
rename from lib/librte_hash/rte_fbk_hash.c
rename to lib/hash/rte_fbk_hash.c
diff --git a/lib/librte_hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
similarity index 100%
rename from lib/librte_hash/rte_fbk_hash.h
rename to lib/hash/rte_fbk_hash.h
diff --git a/lib/librte_hash/rte_hash.h b/lib/hash/rte_hash.h
similarity index 100%
rename from lib/librte_hash/rte_hash.h
rename to lib/hash/rte_hash.h
diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/hash/rte_hash_crc.h
similarity index 100%
rename from lib/librte_hash/rte_hash_crc.h
rename to lib/hash/rte_hash_crc.h
diff --git a/lib/librte_hash/rte_jhash.h b/lib/hash/rte_jhash.h
similarity index 100%
rename from lib/librte_hash/rte_jhash.h
rename to lib/hash/rte_jhash.h
diff --git a/lib/librte_hash/rte_thash.h b/lib/hash/rte_thash.h
similarity index 100%
rename from lib/librte_hash/rte_thash.h
rename to lib/hash/rte_thash.h
diff --git a/lib/librte_hash/version.map b/lib/hash/version.map
similarity index 100%
rename from lib/librte_hash/version.map
rename to lib/hash/version.map
diff --git a/lib/librte_ip_frag/ip_frag_common.h b/lib/ip_frag/ip_frag_common.h
similarity index 100%
rename from lib/librte_ip_frag/ip_frag_common.h
rename to lib/ip_frag/ip_frag_common.h
diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/ip_frag/ip_frag_internal.c
similarity index 100%
rename from lib/librte_ip_frag/ip_frag_internal.c
rename to lib/ip_frag/ip_frag_internal.c
diff --git a/lib/librte_ip_frag/meson.build b/lib/ip_frag/meson.build
similarity index 100%
rename from lib/librte_ip_frag/meson.build
rename to lib/ip_frag/meson.build
diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h
similarity index 100%
rename from lib/librte_ip_frag/rte_ip_frag.h
rename to lib/ip_frag/rte_ip_frag.h
diff --git a/lib/librte_ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ip_frag_common.c
rename to lib/ip_frag/rte_ip_frag_common.c
diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv4_fragmentation.c
rename to lib/ip_frag/rte_ipv4_fragmentation.c
diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/ip_frag/rte_ipv4_reassembly.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv4_reassembly.c
rename to lib/ip_frag/rte_ipv4_reassembly.c
diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/ip_frag/rte_ipv6_fragmentation.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv6_fragmentation.c
rename to lib/ip_frag/rte_ipv6_fragmentation.c
diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/ip_frag/rte_ipv6_reassembly.c
similarity index 100%
rename from lib/librte_ip_frag/rte_ipv6_reassembly.c
rename to lib/ip_frag/rte_ipv6_reassembly.c
diff --git a/lib/librte_ip_frag/version.map b/lib/ip_frag/version.map
similarity index 100%
rename from lib/librte_ip_frag/version.map
rename to lib/ip_frag/version.map
diff --git a/lib/librte_ipsec/crypto.h b/lib/ipsec/crypto.h
similarity index 100%
rename from lib/librte_ipsec/crypto.h
rename to lib/ipsec/crypto.h
diff --git a/lib/librte_ipsec/esp_inb.c b/lib/ipsec/esp_inb.c
similarity index 100%
rename from lib/librte_ipsec/esp_inb.c
rename to lib/ipsec/esp_inb.c
diff --git a/lib/librte_ipsec/esp_outb.c b/lib/ipsec/esp_outb.c
similarity index 100%
rename from lib/librte_ipsec/esp_outb.c
rename to lib/ipsec/esp_outb.c
diff --git a/lib/librte_ipsec/iph.h b/lib/ipsec/iph.h
similarity index 100%
rename from lib/librte_ipsec/iph.h
rename to lib/ipsec/iph.h
diff --git a/lib/librte_ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c
similarity index 100%
rename from lib/librte_ipsec/ipsec_sad.c
rename to lib/ipsec/ipsec_sad.c
diff --git a/lib/librte_ipsec/ipsec_sqn.h b/lib/ipsec/ipsec_sqn.h
similarity index 100%
rename from lib/librte_ipsec/ipsec_sqn.h
rename to lib/ipsec/ipsec_sqn.h
diff --git a/lib/librte_ipsec/meson.build b/lib/ipsec/meson.build
similarity index 100%
rename from lib/librte_ipsec/meson.build
rename to lib/ipsec/meson.build
diff --git a/lib/librte_ipsec/misc.h b/lib/ipsec/misc.h
similarity index 100%
rename from lib/librte_ipsec/misc.h
rename to lib/ipsec/misc.h
diff --git a/lib/librte_ipsec/pad.h b/lib/ipsec/pad.h
similarity index 100%
rename from lib/librte_ipsec/pad.h
rename to lib/ipsec/pad.h
diff --git a/lib/librte_ipsec/rte_ipsec.h b/lib/ipsec/rte_ipsec.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec.h
rename to lib/ipsec/rte_ipsec.h
diff --git a/lib/librte_ipsec/rte_ipsec_group.h b/lib/ipsec/rte_ipsec_group.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_group.h
rename to lib/ipsec/rte_ipsec_group.h
diff --git a/lib/librte_ipsec/rte_ipsec_sa.h b/lib/ipsec/rte_ipsec_sa.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_sa.h
rename to lib/ipsec/rte_ipsec_sa.h
diff --git a/lib/librte_ipsec/rte_ipsec_sad.h b/lib/ipsec/rte_ipsec_sad.h
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_sad.h
rename to lib/ipsec/rte_ipsec_sad.h
diff --git a/lib/librte_ipsec/sa.c b/lib/ipsec/sa.c
similarity index 100%
rename from lib/librte_ipsec/sa.c
rename to lib/ipsec/sa.c
diff --git a/lib/librte_ipsec/sa.h b/lib/ipsec/sa.h
similarity index 100%
rename from lib/librte_ipsec/sa.h
rename to lib/ipsec/sa.h
diff --git a/lib/librte_ipsec/ses.c b/lib/ipsec/ses.c
similarity index 100%
rename from lib/librte_ipsec/ses.c
rename to lib/ipsec/ses.c
diff --git a/lib/librte_ipsec/version.map b/lib/ipsec/version.map
similarity index 100%
rename from lib/librte_ipsec/version.map
rename to lib/ipsec/version.map
diff --git a/lib/librte_jobstats/meson.build b/lib/jobstats/meson.build
similarity index 100%
rename from lib/librte_jobstats/meson.build
rename to lib/jobstats/meson.build
diff --git a/lib/librte_jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
similarity index 100%
rename from lib/librte_jobstats/rte_jobstats.c
rename to lib/jobstats/rte_jobstats.c
diff --git a/lib/librte_jobstats/rte_jobstats.h b/lib/jobstats/rte_jobstats.h
similarity index 100%
rename from lib/librte_jobstats/rte_jobstats.h
rename to lib/jobstats/rte_jobstats.h
diff --git a/lib/librte_jobstats/version.map b/lib/jobstats/version.map
similarity index 100%
rename from lib/librte_jobstats/version.map
rename to lib/jobstats/version.map
diff --git a/lib/librte_kni/meson.build b/lib/kni/meson.build
similarity index 100%
rename from lib/librte_kni/meson.build
rename to lib/kni/meson.build
diff --git a/lib/librte_kni/rte_kni.c b/lib/kni/rte_kni.c
similarity index 100%
rename from lib/librte_kni/rte_kni.c
rename to lib/kni/rte_kni.c
diff --git a/lib/librte_kni/rte_kni.h b/lib/kni/rte_kni.h
similarity index 100%
rename from lib/librte_kni/rte_kni.h
rename to lib/kni/rte_kni.h
diff --git a/lib/librte_kni/rte_kni_common.h b/lib/kni/rte_kni_common.h
similarity index 100%
rename from lib/librte_kni/rte_kni_common.h
rename to lib/kni/rte_kni_common.h
diff --git a/lib/librte_kni/rte_kni_fifo.h b/lib/kni/rte_kni_fifo.h
similarity index 100%
rename from lib/librte_kni/rte_kni_fifo.h
rename to lib/kni/rte_kni_fifo.h
diff --git a/lib/librte_kni/version.map b/lib/kni/version.map
similarity index 100%
rename from lib/librte_kni/version.map
rename to lib/kni/version.map
diff --git a/lib/librte_kvargs/meson.build b/lib/kvargs/meson.build
similarity index 100%
rename from lib/librte_kvargs/meson.build
rename to lib/kvargs/meson.build
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c
similarity index 100%
rename from lib/librte_kvargs/rte_kvargs.c
rename to lib/kvargs/rte_kvargs.c
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/kvargs/rte_kvargs.h
similarity index 100%
rename from lib/librte_kvargs/rte_kvargs.h
rename to lib/kvargs/rte_kvargs.h
diff --git a/lib/librte_kvargs/version.map b/lib/kvargs/version.map
similarity index 100%
rename from lib/librte_kvargs/version.map
rename to lib/kvargs/version.map
diff --git a/lib/librte_latencystats/meson.build b/lib/latencystats/meson.build
similarity index 100%
rename from lib/librte_latencystats/meson.build
rename to lib/latencystats/meson.build
diff --git a/lib/librte_latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c
similarity index 100%
rename from lib/librte_latencystats/rte_latencystats.c
rename to lib/latencystats/rte_latencystats.c
diff --git a/lib/librte_latencystats/rte_latencystats.h b/lib/latencystats/rte_latencystats.h
similarity index 100%
rename from lib/librte_latencystats/rte_latencystats.h
rename to lib/latencystats/rte_latencystats.h
diff --git a/lib/librte_latencystats/version.map b/lib/latencystats/version.map
similarity index 100%
rename from lib/librte_latencystats/version.map
rename to lib/latencystats/version.map
diff --git a/lib/librte_lpm/meson.build b/lib/lpm/meson.build
similarity index 100%
rename from lib/librte_lpm/meson.build
rename to lib/lpm/meson.build
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
similarity index 100%
rename from lib/librte_lpm/rte_lpm.c
rename to lib/lpm/rte_lpm.c
diff --git a/lib/librte_lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm.h
rename to lib/lpm/rte_lpm.h
diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
similarity index 100%
rename from lib/librte_lpm/rte_lpm6.c
rename to lib/lpm/rte_lpm6.c
diff --git a/lib/librte_lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm6.h
rename to lib/lpm/rte_lpm6.h
diff --git a/lib/librte_lpm/rte_lpm_altivec.h b/lib/lpm/rte_lpm_altivec.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_altivec.h
rename to lib/lpm/rte_lpm_altivec.h
diff --git a/lib/librte_lpm/rte_lpm_neon.h b/lib/lpm/rte_lpm_neon.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_neon.h
rename to lib/lpm/rte_lpm_neon.h
diff --git a/lib/librte_lpm/rte_lpm_sse.h b/lib/lpm/rte_lpm_sse.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_sse.h
rename to lib/lpm/rte_lpm_sse.h
diff --git a/lib/librte_lpm/rte_lpm_sve.h b/lib/lpm/rte_lpm_sve.h
similarity index 100%
rename from lib/librte_lpm/rte_lpm_sve.h
rename to lib/lpm/rte_lpm_sve.h
diff --git a/lib/librte_lpm/version.map b/lib/lpm/version.map
similarity index 100%
rename from lib/librte_lpm/version.map
rename to lib/lpm/version.map
diff --git a/lib/librte_mbuf/meson.build b/lib/mbuf/meson.build
similarity index 100%
rename from lib/librte_mbuf/meson.build
rename to lib/mbuf/meson.build
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf.c
rename to lib/mbuf/rte_mbuf.c
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf.h
rename to lib/mbuf/rte_mbuf.h
diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_core.h
rename to lib/mbuf/rte_mbuf_core.h
diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_dyn.c
rename to lib/mbuf/rte_mbuf_dyn.c
diff --git a/lib/librte_mbuf/rte_mbuf_dyn.h b/lib/mbuf/rte_mbuf_dyn.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_dyn.h
rename to lib/mbuf/rte_mbuf_dyn.h
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_pool_ops.c
rename to lib/mbuf/rte_mbuf_pool_ops.c
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.h b/lib/mbuf/rte_mbuf_pool_ops.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_pool_ops.h
rename to lib/mbuf/rte_mbuf_pool_ops.h
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.c b/lib/mbuf/rte_mbuf_ptype.c
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_ptype.c
rename to lib/mbuf/rte_mbuf_ptype.c
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/mbuf/rte_mbuf_ptype.h
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_ptype.h
rename to lib/mbuf/rte_mbuf_ptype.h
diff --git a/lib/librte_mbuf/version.map b/lib/mbuf/version.map
similarity index 100%
rename from lib/librte_mbuf/version.map
rename to lib/mbuf/version.map
diff --git a/lib/librte_member/meson.build b/lib/member/meson.build
similarity index 100%
rename from lib/librte_member/meson.build
rename to lib/member/meson.build
diff --git a/lib/librte_member/rte_member.c b/lib/member/rte_member.c
similarity index 100%
rename from lib/librte_member/rte_member.c
rename to lib/member/rte_member.c
diff --git a/lib/librte_member/rte_member.h b/lib/member/rte_member.h
similarity index 100%
rename from lib/librte_member/rte_member.h
rename to lib/member/rte_member.h
diff --git a/lib/librte_member/rte_member_ht.c b/lib/member/rte_member_ht.c
similarity index 100%
rename from lib/librte_member/rte_member_ht.c
rename to lib/member/rte_member_ht.c
diff --git a/lib/librte_member/rte_member_ht.h b/lib/member/rte_member_ht.h
similarity index 100%
rename from lib/librte_member/rte_member_ht.h
rename to lib/member/rte_member_ht.h
diff --git a/lib/librte_member/rte_member_vbf.c b/lib/member/rte_member_vbf.c
similarity index 100%
rename from lib/librte_member/rte_member_vbf.c
rename to lib/member/rte_member_vbf.c
diff --git a/lib/librte_member/rte_member_vbf.h b/lib/member/rte_member_vbf.h
similarity index 100%
rename from lib/librte_member/rte_member_vbf.h
rename to lib/member/rte_member_vbf.h
diff --git a/lib/librte_member/rte_member_x86.h b/lib/member/rte_member_x86.h
similarity index 100%
rename from lib/librte_member/rte_member_x86.h
rename to lib/member/rte_member_x86.h
diff --git a/lib/librte_member/version.map b/lib/member/version.map
similarity index 100%
rename from lib/librte_member/version.map
rename to lib/member/version.map
diff --git a/lib/librte_mempool/mempool_trace_points.c b/lib/mempool/mempool_trace_points.c
similarity index 100%
rename from lib/librte_mempool/mempool_trace_points.c
rename to lib/mempool/mempool_trace_points.c
diff --git a/lib/librte_mempool/meson.build b/lib/mempool/meson.build
similarity index 100%
rename from lib/librte_mempool/meson.build
rename to lib/mempool/meson.build
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool.c
rename to lib/mempool/rte_mempool.c
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool.h
rename to lib/mempool/rte_mempool.h
diff --git a/lib/librte_mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool_ops.c
rename to lib/mempool/rte_mempool_ops.c
diff --git a/lib/librte_mempool/rte_mempool_ops_default.c b/lib/mempool/rte_mempool_ops_default.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool_ops_default.c
rename to lib/mempool/rte_mempool_ops_default.c
diff --git a/lib/librte_mempool/rte_mempool_trace.h b/lib/mempool/rte_mempool_trace.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool_trace.h
rename to lib/mempool/rte_mempool_trace.h
diff --git a/lib/librte_mempool/rte_mempool_trace_fp.h b/lib/mempool/rte_mempool_trace_fp.h
similarity index 100%
rename from lib/librte_mempool/rte_mempool_trace_fp.h
rename to lib/mempool/rte_mempool_trace_fp.h
diff --git a/lib/librte_mempool/version.map b/lib/mempool/version.map
similarity index 100%
rename from lib/librte_mempool/version.map
rename to lib/mempool/version.map
diff --git a/lib/meson.build b/lib/meson.build
index 9b99aa0be0..3a9a6c3be4 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -114,8 +114,10 @@ foreach l:libraries
         deps += ['eal']
     endif
 
-    dir_name = 'librte_' + l
-    subdir(dir_name)
+    subdir(l)
+    if name != l
+        warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
+    endif
 
     if not build
         dpdk_libs_disabled += name
@@ -128,7 +130,7 @@ foreach l:libraries
     foreach d:deps
         if not is_variable('shared_rte_' + d)
             error('Missing internal dependency "@0@" for @1@ [@2@]'
-                    .format(d, name, 'lib/' + dir_name))
+                    .format(d, name, 'lib/' + l))
         endif
         shared_deps += [get_variable('shared_rte_' + d)]
         static_deps += [get_variable('static_rte_' + d)]
@@ -144,7 +146,7 @@ foreach l:libraries
     dpdk_chkinc_headers += headers
 
     libname = 'rte_' + name
-    includes += include_directories(dir_name)
+    includes += include_directories(l)
 
     if is_windows and use_function_versioning
         message('@0@: Function versioning is not supported by Windows.'.format(name))
@@ -176,8 +178,8 @@ foreach l:libraries
         cflags += '-DRTE_BUILD_SHARED_LIB'
     endif
     version_map = '@0@/@1@/version.map'.format(
-            meson.current_source_dir(), dir_name)
-    implib = dir_name + '.dll.a'
+            meson.current_source_dir(), l)
+    implib = 'librte_' + l + '.dll.a'
 
     def_file = custom_target(libname + '_def',
             command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
@@ -236,6 +238,6 @@ foreach l:libraries
     set_variable('shared_rte_' + name, shared_dep)
     set_variable('static_rte_' + name, static_dep)
     if developer_mode
-        message('lib/@0@: Defining dependency "@1@"'.format(dir_name, name))
+        message('lib/@0@: Defining dependency "@1@"'.format(l, name))
     endif
 endforeach
diff --git a/lib/librte_meter/meson.build b/lib/meter/meson.build
similarity index 100%
rename from lib/librte_meter/meson.build
rename to lib/meter/meson.build
diff --git a/lib/librte_meter/rte_meter.c b/lib/meter/rte_meter.c
similarity index 100%
rename from lib/librte_meter/rte_meter.c
rename to lib/meter/rte_meter.c
diff --git a/lib/librte_meter/rte_meter.h b/lib/meter/rte_meter.h
similarity index 100%
rename from lib/librte_meter/rte_meter.h
rename to lib/meter/rte_meter.h
diff --git a/lib/librte_meter/version.map b/lib/meter/version.map
similarity index 100%
rename from lib/librte_meter/version.map
rename to lib/meter/version.map
diff --git a/lib/librte_metrics/meson.build b/lib/metrics/meson.build
similarity index 100%
rename from lib/librte_metrics/meson.build
rename to lib/metrics/meson.build
diff --git a/lib/librte_metrics/rte_metrics.c b/lib/metrics/rte_metrics.c
similarity index 100%
rename from lib/librte_metrics/rte_metrics.c
rename to lib/metrics/rte_metrics.c
diff --git a/lib/librte_metrics/rte_metrics.h b/lib/metrics/rte_metrics.h
similarity index 100%
rename from lib/librte_metrics/rte_metrics.h
rename to lib/metrics/rte_metrics.h
diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/metrics/rte_metrics_telemetry.c
similarity index 100%
rename from lib/librte_metrics/rte_metrics_telemetry.c
rename to lib/metrics/rte_metrics_telemetry.c
diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/metrics/rte_metrics_telemetry.h
similarity index 100%
rename from lib/librte_metrics/rte_metrics_telemetry.h
rename to lib/metrics/rte_metrics_telemetry.h
diff --git a/lib/librte_metrics/version.map b/lib/metrics/version.map
similarity index 100%
rename from lib/librte_metrics/version.map
rename to lib/metrics/version.map
diff --git a/lib/librte_net/meson.build b/lib/net/meson.build
similarity index 100%
rename from lib/librte_net/meson.build
rename to lib/net/meson.build
diff --git a/lib/librte_net/net_crc.h b/lib/net/net_crc.h
similarity index 100%
rename from lib/librte_net/net_crc.h
rename to lib/net/net_crc.h
diff --git a/lib/librte_net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
similarity index 100%
rename from lib/librte_net/net_crc_avx512.c
rename to lib/net/net_crc_avx512.c
diff --git a/lib/librte_net/net_crc_neon.c b/lib/net/net_crc_neon.c
similarity index 100%
rename from lib/librte_net/net_crc_neon.c
rename to lib/net/net_crc_neon.c
diff --git a/lib/librte_net/net_crc_sse.c b/lib/net/net_crc_sse.c
similarity index 100%
rename from lib/librte_net/net_crc_sse.c
rename to lib/net/net_crc_sse.c
diff --git a/lib/librte_net/rte_arp.c b/lib/net/rte_arp.c
similarity index 100%
rename from lib/librte_net/rte_arp.c
rename to lib/net/rte_arp.c
diff --git a/lib/librte_net/rte_arp.h b/lib/net/rte_arp.h
similarity index 100%
rename from lib/librte_net/rte_arp.h
rename to lib/net/rte_arp.h
diff --git a/lib/librte_net/rte_ecpri.h b/lib/net/rte_ecpri.h
similarity index 100%
rename from lib/librte_net/rte_ecpri.h
rename to lib/net/rte_ecpri.h
diff --git a/lib/librte_net/rte_esp.h b/lib/net/rte_esp.h
similarity index 100%
rename from lib/librte_net/rte_esp.h
rename to lib/net/rte_esp.h
diff --git a/lib/librte_net/rte_ether.c b/lib/net/rte_ether.c
similarity index 100%
rename from lib/librte_net/rte_ether.c
rename to lib/net/rte_ether.c
diff --git a/lib/librte_net/rte_ether.h b/lib/net/rte_ether.h
similarity index 100%
rename from lib/librte_net/rte_ether.h
rename to lib/net/rte_ether.h
diff --git a/lib/librte_net/rte_geneve.h b/lib/net/rte_geneve.h
similarity index 100%
rename from lib/librte_net/rte_geneve.h
rename to lib/net/rte_geneve.h
diff --git a/lib/librte_net/rte_gre.h b/lib/net/rte_gre.h
similarity index 100%
rename from lib/librte_net/rte_gre.h
rename to lib/net/rte_gre.h
diff --git a/lib/librte_net/rte_gtp.h b/lib/net/rte_gtp.h
similarity index 100%
rename from lib/librte_net/rte_gtp.h
rename to lib/net/rte_gtp.h
diff --git a/lib/librte_net/rte_higig.h b/lib/net/rte_higig.h
similarity index 100%
rename from lib/librte_net/rte_higig.h
rename to lib/net/rte_higig.h
diff --git a/lib/librte_net/rte_icmp.h b/lib/net/rte_icmp.h
similarity index 100%
rename from lib/librte_net/rte_icmp.h
rename to lib/net/rte_icmp.h
diff --git a/lib/librte_net/rte_ip.h b/lib/net/rte_ip.h
similarity index 100%
rename from lib/librte_net/rte_ip.h
rename to lib/net/rte_ip.h
diff --git a/lib/librte_net/rte_mpls.h b/lib/net/rte_mpls.h
similarity index 100%
rename from lib/librte_net/rte_mpls.h
rename to lib/net/rte_mpls.h
diff --git a/lib/librte_net/rte_net.c b/lib/net/rte_net.c
similarity index 100%
rename from lib/librte_net/rte_net.c
rename to lib/net/rte_net.c
diff --git a/lib/librte_net/rte_net.h b/lib/net/rte_net.h
similarity index 100%
rename from lib/librte_net/rte_net.h
rename to lib/net/rte_net.h
diff --git a/lib/librte_net/rte_net_crc.c b/lib/net/rte_net_crc.c
similarity index 100%
rename from lib/librte_net/rte_net_crc.c
rename to lib/net/rte_net_crc.c
diff --git a/lib/librte_net/rte_net_crc.h b/lib/net/rte_net_crc.h
similarity index 100%
rename from lib/librte_net/rte_net_crc.h
rename to lib/net/rte_net_crc.h
diff --git a/lib/librte_net/rte_sctp.h b/lib/net/rte_sctp.h
similarity index 100%
rename from lib/librte_net/rte_sctp.h
rename to lib/net/rte_sctp.h
diff --git a/lib/librte_net/rte_tcp.h b/lib/net/rte_tcp.h
similarity index 100%
rename from lib/librte_net/rte_tcp.h
rename to lib/net/rte_tcp.h
diff --git a/lib/librte_net/rte_udp.h b/lib/net/rte_udp.h
similarity index 100%
rename from lib/librte_net/rte_udp.h
rename to lib/net/rte_udp.h
diff --git a/lib/librte_net/rte_vxlan.h b/lib/net/rte_vxlan.h
similarity index 100%
rename from lib/librte_net/rte_vxlan.h
rename to lib/net/rte_vxlan.h
diff --git a/lib/librte_net/version.map b/lib/net/version.map
similarity index 100%
rename from lib/librte_net/version.map
rename to lib/net/version.map
diff --git a/lib/librte_node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
similarity index 100%
rename from lib/librte_node/ethdev_ctrl.c
rename to lib/node/ethdev_ctrl.c
diff --git a/lib/librte_node/ethdev_rx.c b/lib/node/ethdev_rx.c
similarity index 100%
rename from lib/librte_node/ethdev_rx.c
rename to lib/node/ethdev_rx.c
diff --git a/lib/librte_node/ethdev_rx_priv.h b/lib/node/ethdev_rx_priv.h
similarity index 100%
rename from lib/librte_node/ethdev_rx_priv.h
rename to lib/node/ethdev_rx_priv.h
diff --git a/lib/librte_node/ethdev_tx.c b/lib/node/ethdev_tx.c
similarity index 100%
rename from lib/librte_node/ethdev_tx.c
rename to lib/node/ethdev_tx.c
diff --git a/lib/librte_node/ethdev_tx_priv.h b/lib/node/ethdev_tx_priv.h
similarity index 100%
rename from lib/librte_node/ethdev_tx_priv.h
rename to lib/node/ethdev_tx_priv.h
diff --git a/lib/librte_node/ip4_lookup.c b/lib/node/ip4_lookup.c
similarity index 100%
rename from lib/librte_node/ip4_lookup.c
rename to lib/node/ip4_lookup.c
diff --git a/lib/librte_node/ip4_lookup_neon.h b/lib/node/ip4_lookup_neon.h
similarity index 100%
rename from lib/librte_node/ip4_lookup_neon.h
rename to lib/node/ip4_lookup_neon.h
diff --git a/lib/librte_node/ip4_lookup_sse.h b/lib/node/ip4_lookup_sse.h
similarity index 100%
rename from lib/librte_node/ip4_lookup_sse.h
rename to lib/node/ip4_lookup_sse.h
diff --git a/lib/librte_node/ip4_rewrite.c b/lib/node/ip4_rewrite.c
similarity index 100%
rename from lib/librte_node/ip4_rewrite.c
rename to lib/node/ip4_rewrite.c
diff --git a/lib/librte_node/ip4_rewrite_priv.h b/lib/node/ip4_rewrite_priv.h
similarity index 100%
rename from lib/librte_node/ip4_rewrite_priv.h
rename to lib/node/ip4_rewrite_priv.h
diff --git a/lib/librte_node/log.c b/lib/node/log.c
similarity index 100%
rename from lib/librte_node/log.c
rename to lib/node/log.c
diff --git a/lib/librte_node/meson.build b/lib/node/meson.build
similarity index 100%
rename from lib/librte_node/meson.build
rename to lib/node/meson.build
diff --git a/lib/librte_node/node_private.h b/lib/node/node_private.h
similarity index 100%
rename from lib/librte_node/node_private.h
rename to lib/node/node_private.h
diff --git a/lib/librte_node/null.c b/lib/node/null.c
similarity index 100%
rename from lib/librte_node/null.c
rename to lib/node/null.c
diff --git a/lib/librte_node/pkt_cls.c b/lib/node/pkt_cls.c
similarity index 100%
rename from lib/librte_node/pkt_cls.c
rename to lib/node/pkt_cls.c
diff --git a/lib/librte_node/pkt_cls_priv.h b/lib/node/pkt_cls_priv.h
similarity index 100%
rename from lib/librte_node/pkt_cls_priv.h
rename to lib/node/pkt_cls_priv.h
diff --git a/lib/librte_node/pkt_drop.c b/lib/node/pkt_drop.c
similarity index 100%
rename from lib/librte_node/pkt_drop.c
rename to lib/node/pkt_drop.c
diff --git a/lib/librte_node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
similarity index 100%
rename from lib/librte_node/rte_node_eth_api.h
rename to lib/node/rte_node_eth_api.h
diff --git a/lib/librte_node/rte_node_ip4_api.h b/lib/node/rte_node_ip4_api.h
similarity index 100%
rename from lib/librte_node/rte_node_ip4_api.h
rename to lib/node/rte_node_ip4_api.h
diff --git a/lib/librte_node/version.map b/lib/node/version.map
similarity index 100%
rename from lib/librte_node/version.map
rename to lib/node/version.map
diff --git a/lib/librte_pci/meson.build b/lib/pci/meson.build
similarity index 100%
rename from lib/librte_pci/meson.build
rename to lib/pci/meson.build
diff --git a/lib/librte_pci/rte_pci.c b/lib/pci/rte_pci.c
similarity index 100%
rename from lib/librte_pci/rte_pci.c
rename to lib/pci/rte_pci.c
diff --git a/lib/librte_pci/rte_pci.h b/lib/pci/rte_pci.h
similarity index 100%
rename from lib/librte_pci/rte_pci.h
rename to lib/pci/rte_pci.h
diff --git a/lib/librte_pci/version.map b/lib/pci/version.map
similarity index 100%
rename from lib/librte_pci/version.map
rename to lib/pci/version.map
diff --git a/lib/librte_pdump/meson.build b/lib/pdump/meson.build
similarity index 100%
rename from lib/librte_pdump/meson.build
rename to lib/pdump/meson.build
diff --git a/lib/librte_pdump/rte_pdump.c b/lib/pdump/rte_pdump.c
similarity index 100%
rename from lib/librte_pdump/rte_pdump.c
rename to lib/pdump/rte_pdump.c
diff --git a/lib/librte_pdump/rte_pdump.h b/lib/pdump/rte_pdump.h
similarity index 100%
rename from lib/librte_pdump/rte_pdump.h
rename to lib/pdump/rte_pdump.h
diff --git a/lib/librte_pdump/version.map b/lib/pdump/version.map
similarity index 100%
rename from lib/librte_pdump/version.map
rename to lib/pdump/version.map
diff --git a/lib/librte_pipeline/meson.build b/lib/pipeline/meson.build
similarity index 100%
rename from lib/librte_pipeline/meson.build
rename to lib/pipeline/meson.build
diff --git a/lib/librte_pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
similarity index 100%
rename from lib/librte_pipeline/rte_pipeline.c
rename to lib/pipeline/rte_pipeline.c
diff --git a/lib/librte_pipeline/rte_pipeline.h b/lib/pipeline/rte_pipeline.h
similarity index 100%
rename from lib/librte_pipeline/rte_pipeline.h
rename to lib/pipeline/rte_pipeline.h
diff --git a/lib/librte_pipeline/rte_port_in_action.c b/lib/pipeline/rte_port_in_action.c
similarity index 100%
rename from lib/librte_pipeline/rte_port_in_action.c
rename to lib/pipeline/rte_port_in_action.c
diff --git a/lib/librte_pipeline/rte_port_in_action.h b/lib/pipeline/rte_port_in_action.h
similarity index 100%
rename from lib/librte_pipeline/rte_port_in_action.h
rename to lib/pipeline/rte_port_in_action.h
diff --git a/lib/librte_pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_ctl.c
rename to lib/pipeline/rte_swx_ctl.c
diff --git a/lib/librte_pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_ctl.h
rename to lib/pipeline/rte_swx_ctl.h
diff --git a/lib/librte_pipeline/rte_swx_extern.h b/lib/pipeline/rte_swx_extern.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_extern.h
rename to lib/pipeline/rte_swx_extern.h
diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline.c
rename to lib/pipeline/rte_swx_pipeline.c
diff --git a/lib/librte_pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline.h
rename to lib/pipeline/rte_swx_pipeline.h
diff --git a/lib/librte_pipeline/rte_swx_pipeline_spec.c b/lib/pipeline/rte_swx_pipeline_spec.c
similarity index 100%
rename from lib/librte_pipeline/rte_swx_pipeline_spec.c
rename to lib/pipeline/rte_swx_pipeline_spec.c
diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c
similarity index 100%
rename from lib/librte_pipeline/rte_table_action.c
rename to lib/pipeline/rte_table_action.c
diff --git a/lib/librte_pipeline/rte_table_action.h b/lib/pipeline/rte_table_action.h
similarity index 100%
rename from lib/librte_pipeline/rte_table_action.h
rename to lib/pipeline/rte_table_action.h
diff --git a/lib/librte_pipeline/version.map b/lib/pipeline/version.map
similarity index 100%
rename from lib/librte_pipeline/version.map
rename to lib/pipeline/version.map
diff --git a/lib/librte_port/meson.build b/lib/port/meson.build
similarity index 100%
rename from lib/librte_port/meson.build
rename to lib/port/meson.build
diff --git a/lib/librte_port/rte_port.h b/lib/port/rte_port.h
similarity index 100%
rename from lib/librte_port/rte_port.h
rename to lib/port/rte_port.h
diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/port/rte_port_ethdev.c
similarity index 100%
rename from lib/librte_port/rte_port_ethdev.c
rename to lib/port/rte_port_ethdev.c
diff --git a/lib/librte_port/rte_port_ethdev.h b/lib/port/rte_port_ethdev.h
similarity index 100%
rename from lib/librte_port/rte_port_ethdev.h
rename to lib/port/rte_port_ethdev.h
diff --git a/lib/librte_port/rte_port_eventdev.c b/lib/port/rte_port_eventdev.c
similarity index 100%
rename from lib/librte_port/rte_port_eventdev.c
rename to lib/port/rte_port_eventdev.c
diff --git a/lib/librte_port/rte_port_eventdev.h b/lib/port/rte_port_eventdev.h
similarity index 100%
rename from lib/librte_port/rte_port_eventdev.h
rename to lib/port/rte_port_eventdev.h
diff --git a/lib/librte_port/rte_port_fd.c b/lib/port/rte_port_fd.c
similarity index 100%
rename from lib/librte_port/rte_port_fd.c
rename to lib/port/rte_port_fd.c
diff --git a/lib/librte_port/rte_port_fd.h b/lib/port/rte_port_fd.h
similarity index 100%
rename from lib/librte_port/rte_port_fd.h
rename to lib/port/rte_port_fd.h
diff --git a/lib/librte_port/rte_port_frag.c b/lib/port/rte_port_frag.c
similarity index 100%
rename from lib/librte_port/rte_port_frag.c
rename to lib/port/rte_port_frag.c
diff --git a/lib/librte_port/rte_port_frag.h b/lib/port/rte_port_frag.h
similarity index 100%
rename from lib/librte_port/rte_port_frag.h
rename to lib/port/rte_port_frag.h
diff --git a/lib/librte_port/rte_port_kni.c b/lib/port/rte_port_kni.c
similarity index 100%
rename from lib/librte_port/rte_port_kni.c
rename to lib/port/rte_port_kni.c
diff --git a/lib/librte_port/rte_port_kni.h b/lib/port/rte_port_kni.h
similarity index 100%
rename from lib/librte_port/rte_port_kni.h
rename to lib/port/rte_port_kni.h
diff --git a/lib/librte_port/rte_port_ras.c b/lib/port/rte_port_ras.c
similarity index 100%
rename from lib/librte_port/rte_port_ras.c
rename to lib/port/rte_port_ras.c
diff --git a/lib/librte_port/rte_port_ras.h b/lib/port/rte_port_ras.h
similarity index 100%
rename from lib/librte_port/rte_port_ras.h
rename to lib/port/rte_port_ras.h
diff --git a/lib/librte_port/rte_port_ring.c b/lib/port/rte_port_ring.c
similarity index 100%
rename from lib/librte_port/rte_port_ring.c
rename to lib/port/rte_port_ring.c
diff --git a/lib/librte_port/rte_port_ring.h b/lib/port/rte_port_ring.h
similarity index 100%
rename from lib/librte_port/rte_port_ring.h
rename to lib/port/rte_port_ring.h
diff --git a/lib/librte_port/rte_port_sched.c b/lib/port/rte_port_sched.c
similarity index 100%
rename from lib/librte_port/rte_port_sched.c
rename to lib/port/rte_port_sched.c
diff --git a/lib/librte_port/rte_port_sched.h b/lib/port/rte_port_sched.h
similarity index 100%
rename from lib/librte_port/rte_port_sched.h
rename to lib/port/rte_port_sched.h
diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/port/rte_port_source_sink.c
similarity index 100%
rename from lib/librte_port/rte_port_source_sink.c
rename to lib/port/rte_port_source_sink.c
diff --git a/lib/librte_port/rte_port_source_sink.h b/lib/port/rte_port_source_sink.h
similarity index 100%
rename from lib/librte_port/rte_port_source_sink.h
rename to lib/port/rte_port_source_sink.h
diff --git a/lib/librte_port/rte_port_sym_crypto.c b/lib/port/rte_port_sym_crypto.c
similarity index 100%
rename from lib/librte_port/rte_port_sym_crypto.c
rename to lib/port/rte_port_sym_crypto.c
diff --git a/lib/librte_port/rte_port_sym_crypto.h b/lib/port/rte_port_sym_crypto.h
similarity index 100%
rename from lib/librte_port/rte_port_sym_crypto.h
rename to lib/port/rte_port_sym_crypto.h
diff --git a/lib/librte_port/rte_swx_port.h b/lib/port/rte_swx_port.h
similarity index 100%
rename from lib/librte_port/rte_swx_port.h
rename to lib/port/rte_swx_port.h
diff --git a/lib/librte_port/rte_swx_port_ethdev.c b/lib/port/rte_swx_port_ethdev.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_ethdev.c
rename to lib/port/rte_swx_port_ethdev.c
diff --git a/lib/librte_port/rte_swx_port_ethdev.h b/lib/port/rte_swx_port_ethdev.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_ethdev.h
rename to lib/port/rte_swx_port_ethdev.h
diff --git a/lib/librte_port/rte_swx_port_fd.c b/lib/port/rte_swx_port_fd.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_fd.c
rename to lib/port/rte_swx_port_fd.c
diff --git a/lib/librte_port/rte_swx_port_fd.h b/lib/port/rte_swx_port_fd.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_fd.h
rename to lib/port/rte_swx_port_fd.h
diff --git a/lib/librte_port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_ring.c
rename to lib/port/rte_swx_port_ring.c
diff --git a/lib/librte_port/rte_swx_port_ring.h b/lib/port/rte_swx_port_ring.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_ring.h
rename to lib/port/rte_swx_port_ring.h
diff --git a/lib/librte_port/rte_swx_port_source_sink.c b/lib/port/rte_swx_port_source_sink.c
similarity index 100%
rename from lib/librte_port/rte_swx_port_source_sink.c
rename to lib/port/rte_swx_port_source_sink.c
diff --git a/lib/librte_port/rte_swx_port_source_sink.h b/lib/port/rte_swx_port_source_sink.h
similarity index 100%
rename from lib/librte_port/rte_swx_port_source_sink.h
rename to lib/port/rte_swx_port_source_sink.h
diff --git a/lib/librte_port/version.map b/lib/port/version.map
similarity index 100%
rename from lib/librte_port/version.map
rename to lib/port/version.map
diff --git a/lib/librte_power/guest_channel.c b/lib/power/guest_channel.c
similarity index 100%
rename from lib/librte_power/guest_channel.c
rename to lib/power/guest_channel.c
diff --git a/lib/librte_power/guest_channel.h b/lib/power/guest_channel.h
similarity index 100%
rename from lib/librte_power/guest_channel.h
rename to lib/power/guest_channel.h
diff --git a/lib/librte_power/meson.build b/lib/power/meson.build
similarity index 100%
rename from lib/librte_power/meson.build
rename to lib/power/meson.build
diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
similarity index 100%
rename from lib/librte_power/power_acpi_cpufreq.c
rename to lib/power/power_acpi_cpufreq.c
diff --git a/lib/librte_power/power_acpi_cpufreq.h b/lib/power/power_acpi_cpufreq.h
similarity index 100%
rename from lib/librte_power/power_acpi_cpufreq.h
rename to lib/power/power_acpi_cpufreq.h
diff --git a/lib/librte_power/power_common.c b/lib/power/power_common.c
similarity index 100%
rename from lib/librte_power/power_common.c
rename to lib/power/power_common.c
diff --git a/lib/librte_power/power_common.h b/lib/power/power_common.h
similarity index 100%
rename from lib/librte_power/power_common.h
rename to lib/power/power_common.h
diff --git a/lib/librte_power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
similarity index 100%
rename from lib/librte_power/power_kvm_vm.c
rename to lib/power/power_kvm_vm.c
diff --git a/lib/librte_power/power_kvm_vm.h b/lib/power/power_kvm_vm.h
similarity index 100%
rename from lib/librte_power/power_kvm_vm.h
rename to lib/power/power_kvm_vm.h
diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c
similarity index 100%
rename from lib/librte_power/power_pstate_cpufreq.c
rename to lib/power/power_pstate_cpufreq.c
diff --git a/lib/librte_power/power_pstate_cpufreq.h b/lib/power/power_pstate_cpufreq.h
similarity index 100%
rename from lib/librte_power/power_pstate_cpufreq.h
rename to lib/power/power_pstate_cpufreq.h
diff --git a/lib/librte_power/rte_power.c b/lib/power/rte_power.c
similarity index 100%
rename from lib/librte_power/rte_power.c
rename to lib/power/rte_power.c
diff --git a/lib/librte_power/rte_power.h b/lib/power/rte_power.h
similarity index 100%
rename from lib/librte_power/rte_power.h
rename to lib/power/rte_power.h
diff --git a/lib/librte_power/rte_power_empty_poll.c b/lib/power/rte_power_empty_poll.c
similarity index 100%
rename from lib/librte_power/rte_power_empty_poll.c
rename to lib/power/rte_power_empty_poll.c
diff --git a/lib/librte_power/rte_power_empty_poll.h b/lib/power/rte_power_empty_poll.h
similarity index 100%
rename from lib/librte_power/rte_power_empty_poll.h
rename to lib/power/rte_power_empty_poll.h
diff --git a/lib/librte_power/rte_power_guest_channel.h b/lib/power/rte_power_guest_channel.h
similarity index 100%
rename from lib/librte_power/rte_power_guest_channel.h
rename to lib/power/rte_power_guest_channel.h
diff --git a/lib/librte_power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
similarity index 100%
rename from lib/librte_power/rte_power_pmd_mgmt.c
rename to lib/power/rte_power_pmd_mgmt.c
diff --git a/lib/librte_power/rte_power_pmd_mgmt.h b/lib/power/rte_power_pmd_mgmt.h
similarity index 100%
rename from lib/librte_power/rte_power_pmd_mgmt.h
rename to lib/power/rte_power_pmd_mgmt.h
diff --git a/lib/librte_power/version.map b/lib/power/version.map
similarity index 100%
rename from lib/librte_power/version.map
rename to lib/power/version.map
diff --git a/lib/librte_rawdev/meson.build b/lib/rawdev/meson.build
similarity index 100%
rename from lib/librte_rawdev/meson.build
rename to lib/rawdev/meson.build
diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev.c
rename to lib/rawdev/rte_rawdev.c
diff --git a/lib/librte_rawdev/rte_rawdev.h b/lib/rawdev/rte_rawdev.h
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev.h
rename to lib/rawdev/rte_rawdev.h
diff --git a/lib/librte_rawdev/rte_rawdev_pmd.h b/lib/rawdev/rte_rawdev_pmd.h
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev_pmd.h
rename to lib/rawdev/rte_rawdev_pmd.h
diff --git a/lib/librte_rawdev/version.map b/lib/rawdev/version.map
similarity index 100%
rename from lib/librte_rawdev/version.map
rename to lib/rawdev/version.map
diff --git a/lib/librte_rcu/meson.build b/lib/rcu/meson.build
similarity index 100%
rename from lib/librte_rcu/meson.build
rename to lib/rcu/meson.build
diff --git a/lib/librte_rcu/rcu_qsbr_pvt.h b/lib/rcu/rcu_qsbr_pvt.h
similarity index 100%
rename from lib/librte_rcu/rcu_qsbr_pvt.h
rename to lib/rcu/rcu_qsbr_pvt.h
diff --git a/lib/librte_rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
similarity index 100%
rename from lib/librte_rcu/rte_rcu_qsbr.c
rename to lib/rcu/rte_rcu_qsbr.c
diff --git a/lib/librte_rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
similarity index 100%
rename from lib/librte_rcu/rte_rcu_qsbr.h
rename to lib/rcu/rte_rcu_qsbr.h
diff --git a/lib/librte_rcu/version.map b/lib/rcu/version.map
similarity index 100%
rename from lib/librte_rcu/version.map
rename to lib/rcu/version.map
diff --git a/lib/librte_regexdev/meson.build b/lib/regexdev/meson.build
similarity index 100%
rename from lib/librte_regexdev/meson.build
rename to lib/regexdev/meson.build
diff --git a/lib/librte_regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev.c
rename to lib/regexdev/rte_regexdev.c
diff --git a/lib/librte_regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev.h
rename to lib/regexdev/rte_regexdev.h
diff --git a/lib/librte_regexdev/rte_regexdev_core.h b/lib/regexdev/rte_regexdev_core.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev_core.h
rename to lib/regexdev/rte_regexdev_core.h
diff --git a/lib/librte_regexdev/rte_regexdev_driver.h b/lib/regexdev/rte_regexdev_driver.h
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev_driver.h
rename to lib/regexdev/rte_regexdev_driver.h
diff --git a/lib/librte_regexdev/version.map b/lib/regexdev/version.map
similarity index 100%
rename from lib/librte_regexdev/version.map
rename to lib/regexdev/version.map
diff --git a/lib/librte_reorder/meson.build b/lib/reorder/meson.build
similarity index 100%
rename from lib/librte_reorder/meson.build
rename to lib/reorder/meson.build
diff --git a/lib/librte_reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
similarity index 100%
rename from lib/librte_reorder/rte_reorder.c
rename to lib/reorder/rte_reorder.c
diff --git a/lib/librte_reorder/rte_reorder.h b/lib/reorder/rte_reorder.h
similarity index 100%
rename from lib/librte_reorder/rte_reorder.h
rename to lib/reorder/rte_reorder.h
diff --git a/lib/librte_reorder/version.map b/lib/reorder/version.map
similarity index 100%
rename from lib/librte_reorder/version.map
rename to lib/reorder/version.map
diff --git a/lib/librte_rib/meson.build b/lib/rib/meson.build
similarity index 100%
rename from lib/librte_rib/meson.build
rename to lib/rib/meson.build
diff --git a/lib/librte_rib/rte_rib.c b/lib/rib/rte_rib.c
similarity index 100%
rename from lib/librte_rib/rte_rib.c
rename to lib/rib/rte_rib.c
diff --git a/lib/librte_rib/rte_rib.h b/lib/rib/rte_rib.h
similarity index 100%
rename from lib/librte_rib/rte_rib.h
rename to lib/rib/rte_rib.h
diff --git a/lib/librte_rib/rte_rib6.c b/lib/rib/rte_rib6.c
similarity index 100%
rename from lib/librte_rib/rte_rib6.c
rename to lib/rib/rte_rib6.c
diff --git a/lib/librte_rib/rte_rib6.h b/lib/rib/rte_rib6.h
similarity index 100%
rename from lib/librte_rib/rte_rib6.h
rename to lib/rib/rte_rib6.h
diff --git a/lib/librte_rib/version.map b/lib/rib/version.map
similarity index 100%
rename from lib/librte_rib/version.map
rename to lib/rib/version.map
diff --git a/lib/librte_ring/meson.build b/lib/ring/meson.build
similarity index 100%
rename from lib/librte_ring/meson.build
rename to lib/ring/meson.build
diff --git a/lib/librte_ring/rte_ring.c b/lib/ring/rte_ring.c
similarity index 100%
rename from lib/librte_ring/rte_ring.c
rename to lib/ring/rte_ring.c
diff --git a/lib/librte_ring/rte_ring.h b/lib/ring/rte_ring.h
similarity index 100%
rename from lib/librte_ring/rte_ring.h
rename to lib/ring/rte_ring.h
diff --git a/lib/librte_ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_c11_pvt.h
rename to lib/ring/rte_ring_c11_pvt.h
diff --git a/lib/librte_ring/rte_ring_core.h b/lib/ring/rte_ring_core.h
similarity index 100%
rename from lib/librte_ring/rte_ring_core.h
rename to lib/ring/rte_ring_core.h
diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/ring/rte_ring_elem.h
similarity index 100%
rename from lib/librte_ring/rte_ring_elem.h
rename to lib/ring/rte_ring_elem.h
diff --git a/lib/librte_ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_elem_pvt.h
rename to lib/ring/rte_ring_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_generic_pvt.h
rename to lib/ring/rte_ring_generic_pvt.h
diff --git a/lib/librte_ring/rte_ring_hts.h b/lib/ring/rte_ring_hts.h
similarity index 100%
rename from lib/librte_ring/rte_ring_hts.h
rename to lib/ring/rte_ring_hts.h
diff --git a/lib/librte_ring/rte_ring_hts_elem_pvt.h b/lib/ring/rte_ring_hts_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_hts_elem_pvt.h
rename to lib/ring/rte_ring_hts_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_peek.h b/lib/ring/rte_ring_peek.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek.h
rename to lib/ring/rte_ring_peek.h
diff --git a/lib/librte_ring/rte_ring_peek_elem_pvt.h b/lib/ring/rte_ring_peek_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek_elem_pvt.h
rename to lib/ring/rte_ring_peek_elem_pvt.h
diff --git a/lib/librte_ring/rte_ring_peek_zc.h b/lib/ring/rte_ring_peek_zc.h
similarity index 100%
rename from lib/librte_ring/rte_ring_peek_zc.h
rename to lib/ring/rte_ring_peek_zc.h
diff --git a/lib/librte_ring/rte_ring_rts.h b/lib/ring/rte_ring_rts.h
similarity index 100%
rename from lib/librte_ring/rte_ring_rts.h
rename to lib/ring/rte_ring_rts.h
diff --git a/lib/librte_ring/rte_ring_rts_elem_pvt.h b/lib/ring/rte_ring_rts_elem_pvt.h
similarity index 100%
rename from lib/librte_ring/rte_ring_rts_elem_pvt.h
rename to lib/ring/rte_ring_rts_elem_pvt.h
diff --git a/lib/librte_ring/version.map b/lib/ring/version.map
similarity index 100%
rename from lib/librte_ring/version.map
rename to lib/ring/version.map
diff --git a/lib/librte_sched/meson.build b/lib/sched/meson.build
similarity index 100%
rename from lib/librte_sched/meson.build
rename to lib/sched/meson.build
diff --git a/lib/librte_sched/rte_approx.c b/lib/sched/rte_approx.c
similarity index 100%
rename from lib/librte_sched/rte_approx.c
rename to lib/sched/rte_approx.c
diff --git a/lib/librte_sched/rte_approx.h b/lib/sched/rte_approx.h
similarity index 100%
rename from lib/librte_sched/rte_approx.h
rename to lib/sched/rte_approx.h
diff --git a/lib/librte_sched/rte_red.c b/lib/sched/rte_red.c
similarity index 100%
rename from lib/librte_sched/rte_red.c
rename to lib/sched/rte_red.c
diff --git a/lib/librte_sched/rte_red.h b/lib/sched/rte_red.h
similarity index 100%
rename from lib/librte_sched/rte_red.h
rename to lib/sched/rte_red.h
diff --git a/lib/librte_sched/rte_sched.c b/lib/sched/rte_sched.c
similarity index 100%
rename from lib/librte_sched/rte_sched.c
rename to lib/sched/rte_sched.c
diff --git a/lib/librte_sched/rte_sched.h b/lib/sched/rte_sched.h
similarity index 100%
rename from lib/librte_sched/rte_sched.h
rename to lib/sched/rte_sched.h
diff --git a/lib/librte_sched/rte_sched_common.h b/lib/sched/rte_sched_common.h
similarity index 100%
rename from lib/librte_sched/rte_sched_common.h
rename to lib/sched/rte_sched_common.h
diff --git a/lib/librte_sched/version.map b/lib/sched/version.map
similarity index 100%
rename from lib/librte_sched/version.map
rename to lib/sched/version.map
diff --git a/lib/librte_security/meson.build b/lib/security/meson.build
similarity index 100%
rename from lib/librte_security/meson.build
rename to lib/security/meson.build
diff --git a/lib/librte_security/rte_security.c b/lib/security/rte_security.c
similarity index 100%
rename from lib/librte_security/rte_security.c
rename to lib/security/rte_security.c
diff --git a/lib/librte_security/rte_security.h b/lib/security/rte_security.h
similarity index 100%
rename from lib/librte_security/rte_security.h
rename to lib/security/rte_security.h
diff --git a/lib/librte_security/rte_security_driver.h b/lib/security/rte_security_driver.h
similarity index 100%
rename from lib/librte_security/rte_security_driver.h
rename to lib/security/rte_security_driver.h
diff --git a/lib/librte_security/version.map b/lib/security/version.map
similarity index 100%
rename from lib/librte_security/version.map
rename to lib/security/version.map
diff --git a/lib/librte_stack/meson.build b/lib/stack/meson.build
similarity index 100%
rename from lib/librte_stack/meson.build
rename to lib/stack/meson.build
diff --git a/lib/librte_stack/rte_stack.c b/lib/stack/rte_stack.c
similarity index 100%
rename from lib/librte_stack/rte_stack.c
rename to lib/stack/rte_stack.c
diff --git a/lib/librte_stack/rte_stack.h b/lib/stack/rte_stack.h
similarity index 100%
rename from lib/librte_stack/rte_stack.h
rename to lib/stack/rte_stack.h
diff --git a/lib/librte_stack/rte_stack_lf.c b/lib/stack/rte_stack_lf.c
similarity index 100%
rename from lib/librte_stack/rte_stack_lf.c
rename to lib/stack/rte_stack_lf.c
diff --git a/lib/librte_stack/rte_stack_lf.h b/lib/stack/rte_stack_lf.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf.h
rename to lib/stack/rte_stack_lf.h
diff --git a/lib/librte_stack/rte_stack_lf_c11.h b/lib/stack/rte_stack_lf_c11.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_c11.h
rename to lib/stack/rte_stack_lf_c11.h
diff --git a/lib/librte_stack/rte_stack_lf_generic.h b/lib/stack/rte_stack_lf_generic.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_generic.h
rename to lib/stack/rte_stack_lf_generic.h
diff --git a/lib/librte_stack/rte_stack_lf_stubs.h b/lib/stack/rte_stack_lf_stubs.h
similarity index 100%
rename from lib/librte_stack/rte_stack_lf_stubs.h
rename to lib/stack/rte_stack_lf_stubs.h
diff --git a/lib/librte_stack/rte_stack_std.c b/lib/stack/rte_stack_std.c
similarity index 100%
rename from lib/librte_stack/rte_stack_std.c
rename to lib/stack/rte_stack_std.c
diff --git a/lib/librte_stack/rte_stack_std.h b/lib/stack/rte_stack_std.h
similarity index 100%
rename from lib/librte_stack/rte_stack_std.h
rename to lib/stack/rte_stack_std.h
diff --git a/lib/librte_stack/stack_pvt.h b/lib/stack/stack_pvt.h
similarity index 100%
rename from lib/librte_stack/stack_pvt.h
rename to lib/stack/stack_pvt.h
diff --git a/lib/librte_stack/version.map b/lib/stack/version.map
similarity index 100%
rename from lib/librte_stack/version.map
rename to lib/stack/version.map
diff --git a/lib/librte_table/meson.build b/lib/table/meson.build
similarity index 100%
rename from lib/librte_table/meson.build
rename to lib/table/meson.build
diff --git a/lib/librte_table/rte_lru.h b/lib/table/rte_lru.h
similarity index 100%
rename from lib/librte_table/rte_lru.h
rename to lib/table/rte_lru.h
diff --git a/lib/librte_table/rte_lru_arm64.h b/lib/table/rte_lru_arm64.h
similarity index 100%
rename from lib/librte_table/rte_lru_arm64.h
rename to lib/table/rte_lru_arm64.h
diff --git a/lib/librte_table/rte_lru_x86.h b/lib/table/rte_lru_x86.h
similarity index 100%
rename from lib/librte_table/rte_lru_x86.h
rename to lib/table/rte_lru_x86.h
diff --git a/lib/librte_table/rte_swx_table.h b/lib/table/rte_swx_table.h
similarity index 100%
rename from lib/librte_table/rte_swx_table.h
rename to lib/table/rte_swx_table.h
diff --git a/lib/librte_table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
similarity index 100%
rename from lib/librte_table/rte_swx_table_em.c
rename to lib/table/rte_swx_table_em.c
diff --git a/lib/librte_table/rte_swx_table_em.h b/lib/table/rte_swx_table_em.h
similarity index 100%
rename from lib/librte_table/rte_swx_table_em.h
rename to lib/table/rte_swx_table_em.h
diff --git a/lib/librte_table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
similarity index 100%
rename from lib/librte_table/rte_swx_table_wm.c
rename to lib/table/rte_swx_table_wm.c
diff --git a/lib/librte_table/rte_swx_table_wm.h b/lib/table/rte_swx_table_wm.h
similarity index 100%
rename from lib/librte_table/rte_swx_table_wm.h
rename to lib/table/rte_swx_table_wm.h
diff --git a/lib/librte_table/rte_table.h b/lib/table/rte_table.h
similarity index 100%
rename from lib/librte_table/rte_table.h
rename to lib/table/rte_table.h
diff --git a/lib/librte_table/rte_table_acl.c b/lib/table/rte_table_acl.c
similarity index 100%
rename from lib/librte_table/rte_table_acl.c
rename to lib/table/rte_table_acl.c
diff --git a/lib/librte_table/rte_table_acl.h b/lib/table/rte_table_acl.h
similarity index 100%
rename from lib/librte_table/rte_table_acl.h
rename to lib/table/rte_table_acl.h
diff --git a/lib/librte_table/rte_table_array.c b/lib/table/rte_table_array.c
similarity index 100%
rename from lib/librte_table/rte_table_array.c
rename to lib/table/rte_table_array.c
diff --git a/lib/librte_table/rte_table_array.h b/lib/table/rte_table_array.h
similarity index 100%
rename from lib/librte_table/rte_table_array.h
rename to lib/table/rte_table_array.h
diff --git a/lib/librte_table/rte_table_hash.h b/lib/table/rte_table_hash.h
similarity index 100%
rename from lib/librte_table/rte_table_hash.h
rename to lib/table/rte_table_hash.h
diff --git a/lib/librte_table/rte_table_hash_cuckoo.c b/lib/table/rte_table_hash_cuckoo.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_cuckoo.c
rename to lib/table/rte_table_hash_cuckoo.c
diff --git a/lib/librte_table/rte_table_hash_cuckoo.h b/lib/table/rte_table_hash_cuckoo.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_cuckoo.h
rename to lib/table/rte_table_hash_cuckoo.h
diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/table/rte_table_hash_ext.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_ext.c
rename to lib/table/rte_table_hash_ext.c
diff --git a/lib/librte_table/rte_table_hash_func.h b/lib/table/rte_table_hash_func.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_func.h
rename to lib/table/rte_table_hash_func.h
diff --git a/lib/librte_table/rte_table_hash_func_arm64.h b/lib/table/rte_table_hash_func_arm64.h
similarity index 100%
rename from lib/librte_table/rte_table_hash_func_arm64.h
rename to lib/table/rte_table_hash_func_arm64.h
diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key16.c
rename to lib/table/rte_table_hash_key16.c
diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key32.c
rename to lib/table/rte_table_hash_key32.c
diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_key8.c
rename to lib/table/rte_table_hash_key8.c
diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/table/rte_table_hash_lru.c
similarity index 100%
rename from lib/librte_table/rte_table_hash_lru.c
rename to lib/table/rte_table_hash_lru.c
diff --git a/lib/librte_table/rte_table_lpm.c b/lib/table/rte_table_lpm.c
similarity index 100%
rename from lib/librte_table/rte_table_lpm.c
rename to lib/table/rte_table_lpm.c
diff --git a/lib/librte_table/rte_table_lpm.h b/lib/table/rte_table_lpm.h
similarity index 100%
rename from lib/librte_table/rte_table_lpm.h
rename to lib/table/rte_table_lpm.h
diff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/table/rte_table_lpm_ipv6.c
similarity index 100%
rename from lib/librte_table/rte_table_lpm_ipv6.c
rename to lib/table/rte_table_lpm_ipv6.c
diff --git a/lib/librte_table/rte_table_lpm_ipv6.h b/lib/table/rte_table_lpm_ipv6.h
similarity index 100%
rename from lib/librte_table/rte_table_lpm_ipv6.h
rename to lib/table/rte_table_lpm_ipv6.h
diff --git a/lib/librte_table/rte_table_stub.c b/lib/table/rte_table_stub.c
similarity index 100%
rename from lib/librte_table/rte_table_stub.c
rename to lib/table/rte_table_stub.c
diff --git a/lib/librte_table/rte_table_stub.h b/lib/table/rte_table_stub.h
similarity index 100%
rename from lib/librte_table/rte_table_stub.h
rename to lib/table/rte_table_stub.h
diff --git a/lib/librte_table/version.map b/lib/table/version.map
similarity index 100%
rename from lib/librte_table/version.map
rename to lib/table/version.map
diff --git a/lib/librte_telemetry/meson.build b/lib/telemetry/meson.build
similarity index 80%
rename from lib/librte_telemetry/meson.build
rename to lib/telemetry/meson.build
index 719973ff92..f84c9aa3be 100644
--- a/lib/librte_telemetry/meson.build
+++ b/lib/telemetry/meson.build
@@ -5,4 +5,4 @@ includes = [global_inc]
 
 sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c')
 headers = files('rte_telemetry.h')
-includes += include_directories('../librte_metrics')
+includes += include_directories('../metrics')
diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
similarity index 100%
rename from lib/librte_telemetry/rte_telemetry.h
rename to lib/telemetry/rte_telemetry.h
diff --git a/lib/librte_telemetry/telemetry.c b/lib/telemetry/telemetry.c
similarity index 100%
rename from lib/librte_telemetry/telemetry.c
rename to lib/telemetry/telemetry.c
diff --git a/lib/librte_telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c
similarity index 100%
rename from lib/librte_telemetry/telemetry_data.c
rename to lib/telemetry/telemetry_data.c
diff --git a/lib/librte_telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_data.h
rename to lib/telemetry/telemetry_data.h
diff --git a/lib/librte_telemetry/telemetry_internal.h b/lib/telemetry/telemetry_internal.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_internal.h
rename to lib/telemetry/telemetry_internal.h
diff --git a/lib/librte_telemetry/telemetry_json.h b/lib/telemetry/telemetry_json.h
similarity index 100%
rename from lib/librte_telemetry/telemetry_json.h
rename to lib/telemetry/telemetry_json.h
diff --git a/lib/librte_telemetry/telemetry_legacy.c b/lib/telemetry/telemetry_legacy.c
similarity index 100%
rename from lib/librte_telemetry/telemetry_legacy.c
rename to lib/telemetry/telemetry_legacy.c
diff --git a/lib/librte_telemetry/version.map b/lib/telemetry/version.map
similarity index 100%
rename from lib/librte_telemetry/version.map
rename to lib/telemetry/version.map
diff --git a/lib/librte_timer/meson.build b/lib/timer/meson.build
similarity index 100%
rename from lib/librte_timer/meson.build
rename to lib/timer/meson.build
diff --git a/lib/librte_timer/rte_timer.c b/lib/timer/rte_timer.c
similarity index 100%
rename from lib/librte_timer/rte_timer.c
rename to lib/timer/rte_timer.c
diff --git a/lib/librte_timer/rte_timer.h b/lib/timer/rte_timer.h
similarity index 100%
rename from lib/librte_timer/rte_timer.h
rename to lib/timer/rte_timer.h
diff --git a/lib/librte_timer/version.map b/lib/timer/version.map
similarity index 100%
rename from lib/librte_timer/version.map
rename to lib/timer/version.map
diff --git a/lib/librte_vhost/fd_man.c b/lib/vhost/fd_man.c
similarity index 100%
rename from lib/librte_vhost/fd_man.c
rename to lib/vhost/fd_man.c
diff --git a/lib/librte_vhost/fd_man.h b/lib/vhost/fd_man.h
similarity index 100%
rename from lib/librte_vhost/fd_man.h
rename to lib/vhost/fd_man.h
diff --git a/lib/librte_vhost/iotlb.c b/lib/vhost/iotlb.c
similarity index 100%
rename from lib/librte_vhost/iotlb.c
rename to lib/vhost/iotlb.c
diff --git a/lib/librte_vhost/iotlb.h b/lib/vhost/iotlb.h
similarity index 100%
rename from lib/librte_vhost/iotlb.h
rename to lib/vhost/iotlb.h
diff --git a/lib/librte_vhost/meson.build b/lib/vhost/meson.build
similarity index 100%
rename from lib/librte_vhost/meson.build
rename to lib/vhost/meson.build
diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/vhost/rte_vdpa.h
similarity index 100%
rename from lib/librte_vhost/rte_vdpa.h
rename to lib/vhost/rte_vdpa.h
diff --git a/lib/librte_vhost/rte_vdpa_dev.h b/lib/vhost/rte_vdpa_dev.h
similarity index 100%
rename from lib/librte_vhost/rte_vdpa_dev.h
rename to lib/vhost/rte_vdpa_dev.h
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/vhost/rte_vhost.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost.h
rename to lib/vhost/rte_vhost.h
diff --git a/lib/librte_vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost_async.h
rename to lib/vhost/rte_vhost_async.h
diff --git a/lib/librte_vhost/rte_vhost_crypto.h b/lib/vhost/rte_vhost_crypto.h
similarity index 100%
rename from lib/librte_vhost/rte_vhost_crypto.h
rename to lib/vhost/rte_vhost_crypto.h
diff --git a/lib/librte_vhost/socket.c b/lib/vhost/socket.c
similarity index 100%
rename from lib/librte_vhost/socket.c
rename to lib/vhost/socket.c
diff --git a/lib/librte_vhost/vdpa.c b/lib/vhost/vdpa.c
similarity index 100%
rename from lib/librte_vhost/vdpa.c
rename to lib/vhost/vdpa.c
diff --git a/lib/librte_vhost/version.map b/lib/vhost/version.map
similarity index 100%
rename from lib/librte_vhost/version.map
rename to lib/vhost/version.map
diff --git a/lib/librte_vhost/vhost.c b/lib/vhost/vhost.c
similarity index 100%
rename from lib/librte_vhost/vhost.c
rename to lib/vhost/vhost.c
diff --git a/lib/librte_vhost/vhost.h b/lib/vhost/vhost.h
similarity index 100%
rename from lib/librte_vhost/vhost.h
rename to lib/vhost/vhost.h
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
similarity index 100%
rename from lib/librte_vhost/vhost_crypto.c
rename to lib/vhost/vhost_crypto.c
diff --git a/lib/librte_vhost/vhost_user.c b/lib/vhost/vhost_user.c
similarity index 100%
rename from lib/librte_vhost/vhost_user.c
rename to lib/vhost/vhost_user.c
diff --git a/lib/librte_vhost/vhost_user.h b/lib/vhost/vhost_user.h
similarity index 100%
rename from lib/librte_vhost/vhost_user.h
rename to lib/vhost/vhost_user.h
diff --git a/lib/librte_vhost/virtio_crypto.h b/lib/vhost/virtio_crypto.h
similarity index 100%
rename from lib/librte_vhost/virtio_crypto.h
rename to lib/vhost/virtio_crypto.h
diff --git a/lib/librte_vhost/virtio_net.c b/lib/vhost/virtio_net.c
similarity index 100%
rename from lib/librte_vhost/virtio_net.c
rename to lib/vhost/virtio_net.c
diff --git a/license/exceptions.txt b/license/exceptions.txt
index 636c69b9bf..1bd4dbf8f7 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -12,8 +12,8 @@ Note that following licenses are not exceptions:-
 ---------------------------------------------------------------------------------------------------
 SPDX Identifier     TB Approval Date  GB Approval Date  File name
 ---------------------------------------------------------------------------------------------------
-1.MIT               10/23/2019        02/10/2020        lib/librte_eal/windows/include/dirent.h
-2.BSD-2-Clause      10/23/2019        12/18/2019        lib/librte_eal/windows/include/getopt.h
+1.MIT               10/23/2019        02/10/2020        lib/eal/windows/include/dirent.h
+2.BSD-2-Clause      10/23/2019        12/18/2019        lib/eal/windows/include/getopt.h
 3.ISC AND
-  BSD-2-Clause      10/23/2019        12/18/2019        lib/librte_eal/windows/getopt.c
+  BSD-2-Clause      10/23/2019        12/18/2019        lib/eal/windows/getopt.c
 ---------------------------------------------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 13412780cd..12cb6e0e83 100644
--- a/meson.build
+++ b/meson.build
@@ -50,9 +50,9 @@ endif
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
 global_inc = include_directories('.', 'config',
-    'lib/librte_eal/include',
-    'lib/librte_eal/@0@/include'.format(host_machine.system()),
-    'lib/librte_eal/@0@/include'.format(arch_subdir),
+    'lib/eal/include',
+    'lib/eal/@0@/include'.format(host_machine.system()),
+    'lib/eal/@0@/include'.format(arch_subdir),
 )
 
 # do configuration and get tool paths
-- 
2.27.0

Re: [dpdk-dev] [PATCH v2 14/16] lib: remove librte_ prefix from directory names

[David Christensen]

On 4/20/21 3:22 AM, Bruce Richardson wrote:
> There is no reason for the DPDK libraries to all have 'librte_' prefix on
> the directory names. This prefix makes the directory names longer and also
> makes it awkward to add features referring to individual libraries in the
> build - should the lib names be specified with or without the prefix.
> Therefore, we can just remove the library prefix and use the library's
> unique name as the directory name, i.e. 'eal' rather than 'librte_eal'
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Reviewed-by: David Christensen <drc@linux.vnet.ibm.com>

[dpdk-dev] [PATCH v2 15/16] devtools: add script to ease backport of renamed files

[Bruce Richardson]

With all the library folders renamed to remove the "librte_" prefix,
we need to fixup patches for easier backport, i.e. add back in the
prefix for any references to those renamed files.

In the script itself we use a general approach to allow other functions
to be added in future for other modifications needed to patches.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 devtools/update_patches.py | 53 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 devtools/update_patches.py

diff --git a/devtools/update_patches.py b/devtools/update_patches.py
new file mode 100755
index 0000000000..0cff215a96
--- /dev/null
+++ b/devtools/update_patches.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+import os
+import sys
+import shutil
+from os.path import abspath, dirname, join
+
+def fixup_library_renames(contents):
+    """since library directory names have dropped the 'librte_' prefix,
+    add those prefixes back in for patches than need it"""
+    modified = False
+
+    # first get all the DPDK libs to build up replacement list
+    # stored in function attribute between calls
+    try:
+        libdirs = fixup_library_renames.libdirs
+    except AttributeError:
+        dpdk_libdir = abspath(join(dirname(sys.argv[0]), '..', 'lib'))
+        for root, dirs, files in os.walk(dpdk_libdir):
+            fixup_library_renames.libdirs = dirs
+            libdirs = dirs
+            break
+
+    for i in range(len(contents)):
+        # skip over any lines which don't have lib in it
+        if not "lib/" in contents[i]:
+            continue
+        for d in libdirs:
+            if f'lib/{d}' in contents[i]:
+                modified = True
+                contents[i] = contents[i].replace(f'lib/{d}', f'lib/librte_{d}')
+    return modified
+
+def main():
+    "takes list of patches off argv and processes each"
+    for patch in sys.argv[1:]:
+        modified = False
+        with open(patch) as f:
+            contents = f.readlines()
+
+        modified |= fixup_library_renames(contents)
+        # other functions to change the patch go here
+
+        if not modified:
+            continue
+        shutil.copyfile(f'{patch}', f'{patch}.bak')
+        with open(patch, 'w') as f:
+            f.writelines(contents)
+
+if __name__ == "__main__":
+    main()
-- 
2.27.0

[dpdk-dev] [PATCH v2 16/16] lib: allow disabling optional libraries

[Bruce Richardson]

Add support for the disable_libs option, to allow disabling the build of
particular libraries. As part of this, maintain a list of what libraries
can safely be disabled, without breaking the build - for now this list is
solely those libraries which are not built on FreeBSD, kni, power and
vhost. This list can be expanded by future patches.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/meson.build   | 24 +++++++++++++++++++++++-
 meson_options.txt |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/meson.build b/lib/meson.build
index 3a9a6c3be4..c9a20f65b7 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -81,6 +81,23 @@ if is_windows
     ] # only supported libraries for windows
 endif
 
+optional_libs = [
+    'kni',
+    'power',
+    'vhost',
+]
+
+disabled_libs = []
+opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs')).stdout().split()
+foreach l:opt_disabled_libs
+    if not optional_libs.contains(l)
+        warning('Cannot disable mandatory library "@0@"'.format(l))
+        continue
+    endif
+    disabled_libs += l
+endforeach
+
+
 default_cflags = machine_args
 default_cflags += ['-DALLOW_EXPERIMENTAL_API']
 default_cflags += ['-DALLOW_INTERNAL_API']
@@ -114,7 +131,12 @@ foreach l:libraries
         deps += ['eal']
     endif
 
-    subdir(l)
+    if disabled_libs.contains(l)
+        build = false
+        reason = 'explicitly disabled via build config'
+    else
+        subdir(l)
+    endif
     if name != l
         warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
     endif
diff --git a/meson_options.txt b/meson_options.txt
index 530fcddfa1..9d73fd5419 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,6 +6,8 @@ option('developer_mode', type: 'feature', description:
         'turn on additional build checks relevant for DPDK developers')
 option('disable_drivers', type: 'string', value: '', description:
         'Comma-separated list of drivers to explicitly disable.')
+option('disable_libs', type: 'string', value: '', description:
+        'Comma-separated list of libraries to explicitly disable. [NOTE: not all libs can be disabled]')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', description:
         'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
 option('enable_docs', type: 'boolean', value: false, description:
-- 
2.27.0

Re: [dpdk-dev] [PATCH v2 00/16] Build file updates

[Thomas Monjalon]

20/04/2021 12:22, Bruce Richardson:
> This set contains 5 changes/updates to the DPDK build and build files.
> 
> The changes in this set are:
> 1. Use "continue" keyword, new in 0.49 to shorten and reduce indentation levels
>    in the foreach loops when building library or driver components.
> 2. For libraries, drop support for header-only libraries, which was added just
>    for the "compat" lib which had a single header, and is now part of EAL. This
>    similarly reduces indentation levels and makes the code easier to follow
> 3. Since the larger blocks of meson code in our repo is seeing massive
>    whitespace changes, take the opportunity to switch our indentation style for
>    meson files from that of C-files using tabs, to Meson/Python style using
>    spaces.[1]
> 4. Remove the "librte_" prefix from all our library directories. While as useful
>    cleanup, the main driver for this was that it simplifies the matching for #5
>    below.
> 5. Add a "disable_libs" build option to allow the user to optionally not build
>    certain components. Include in this an explicit list of libraries which are
>    "known safe" to disable in the build. For now this is a short list of three
>    libs, all of which are safe because they are not buildable on FreeBSD. More
>    work is needed to expand this list in future.
> 
> [1] https://mesonbuild.com/Style-guide.html#tabs-or-spaces

I went an extra mile to align files list in drivers.
That's a big bang applied for 21.05-rc1.

Please could you try to set up the git trick
to skip some of these changes in the git blame?

Thanks