Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80754/?format=api
{ "id": 80754, "url": "http://patches.dpdk.org/api/patches/80754/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201014141304.632120-7-bruce.richardson@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20201014141304.632120-7-bruce.richardson@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201014141304.632120-7-bruce.richardson@intel.com", "date": "2020-10-14T14:13:03", "name": "[v3,6/7] build: standardize component names and defines", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1160e05f1917dab9e7a71d165e8a514c67133855", "submitter": { "id": 20, "url": "http://patches.dpdk.org/api/people/20/?format=api", "name": "Bruce Richardson", "email": "bruce.richardson@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20201014141304.632120-7-bruce.richardson@intel.com/mbox/", "series": [ { "id": 12961, "url": "http://patches.dpdk.org/api/series/12961/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12961", "date": "2020-10-14T14:12:57", "name": "Rework build macros", "version": 3, "mbox": "http://patches.dpdk.org/series/12961/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/80754/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/80754/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 69B01A04B7;\n\tWed, 14 Oct 2020 16:16:02 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AA7CE1DE93;\n\tWed, 14 Oct 2020 16:13:43 +0200 (CEST)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n by dpdk.org (Postfix) with ESMTP id BE8F01DE7E\n for <dev@dpdk.org>; Wed, 14 Oct 2020 16:13:38 +0200 (CEST)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 14 Oct 2020 07:13:38 -0700", "from silpixa00399126.ir.intel.com ([10.237.222.4])\n by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2020 07:13:36 -0700" ], "IronPort-SDR": [ "\n 4gPBywLAgP8jcy7ReSv/Ho/Jf8IqEZK5Pr4eJr9YJb9zxQPaVU3ZCSaNDO9KNbxsrOqjN4zRJj\n l/ObVpeoZanw==", "\n VVEm3d2qV8Nkqp7Al3JJ03ELVVbDjWYU4yt0rWgsOrmT7qLhT09LWGbxMWj3duEs9jNj1zU+uA\n lTQOeBGpDEmQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9773\"; a=\"145421389\"", "E=Sophos;i=\"5.77,374,1596524400\"; d=\"scan'208\";a=\"145421389\"", "E=Sophos;i=\"5.77,374,1596524400\"; d=\"scan'208\";a=\"299965438\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Bruce Richardson <bruce.richardson@intel.com>", "To": "dev@dpdk.org", "Cc": "david.marchand@redhat.com, arybchenko@solarflare.com,\n ferruh.yigit@intel.com, thomas@monjalon.net, bluca@debian.org,\n Bruce Richardson <bruce.richardson@intel.com>", "Date": "Wed, 14 Oct 2020 15:13:03 +0100", "Message-Id": "<20201014141304.632120-7-bruce.richardson@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20201014141304.632120-1-bruce.richardson@intel.com>", "References": "<20200916164429.244847-1-bruce.richardson@intel.com>\n <20201014141304.632120-1-bruce.richardson@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 6/7] build: standardize component names and\n\tdefines", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "As discussed on the dpdk-dev mailing list[1], we can make some easy\nimprovements in standardizing the naming of the various components in DPDK,\nand their associated feature-enabled macros.\n\nFollowing this patch, each library will have the name in format,\n'librte_<name>.so', and the macro indicating that library is enabled in the\nbuild will have the form 'RTE_LIB_<NAME>'.\n\nSimilarly, for libraries, the equivalent name formats and macros are:\n'librte_<class>_<name>.so' and 'RTE_<CLASS>_<NAME>', where class is the\ndevice type taken from the relevant driver subdirectory name, i.e. 'net',\n'crypto' etc.\n\nTo avoid too many changes at once for end applications, the old macro names\nwill still be provided in the build in this release, but will be removed\nsubsequently.\n\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\n\n[1] http://inbox.dpdk.org/dev/ef7c1a87-79ab-e405-4202-39b7ad6b0c71@solarflare.com/t/#u\n---\n app/test-bbdev/meson.build | 4 ++--\n app/test-crypto-perf/meson.build | 2 +-\n app/test-pmd/meson.build | 12 ++++++------\n app/test/meson.build | 8 ++++----\n doc/guides/rel_notes/deprecation.rst | 8 ++++++++\n drivers/baseband/meson.build | 1 -\n drivers/bus/meson.build | 1 -\n drivers/common/meson.build | 1 -\n drivers/common/mlx5/meson.build | 1 -\n drivers/common/qat/meson.build | 1 -\n drivers/compress/meson.build | 1 -\n drivers/compress/octeontx/meson.build | 2 +-\n drivers/crypto/meson.build | 1 -\n drivers/crypto/null/meson.build | 2 +-\n drivers/crypto/octeontx/meson.build | 2 +-\n drivers/crypto/octeontx2/meson.build | 2 +-\n drivers/crypto/scheduler/meson.build | 2 +-\n drivers/crypto/virtio/meson.build | 2 +-\n drivers/event/dpaa/meson.build | 2 +-\n drivers/event/dpaa2/meson.build | 2 +-\n drivers/event/meson.build | 1 -\n drivers/event/octeontx/meson.build | 2 +-\n drivers/event/octeontx2/meson.build | 2 +-\n drivers/mempool/meson.build | 1 -\n drivers/meson.build | 9 ++++-----\n drivers/net/meson.build | 1 -\n drivers/net/mlx4/meson.build | 2 +-\n drivers/raw/ifpga/meson.build | 2 +-\n drivers/raw/meson.build | 1 -\n drivers/regex/meson.build | 1 -\n drivers/vdpa/meson.build | 1 -\n examples/bond/meson.build | 2 +-\n examples/ethtool/meson.build | 2 +-\n examples/ioat/meson.build | 2 +-\n examples/l2fwd-crypto/meson.build | 2 +-\n examples/ntb/meson.build | 2 +-\n examples/vm_power_manager/meson.build | 6 +++---\n lib/librte_ethdev/meson.build | 1 -\n lib/librte_graph/meson.build | 2 --\n lib/meson.build | 3 ++-\n 40 files changed, 47 insertions(+), 55 deletions(-)", "diff": "diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build\nindex 18ab6a8c6..178306b08 100644\n--- a/app/test-bbdev/meson.build\n+++ b/app/test-bbdev/meson.build\n@@ -7,8 +7,8 @@ sources = files('main.c',\n \t\t'test_bbdev_vector.c')\n deps += ['bbdev', 'bus_vdev']\n if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC')\n-\tdeps += ['pmd_bbdev_fpga_lte_fec']\n+\tdeps += ['baseband_fpga_lte_fec']\n endif\n if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC')\n-\tdeps += ['pmd_bbdev_fpga_5gnr_fec']\n+\tdeps += ['baseband_fpga_5gnr_fec']\n endif\ndiff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build\nindex 4bd71510d..e6ddda6f0 100644\n--- a/app/test-crypto-perf/meson.build\n+++ b/app/test-crypto-perf/meson.build\n@@ -13,5 +13,5 @@ sources = files('cperf_ops.c',\n \t\t'main.c')\n deps += ['cryptodev', 'net', 'security']\n if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n-\tdeps += 'pmd_crypto_scheduler'\n+\tdeps += 'crypto_scheduler'\n endif\ndiff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build\nindex 0d9e45049..2e8b9f8a9 100644\n--- a/app/test-pmd/meson.build\n+++ b/app/test-pmd/meson.build\n@@ -38,22 +38,22 @@ if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS')\n \tdeps += 'latencystats'\n endif\n if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n-\tdeps += 'pmd_crypto_scheduler'\n+\tdeps += 'crypto_scheduler'\n endif\n if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')\n-\tdeps += 'pmd_bond'\n+\tdeps += 'net_bond'\n endif\n if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')\n-\tdeps += 'pmd_bnxt'\n+\tdeps += 'net_bnxt'\n endif\n if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')\n-\tdeps += 'pmd_i40e'\n+\tdeps += 'net_i40e'\n endif\n if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')\n-\tdeps += 'pmd_ixgbe'\n+\tdeps += 'net_ixgbe'\n endif\n if dpdk_conf.has('RTE_LIBRTE_DPAA_PMD')\n-\tdeps += ['bus_dpaa', 'mempool_dpaa', 'pmd_dpaa']\n+\tdeps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']\n endif\n if dpdk_conf.has('RTE_LIBRTE_BPF')\n \tsources += files('bpf_cmd.c')\ndiff --git a/app/test/meson.build b/app/test/meson.build\nindex fc90a1909..c5ce1d2c0 100644\n--- a/app/test/meson.build\n+++ b/app/test/meson.build\n@@ -345,7 +345,7 @@ if dpdk_conf.has('RTE_LIBRTE_STACK_MEMPOOL')\n \ttest_deps += 'mempool_stack'\n endif\n if dpdk_conf.has('RTE_LIBRTE_SKELETON_EVENTDEV_PMD')\n-\ttest_deps += 'pmd_skeleton_event'\n+\ttest_deps += 'event_skeleton'\n endif\n if dpdk_conf.has('RTE_LIBRTE_TELEMETRY')\n \ttest_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']\n@@ -355,7 +355,7 @@ endif\n # The following linkages of drivers are required because\n # they are used via a driver-specific API.\n if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')\n-\ttest_deps += 'pmd_bond'\n+\ttest_deps += 'net_bond'\n \ttest_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c']\n \tdriver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest']\n \tif dpdk_conf.has('RTE_LIBRTE_RING_PMD')\n@@ -364,7 +364,7 @@ if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')\n \tendif\n endif\n if dpdk_conf.has('RTE_LIBRTE_RING_PMD')\n-\ttest_deps += 'pmd_ring'\n+\ttest_deps += 'net_ring'\n \ttest_sources += 'test_pmd_ring_perf.c'\n \ttest_sources += 'test_pmd_ring.c'\n \ttest_sources += 'test_event_eth_tx_adapter.c'\n@@ -415,7 +415,7 @@ endif\n \n if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n \tdriver_test_names += 'cryptodev_scheduler_autotest'\n-\ttest_deps += 'pmd_crypto_scheduler'\n+\ttest_deps += 'crypto_scheduler'\n endif\n \n foreach d:test_deps\ndiff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex 584e72087..69e3ef91c 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -11,6 +11,14 @@ here.\n Deprecation Notices\n -------------------\n \n+* build: The macros defined to indicate which DPDK libraries and drivers\n+ are included in the meson build are changing to a standardized format of\n+ ``RTE_LIB_<NAME>`` and ``RTE_<CLASS>_<NAME>``, where ``NAME`` is the\n+ upper-case component name, e.g. EAL, ETHDEV, IXGBE, and ``CLASS`` is the\n+ upper-case name of the device class to which a driver belongs e.g.\n+ ``NET``, ``CRYPTO``, ``VDPA``. The old macros are deprecated and will be\n+ removed in a future release.\n+\n * meson: The minimum supported version of meson for configuring and building\n DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For\n those users with a version earlier than 0.47.1, an updated copy of meson\ndiff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build\nindex 415b6724b..7e1b64ffd 100644\n--- a/drivers/baseband/meson.build\n+++ b/drivers/baseband/meson.build\n@@ -8,4 +8,3 @@ endif\n drivers = ['null', 'turbo_sw', 'fpga_lte_fec', 'fpga_5gnr_fec']\n \n config_flag_fmt = 'RTE_LIBRTE_PMD_BBDEV_@0@'\n-driver_name_fmt = 'rte_pmd_bbdev_@0@'\ndiff --git a/drivers/bus/meson.build b/drivers/bus/meson.build\nindex 80de2d91d..bd73efd18 100644\n--- a/drivers/bus/meson.build\n+++ b/drivers/bus/meson.build\n@@ -4,4 +4,3 @@\n drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus']\n std_deps = ['eal']\n config_flag_fmt = 'RTE_LIBRTE_@0@_BUS'\n-driver_name_fmt = 'rte_bus_@0@'\ndiff --git a/drivers/common/meson.build b/drivers/common/meson.build\nindex abb4f1529..d78882f05 100644\n--- a/drivers/common/meson.build\n+++ b/drivers/common/meson.build\n@@ -8,4 +8,3 @@ endif\n std_deps = ['eal']\n drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx']\n config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'\n-driver_name_fmt = 'rte_common_@0@'\ndiff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build\nindex 8e5608703..3dacc6f68 100644\n--- a/drivers/common/mlx5/meson.build\n+++ b/drivers/common/mlx5/meson.build\n@@ -8,7 +8,6 @@ if not is_linux\n endif\n \n config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'\n-driver_name_fmt = 'rte_common_@0@'\n deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs']\n sources += files(\n \t'mlx5_devx_cmds.c',\ndiff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build\nindex 3409162d0..fdf8b84f8 100644\n--- a/drivers/common/qat/meson.build\n+++ b/drivers/common/qat/meson.build\n@@ -2,7 +2,6 @@\n # Copyright(c) 2017-2018 Intel Corporation\n \n config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'\n-driver_name_fmt = 'rte_common_@0@'\n \n qat_crypto = true\n qat_crypto_path = 'crypto/qat'\ndiff --git a/drivers/compress/meson.build b/drivers/compress/meson.build\nindex 3a4723c0c..33f5e33dd 100644\n--- a/drivers/compress/meson.build\n+++ b/drivers/compress/meson.build\n@@ -9,4 +9,3 @@ drivers = ['isal', 'octeontx', 'zlib']\n \n std_deps = ['compressdev'] # compressdev pulls in all other needed deps\n config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'\n-driver_name_fmt = 'rte_pmd_@0@'\ndiff --git a/drivers/compress/octeontx/meson.build b/drivers/compress/octeontx/meson.build\nindex 0dc98b762..2d71b4da2 100644\n--- a/drivers/compress/octeontx/meson.build\n+++ b/drivers/compress/octeontx/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2018 Cavium, Inc\n \n-name = 'octeontx_compress'\n+fmt_name = 'octeontx_compress'\n sources = files('otx_zip.c', 'otx_zip_pmd.c')\n includes += include_directories('include')\n deps += ['mempool_octeontx', 'bus_pci']\ndiff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build\nindex bd7a940e6..fa5c7ef3a 100644\n--- a/drivers/crypto/meson.build\n+++ b/drivers/crypto/meson.build\n@@ -26,4 +26,3 @@ drivers = ['aesni_gcm',\n \n std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps\n config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'\n-driver_name_fmt = 'rte_pmd_@0@'\ndiff --git a/drivers/crypto/null/meson.build b/drivers/crypto/null/meson.build\nindex 502336da2..421414916 100644\n--- a/drivers/crypto/null/meson.build\n+++ b/drivers/crypto/null/meson.build\n@@ -2,5 +2,5 @@\n # Copyright(c) 2017 Intel Corporation\n \n deps += 'bus_vdev'\n-name = 'null_crypto'\n+fmt_name = 'null_crypto'\n sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c')\ndiff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build\nindex cf031b006..d6939720d 100644\n--- a/drivers/crypto/octeontx/meson.build\n+++ b/drivers/crypto/octeontx/meson.build\n@@ -7,7 +7,7 @@ endif\n \n deps += ['bus_pci']\n deps += ['common_cpt']\n-name = 'octeontx_crypto'\n+fmt_name = 'octeontx_crypto'\n \n sources = files('otx_cryptodev.c',\n \t\t'otx_cryptodev_capabilities.c',\ndiff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build\nindex 148ec184a..bf502e247 100644\n--- a/drivers/crypto/octeontx2/meson.build\n+++ b/drivers/crypto/octeontx2/meson.build\n@@ -11,7 +11,7 @@ deps += ['common_cpt']\n deps += ['common_octeontx2']\n deps += ['ethdev']\n deps += ['security']\n-name = 'octeontx2_crypto'\n+fmt_name = 'octeontx2_crypto'\n \n sources = files('otx2_cryptodev.c',\n \t\t'otx2_cryptodev_capabilities.c',\ndiff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build\nindex c5ba2d680..2209c5023 100644\n--- a/drivers/crypto/scheduler/meson.build\n+++ b/drivers/crypto/scheduler/meson.build\n@@ -2,7 +2,7 @@\n # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>\n \n deps += ['bus_vdev', 'reorder']\n-name = 'crypto_scheduler'\n+fmt_name = 'crypto_scheduler'\n sources = files(\n \t'rte_cryptodev_scheduler.c',\n \t'scheduler_failover.c',\ndiff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build\nindex b15b3f9fa..6cea782de 100644\n--- a/drivers/crypto/virtio/meson.build\n+++ b/drivers/crypto/virtio/meson.build\n@@ -3,6 +3,6 @@\n \n includes += include_directories('../../../lib/librte_vhost')\n deps += 'bus_pci'\n-name = 'virtio_crypto'\n+fmt_name = 'virtio_crypto'\n sources = files('virtio_cryptodev.c', 'virtio_pci.c',\n \t\t'virtio_rxtx.c', 'virtqueue.c')\ndiff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build\nindex 2f761f8e5..9abb75e3e 100644\n--- a/drivers/event/dpaa/meson.build\n+++ b/drivers/event/dpaa/meson.build\n@@ -5,7 +5,7 @@ if not is_linux\n \tbuild = false\n \treason = 'only supported on linux'\n endif\n-deps += ['pmd_dpaa', 'pmd_dpaa_sec']\n+deps += ['net_dpaa', 'crypto_dpaa_sec']\n sources = files('dpaa_eventdev.c')\n \n includes += include_directories('../../crypto/dpaa_sec/')\ndiff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build\nindex 71c8be3d6..4ead7bb3e 100644\n--- a/drivers/event/dpaa2/meson.build\n+++ b/drivers/event/dpaa2/meson.build\n@@ -5,7 +5,7 @@ if not is_linux\n \tbuild = false\n \treason = 'only supported on linux'\n endif\n-deps += ['bus_vdev', 'pmd_dpaa2', 'pmd_dpaa2_sec']\n+deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec']\n sources = files('dpaa2_hw_dpcon.c',\n \t\t'dpaa2_eventdev.c',\n \t\t'dpaa2_eventdev_selftest.c')\ndiff --git a/drivers/event/meson.build b/drivers/event/meson.build\nindex f2a343147..a7dac99de 100644\n--- a/drivers/event/meson.build\n+++ b/drivers/event/meson.build\n@@ -12,4 +12,3 @@ if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and\n endif\n std_deps = ['eventdev', 'kvargs']\n config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_EVENTDEV'\n-driver_name_fmt = 'rte_pmd_@0@_event'\ndiff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build\nindex 2b74bb62d..41e367684 100644\n--- a/drivers/event/octeontx/meson.build\n+++ b/drivers/event/octeontx/meson.build\n@@ -10,4 +10,4 @@ sources = files('ssovf_worker.c',\n \t\t'timvf_probe.c'\n )\n \n-deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'pmd_octeontx']\n+deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx']\ndiff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build\nindex 0ade51cec..3e5eb37d2 100644\n--- a/drivers/event/octeontx2/meson.build\n+++ b/drivers/event/octeontx2/meson.build\n@@ -24,6 +24,6 @@ foreach flag: extra_flags\n \tendif\n endforeach\n \n-deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'pmd_octeontx2']\n+deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'net_octeontx2']\n \n includes += include_directories('../../crypto/octeontx2')\ndiff --git a/drivers/mempool/meson.build b/drivers/mempool/meson.build\nindex 7520e489f..a6ddd35b2 100644\n--- a/drivers/mempool/meson.build\n+++ b/drivers/mempool/meson.build\n@@ -4,4 +4,3 @@\n drivers = ['bucket', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring', 'stack']\n std_deps = ['mempool']\n config_flag_fmt = 'RTE_LIBRTE_@0@_MEMPOOL'\n-driver_name_fmt = 'rte_mempool_@0@'\ndiff --git a/drivers/meson.build b/drivers/meson.build\nindex 3d4bbff13..a5a6fed06 100644\n--- a/drivers/meson.build\n+++ b/drivers/meson.build\n@@ -33,9 +33,6 @@ foreach subpath:subdirs\n \tdrivers = []\n \tstd_deps = []\n \tconfig_flag_fmt = '' # format string used to set the value in dpdk_conf\n-\tdriver_name_fmt = '' # format string for driver name, used to name\n-\t # the library, the dependency and to find the\n-\t # version file for linking\n \n \t# subpath can be either \"class\" or \"class/driver\"\n \tif subpath.contains('/')\n@@ -113,11 +110,14 @@ foreach subpath:subdirs\n \t\t\tendif\n \t\telse\n \t\t\tenabled_drivers += name\n+\t\t\tlib_name = '_'.join(['rte', class, name])\n+\t\t\tdpdk_conf.set(lib_name.to_upper(), 1)\n \n \t\t\tif fmt_name == ''\n \t\t\t\tfmt_name = name\n \t\t\tendif\n-\t\t\tdpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1)\n+\n+\t\t\tdpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) #old-style macro\n \t\t\t# for driver compatibility, since we changed the\n \t\t\t# default to match that of make. Remove in future release\n \t\t\t# after following deprecation process\n@@ -133,7 +133,6 @@ foreach subpath:subdirs\n \t\t\t\tdpdk_conf.set(alt_flag_fmt.format(\n \t\t\t\t\t\tfmt_name.to_upper()), 1)\n \t\t\tendif\n-\t\t\tlib_name = driver_name_fmt.format(fmt_name)\n \n \t\t\tdpdk_extra_ldflags += pkgconfig_extra_libs\n \ndiff --git a/drivers/net/meson.build b/drivers/net/meson.build\nindex d56b24051..4e4c2c976 100644\n--- a/drivers/net/meson.build\n+++ b/drivers/net/meson.build\n@@ -59,4 +59,3 @@ std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc\n std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std\n std_deps += ['bus_vdev'] # same with vdev bus\n config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'\n-driver_name_fmt = 'rte_pmd_@0@'\ndiff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build\nindex 5a25e11a7..404006515 100644\n--- a/drivers/net/mlx4/meson.build\n+++ b/drivers/net/mlx4/meson.build\n@@ -116,7 +116,7 @@ configure_file(output : 'mlx4_autoconf.h', configuration : config)\n # Build Glue Library\n if dlopen_ibverbs\n \tdlopen_name = 'mlx4_glue'\n-\tdlopen_lib_name = driver_name_fmt.format(dlopen_name)\n+\tdlopen_lib_name = 'rte_net_' + dlopen_name\n \tdlopen_so_version = LIB_GLUE_VERSION\n \tdlopen_sources = files('mlx4_glue.c')\n \tdlopen_install_dir = [ eal_pmd_path + '-glue' ]\ndiff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build\nindex da454b194..027ff8056 100644\n--- a/drivers/raw/ifpga/meson.build\n+++ b/drivers/raw/ifpga/meson.build\n@@ -11,7 +11,7 @@ subdir('base')\n objs = [base_objs]\n \n deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',\n-\t'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke']\n+\t'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']\n \n sources = files('ifpga_rawdev.c')\n \ndiff --git a/drivers/raw/meson.build b/drivers/raw/meson.build\nindex 2c1e65ec7..d8d6cf582 100644\n--- a/drivers/raw/meson.build\n+++ b/drivers/raw/meson.build\n@@ -12,4 +12,3 @@ drivers = ['dpaa2_cmdif', 'dpaa2_qdma',\n \t'skeleton']\n std_deps = ['rawdev']\n config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'\n-driver_name_fmt = 'rte_rawdev_@0@'\ndiff --git a/drivers/regex/meson.build b/drivers/regex/meson.build\nindex 79bb5d5df..880a1b4a3 100644\n--- a/drivers/regex/meson.build\n+++ b/drivers/regex/meson.build\n@@ -4,4 +4,3 @@\n drivers = ['mlx5', 'octeontx2']\n std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc\n config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'\n-driver_name_fmt = 'rte_pmd_@0@'\ndiff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build\nindex 798eb3830..b346e4308 100644\n--- a/drivers/vdpa/meson.build\n+++ b/drivers/vdpa/meson.build\n@@ -10,4 +10,3 @@ drivers = ['ifc',\n std_deps = ['bus_pci', 'kvargs']\n std_deps += ['vhost']\n config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'\n-driver_name_fmt = 'rte_pmd_@0@'\ndiff --git a/examples/bond/meson.build b/examples/bond/meson.build\nindex 82e355a49..69382ffcd 100644\n--- a/examples/bond/meson.build\n+++ b/examples/bond/meson.build\n@@ -6,7 +6,7 @@\n # To build this example as a standalone application with an already-installed\n # DPDK instance, use 'make'\n \n-deps += 'pmd_bond'\n+deps += 'net_bond'\n allow_experimental_apis = true\n sources = files(\n \t'main.c'\ndiff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build\nindex bc7a35514..fdfdd1971 100644\n--- a/examples/ethtool/meson.build\n+++ b/examples/ethtool/meson.build\n@@ -14,7 +14,7 @@ includes = include_directories('lib', 'ethtool-app')\n \n deps += 'bus_pci'\n if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')\n-\tdeps += 'pmd_ixgbe'\n+\tdeps += 'net_ixgbe'\n endif\n \n allow_experimental_apis = true\ndiff --git a/examples/ioat/meson.build b/examples/ioat/meson.build\nindex f72cf70e7..f1a045a0a 100644\n--- a/examples/ioat/meson.build\n+++ b/examples/ioat/meson.build\n@@ -9,7 +9,7 @@\n allow_experimental_apis = true\n build = dpdk_conf.has('RTE_LIBRTE_PMD_IOAT_RAWDEV')\n \n-deps += ['rawdev_ioat']\n+deps += ['raw_ioat']\n \n sources = files(\n \t'ioatfwd.c'\ndiff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build\nindex 39e1604fa..9002d62a6 100644\n--- a/examples/l2fwd-crypto/meson.build\n+++ b/examples/l2fwd-crypto/meson.build\n@@ -8,7 +8,7 @@\n \n deps += 'cryptodev'\n if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n-\tdeps += 'pmd_crypto_scheduler'\n+\tdeps += 'crypto_scheduler'\n endif\n allow_experimental_apis = true\n sources = files(\ndiff --git a/examples/ntb/meson.build b/examples/ntb/meson.build\nindex 45a59350c..bac6e5cd2 100644\n--- a/examples/ntb/meson.build\n+++ b/examples/ntb/meson.build\n@@ -16,5 +16,5 @@ sources = files(\n \t'ntb_fwd.c'\n )\n if dpdk_conf.has('RTE_LIBRTE_PMD_NTB_RAWDEV')\n-\tdeps += 'rawdev_ntb'\n+\tdeps += 'raw_ntb'\n endif\ndiff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build\nindex 54e2b584f..2dd132015 100644\n--- a/examples/vm_power_manager/meson.build\n+++ b/examples/vm_power_manager/meson.build\n@@ -14,15 +14,15 @@ endif\n deps += ['power']\n \n if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')\n-\tdeps += ['pmd_bnxt']\n+\tdeps += ['net_bnxt']\n endif\n \n if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')\n-\tdeps += ['pmd_i40e']\n+\tdeps += ['net_i40e']\n endif\n \n if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')\n-\tdeps += ['pmd_ixgbe']\n+\tdeps += ['net_ixgbe']\n endif\n \n allow_experimental_apis = true\ndiff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build\nindex 8fc24e8c8..e4b610246 100644\n--- a/lib/librte_ethdev/meson.build\n+++ b/lib/librte_ethdev/meson.build\n@@ -1,7 +1,6 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2017 Intel Corporation\n \n-name = 'ethdev'\n sources = files('ethdev_private.c',\n \t'ethdev_profile.c',\n \t'ethdev_trace_points.c',\ndiff --git a/lib/librte_graph/meson.build b/lib/librte_graph/meson.build\nindex d5de1e250..d3ec78ca6 100644\n--- a/lib/librte_graph/meson.build\n+++ b/lib/librte_graph/meson.build\n@@ -1,8 +1,6 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(C) 2020 Marvell International Ltd.\n \n-name = 'graph'\n-\n sources = files('node.c', 'graph.c', 'graph_ops.c', 'graph_debug.c', 'graph_stats.c', 'graph_populate.c')\n headers = files('rte_graph.h', 'rte_graph_worker.h')\n \ndiff --git a/lib/meson.build b/lib/meson.build\nindex 8761457c9..5f8177e1a 100644\n--- a/lib/meson.build\n+++ b/lib/meson.build\n@@ -98,7 +98,8 @@ foreach l:libraries\n \t\tset_variable(name.underscorify() + '_disable_reason', reason)\n \telse\n \t\tenabled_libs += name\n-\t\tdpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1)\n+\t\tdpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro\n+\t\tdpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro\n \t\tinstall_headers(headers)\n \n \t\tlibname = 'rte_' + name\n", "prefixes": [ "v3", "6/7" ] }