Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/61856/?format=api
{ "id": 61856, "url": "http://patches.dpdk.org/api/patches/61856/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/c1b57cd88380cc0dc8f1888fa64905f5ed1fd065.1571910363.git.anatoly.burakov@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": "<c1b57cd88380cc0dc8f1888fa64905f5ed1fd065.1571910363.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/c1b57cd88380cc0dc8f1888fa64905f5ed1fd065.1571910363.git.anatoly.burakov@intel.com", "date": "2019-10-24T09:46:38", "name": "[v5,01/10] config: change ABI versioning to global", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f752f61e8006a932339828d9be2421204f70b9c9", "submitter": { "id": 4, "url": "http://patches.dpdk.org/api/people/4/?format=api", "name": "Anatoly Burakov", "email": "anatoly.burakov@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/c1b57cd88380cc0dc8f1888fa64905f5ed1fd065.1571910363.git.anatoly.burakov@intel.com/mbox/", "series": [ { "id": 7035, "url": "http://patches.dpdk.org/api/series/7035/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7035", "date": "2019-10-24T09:46:37", "name": "Implement the new ABI policy and add helper scripts", "version": 5, "mbox": "http://patches.dpdk.org/series/7035/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/61856/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/61856/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id A66E31E8E3;\n\tThu, 24 Oct 2019 11:46:56 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id BCA251E8BF\n\tfor <dev@dpdk.org>; Thu, 24 Oct 2019 11:46:51 +0200 (CEST)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t24 Oct 2019 02:46:51 -0700", "from silpixa00399498.ir.intel.com (HELO\n\tsilpixa00399498.ger.corp.intel.com) ([10.237.223.151])\n\tby fmsmga007.fm.intel.com with ESMTP; 24 Oct 2019 02:46:49 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.68,224,1569308400\"; d=\"scan'208\";a=\"197686500\"", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "Marcin Baran <marcinx.baran@intel.com>,\n\tThomas Monjalon <thomas@monjalon.net>,\n\tBruce Richardson <bruce.richardson@intel.com>, john.mcnamara@intel.com,\n\tray.kinsella@intel.com, david.marchand@redhat.com,\n\tPawel Modrak <pawelx.modrak@intel.com>", "Date": "Thu, 24 Oct 2019 10:46:38 +0100", "Message-Id": "<c1b57cd88380cc0dc8f1888fa64905f5ed1fd065.1571910363.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": [ "<cover.1571910363.git.anatoly.burakov@intel.com>", "<cover.1571910363.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1571910363.git.anatoly.burakov@intel.com>", "<cover.1571322634.git.anatoly.burakov@intel.com>\n\t<cover.1571910363.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v5 01/10] config: change ABI versioning to global", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Marcin Baran <marcinx.baran@intel.com>\n\nAs per new ABI policy, all of the libraries are now versioned using\none global ABI version. Changes in this patch implement the\nnecessary steps to enable that.\n\nSigned-off-by: Marcin Baran <marcinx.baran@intel.com>\nSigned-off-by: Pawel Modrak <pawelx.modrak@intel.com>\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\nAcked-by: Bruce Richardson <bruce.richardson@intel.com>\n---\n\nNotes:\n v3:\n - Removed Windows support from Makefile changes\n - Removed unneeded path conversions from meson files\n\n buildtools/meson.build | 2 ++\n config/ABI_VERSION | 1 +\n config/meson.build | 4 +++-\n drivers/meson.build | 20 ++++++++++++--------\n lib/meson.build | 18 +++++++++++-------\n meson_options.txt | 2 --\n mk/rte.lib.mk | 13 ++++---------\n 7 files changed, 33 insertions(+), 27 deletions(-)\n create mode 100644 config/ABI_VERSION", "diff": "diff --git a/buildtools/meson.build b/buildtools/meson.build\nindex 32c79c1308..78ce69977d 100644\n--- a/buildtools/meson.build\n+++ b/buildtools/meson.build\n@@ -12,3 +12,5 @@ if python3.found()\n else\n \tmap_to_def_cmd = ['meson', 'runpython', files('map_to_def.py')]\n endif\n+\n+is_experimental_cmd = [find_program('grep', 'findstr'), '^DPDK_']\ndiff --git a/config/ABI_VERSION b/config/ABI_VERSION\nnew file mode 100644\nindex 0000000000..9a7c1e503f\n--- /dev/null\n+++ b/config/ABI_VERSION\n@@ -0,0 +1 @@\n+20.0\ndiff --git a/config/meson.build b/config/meson.build\nindex acacba704a..40ad34345f 100644\n--- a/config/meson.build\n+++ b/config/meson.build\n@@ -18,6 +18,8 @@ endforeach\n # depending on the configuration options\n pver = meson.project_version().split('.')\n major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))\n+abi_version = run_command(find_program('cat', 'more'),\n+\tfiles('ABI_VERSION')).stdout().strip()\n \n # extract all version information into the build configuration\n dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())\n@@ -37,7 +39,7 @@ endif\n \n pmd_subdir_opt = get_option('drivers_install_subdir')\n if pmd_subdir_opt.contains('<VERSION>')\n-\tpmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))\n+\tpmd_subdir_opt = abi_version.join(pmd_subdir_opt.split('<VERSION>'))\n endif\n driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)\n eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)\ndiff --git a/drivers/meson.build b/drivers/meson.build\nindex 4a1cb8b5be..1c1190053e 100644\n--- a/drivers/meson.build\n+++ b/drivers/meson.build\n@@ -119,12 +119,19 @@ foreach class:dpdk_driver_classes\n \t\t\t\t\toutput: out_filename,\n \t\t\t\t\tdepends: [pmdinfogen, tmp_lib])\n \n-\t\t\tif get_option('per_library_versions')\n-\t\t\t\tlib_version = '@0@.1'.format(version)\n-\t\t\t\tso_version = '@0@'.format(version)\n+\t\t\tversion_map = '@0@/@1@/@2@_version.map'.format(\n+\t\t\t\t\tmeson.current_source_dir(),\n+\t\t\t\t\tdrv_path, lib_name)\n+\n+\t\t\tis_experimental = run_command(is_experimental_cmd,\n+\t\t\t\tfiles(version_map)).returncode()\n+\n+\t\t\tif is_experimental != 0\n+\t\t\t\tlib_version = '0.1'\n+\t\t\t\tso_version = '0'\n \t\t\telse\n-\t\t\t\tlib_version = major_version\n-\t\t\t\tso_version = major_version\n+\t\t\t\tlib_version = abi_version\n+\t\t\t\tso_version = abi_version\n \t\t\tendif\n \n \t\t\t# now build the static driver\n@@ -137,9 +144,6 @@ foreach class:dpdk_driver_classes\n \t\t\t\tinstall: true)\n \n \t\t\t# now build the shared driver\n-\t\t\tversion_map = '@0@/@1@/@2@_version.map'.format(\n-\t\t\t\t\tmeson.current_source_dir(),\n-\t\t\t\t\tdrv_path, lib_name)\n \t\t\tshared_lib = shared_library(lib_name,\n \t\t\t\tsources,\n \t\t\t\tobjects: objs,\ndiff --git a/lib/meson.build b/lib/meson.build\nindex 8ea3671c04..6302c0b680 100644\n--- a/lib/meson.build\n+++ b/lib/meson.build\n@@ -100,12 +100,18 @@ foreach l:libraries\n \t\t\t\tcflags += '-DALLOW_EXPERIMENTAL_API'\n \t\t\tendif\n \n-\t\t\tif get_option('per_library_versions')\n-\t\t\t\tlib_version = '@0@.1'.format(version)\n-\t\t\t\tso_version = '@0@'.format(version)\n+\t\t\tversion_map = '@0@/@1@/rte_@2@_version.map'.format(\n+\t\t\t\t\tmeson.current_source_dir(), dir_name, name)\n+\n+\t\t\tis_experimental = run_command(is_experimental_cmd,\n+\t\t\t\t\tfiles(version_map)).returncode()\n+\n+\t\t\tif is_experimental != 0\n+\t\t\t\tlib_version = '0.1'\n+\t\t\t\tso_version = '0'\n \t\t\telse\n-\t\t\t\tlib_version = major_version\n-\t\t\t\tso_version = major_version\n+\t\t\t\tlib_version = abi_version\n+\t\t\t\tso_version = abi_version\n \t\t\tendif\n \n \t\t\t# first build static lib\n@@ -123,8 +129,6 @@ foreach l:libraries\n \t\t\t# then use pre-build objects to build shared lib\n \t\t\tsources = []\n \t\t\tobjs += static_lib.extract_all_objects(recursive: false)\n-\t\t\tversion_map = '@0@/@1@/rte_@2@_version.map'.format(\n-\t\t\t\t\tmeson.current_source_dir(), dir_name, name)\n \t\t\timplib = dir_name + '.dll.a'\n \n \t\t\tdef_file = custom_target(name + '_def',\ndiff --git a/meson_options.txt b/meson_options.txt\nindex 89650b0e9c..da6a7f0302 100644\n--- a/meson_options.txt\n+++ b/meson_options.txt\n@@ -30,8 +30,6 @@ option('max_lcores', type: 'integer', value: 128,\n \tdescription: 'maximum number of cores/threads supported by EAL')\n option('max_numa_nodes', type: 'integer', value: 4,\n \tdescription: 'maximum number of NUMA nodes supported by EAL')\n-option('per_library_versions', type: 'boolean', value: true,\n-\tdescription: 'true: each lib gets its own version number, false: DPDK version used for each lib')\n option('tests', type: 'boolean', value: true,\n \tdescription: 'build unit tests')\n option('use_hpet', type: 'boolean', value: false,\ndiff --git a/mk/rte.lib.mk b/mk/rte.lib.mk\nindex 4df8849a08..e1ea292b6e 100644\n--- a/mk/rte.lib.mk\n+++ b/mk/rte.lib.mk\n@@ -11,20 +11,15 @@ EXTLIB_BUILD ?= n\n # VPATH contains at least SRCDIR\n VPATH += $(SRCDIR)\n \n-ifneq ($(CONFIG_RTE_MAJOR_ABI),)\n-ifneq ($(LIBABIVER),)\n-LIBABIVER := $(CONFIG_RTE_MAJOR_ABI)\n-endif\n+ifneq ($(shell grep \"^DPDK_\" $(SRCDIR)/$(EXPORT_MAP)),)\n+LIBABIVER := $(shell cat $(RTE_SRCDIR)/config/ABI_VERSION)\n+else\n+LIBABIVER := 0\n endif\n \n ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)\n LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB))\n ifeq ($(EXTLIB_BUILD),n)\n-ifeq ($(CONFIG_RTE_MAJOR_ABI),)\n-ifeq ($(CONFIG_RTE_NEXT_ABI),y)\n-LIB := $(LIB).1\n-endif\n-endif\n CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP)\n endif\n endif\n", "prefixes": [ "v5", "01/10" ] }