From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, mdr@ashroe.eu, nhorman@tuxdriver.com,
kevin.laatz@intel.com, bruce.richardson@intel.com
Subject: [dpdk-dev] [PATCH v4 2/2] devtools: fix ABI update in map files
Date: Tue, 11 Aug 2020 13:27:20 +0200 [thread overview]
Message-ID: <20200811112720.2103052-2-thomas@monjalon.net> (raw)
In-Reply-To: <20200811112720.2103052-1-thomas@monjalon.net>
The script was using the full ABI version, including the minor number,
to version the symbols in the map files.
It is fixed to use only the major number for symbol versioning.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
devtools/update_version_map_abi.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
index 80a61641ed..10c3bc8098 100755
--- a/devtools/update_version_map_abi.py
+++ b/devtools/update_version_map_abi.py
@@ -105,9 +105,9 @@ def __parse_map_file(f_in):
return has_stable, stable_lines, experimental_lines, internal_lines
-def __generate_stable_abi(f_out, abi_version, lines):
+def __generate_stable_abi(f_out, abi_major, lines):
# print ABI version header
- print("DPDK_{} {{".format(abi_version), file=f_out)
+ print("DPDK_{} {{".format(abi_major), file=f_out)
# print global section if it exists
if lines:
@@ -186,6 +186,7 @@ def __main():
file=sys.stderr)
arg_parser.print_help()
sys.exit(1)
+ abi_major = parsed.abi_version.split('.')[0]
with open(parsed.map_file) as f_in:
has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
@@ -193,7 +194,7 @@ def __main():
with open(parsed.map_file, 'w') as f_out:
need_newline = has_stable and experimental_lines
if has_stable:
- __generate_stable_abi(f_out, parsed.abi_version, stable_lines)
+ __generate_stable_abi(f_out, abi_major, stable_lines)
if need_newline:
# separate sections with a newline
print(file=f_out)
--
2.27.0
next prev parent reply other threads:[~2020-08-11 11:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 15:15 [dpdk-dev] [PATCH] version: 20.11-rc0 Thomas Monjalon
2020-08-11 9:31 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2020-08-11 9:58 ` [dpdk-dev] [PATCH v3 1/2] " Thomas Monjalon
2020-08-11 9:58 ` [dpdk-dev] [PATCH v3 2/2] devtools: fix ABI update in map files Thomas Monjalon
2020-08-11 11:27 ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Thomas Monjalon
2020-08-11 11:27 ` Thomas Monjalon [this message]
2020-08-11 13:47 ` Kinsella, Ray
2020-08-11 14:05 ` Thomas Monjalon
2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 " Thomas Monjalon
2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files Thomas Monjalon
2020-08-12 6:57 ` Kinsella, Ray
2020-08-11 16:18 ` [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0 Kinsella, Ray
2020-08-12 9:02 ` Kinsella, Ray
2020-08-12 8:58 ` Kinsella, Ray
2020-08-12 9:33 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200811112720.2103052-2-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=kevin.laatz@intel.com \
--cc=mdr@ashroe.eu \
--cc=nhorman@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).