From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B7304A04D7; Tue, 11 Aug 2020 16:04:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B28721C0AD; Tue, 11 Aug 2020 16:03:52 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 3CE371C00D for ; Tue, 11 Aug 2020 16:03:50 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id E2F575C00AE; Tue, 11 Aug 2020 10:03:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Tue, 11 Aug 2020 10:03:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=0+wzf3D4bJQ3I j/4VqnN0SfnUn817/OelzJJSA2qBXI=; b=onDkXjFARcJwR6EtmtIFvvhUoDsek igEz5KJ3jj8T/kjqWW7F+cqE89d3YjXcUmaC0hwzn0iCzA5mspAsLNXolIB1MJZL P/YzT7qYSDWZq+POe8TT6xpk2AcOhelfdsz3x99s7M2Xc3+E4POVXcOwb6nIp7Hr ciFkGH+q93ZIhPnJrVZtN/HumIVdmSSLVkOzQWFM2fRkS32BuagJ6afmyoq1HTpt lQigI2c7x2cz1USWxxJFoQX6iJBM6tBJoyQG7ul+XPmlu+jUrt2JWSC4CQmeX8eQ 1kMjuyEbZTbIgsMcLzQrGOQTcVGcBrD6yZnS9ZzmSJTWlYNOkjAUpwbHg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=0+wzf3D4bJQ3Ij/4VqnN0SfnUn817/OelzJJSA2qBXI=; b=BAhspHfS Uu4JG85PVnrerOku4Bf664gEu5Fr0gxyZFKMbc4oKKjNRBN5BJMwL/L+exfNUvvJ uFYQHLqyfEeIhNlCD13aYF4PcMubfuN3MzEB3DKLn5IjFdo8QIOYSqZjgaCL6JyU o6VqIoaMpT7/NpPEEa2uw67avZffenIrYmM1nPFxsSwpdc2lqFjPAMR20AHCclS7 hfk7jcSSoTegubz+MFBclWd8Eo+bGz+1n5+2d3g8mrSyQ2OcgtwZ1GBjcQgpjpMd MhfYlyQHfhnlsakHORau/jdpUIbl+0lO0vodhoo/S4rHFV0a0tekhrFgOoFxSUMA RioInClVM3PjFA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrledtgdejfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefvhhhomhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehm ohhnjhgrlhhonhdrnhgvtheqnecuggftrfgrthhtvghrnhepvdehgfeivdejgedtveehfe fhteelfefgieevgfffveefjeegtdfguedthedtgeevnecukfhppeelfedriedrudegledr uddugeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hthhhomhgrshesmhhonhhjrghlohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (114.149.6.93.rev.sfr.net [93.6.149.114]) by mail.messagingengine.com (Postfix) with ESMTPA id D64AF3280059; Tue, 11 Aug 2020 10:03:48 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, mdr@ashroe.eu, nhorman@tuxdriver.com, kevin.laatz@intel.com, bruce.richardson@intel.com Date: Tue, 11 Aug 2020 16:03:39 +0200 Message-Id: <20200811140339.2123929-2-thomas@monjalon.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200811140339.2123929-1-thomas@monjalon.net> References: <20200810151531.1297831-1-thomas@monjalon.net> <20200811140339.2123929-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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