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 C118AA04AB; Tue, 11 Aug 2020 11:59:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F0B001C0CD; Tue, 11 Aug 2020 11:58:56 +0200 (CEST) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 5A9411C0B3 for ; Tue, 11 Aug 2020 11:58:55 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D33C25C0072; Tue, 11 Aug 2020 05:58:54 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Tue, 11 Aug 2020 05:58:54 -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=E0AWHGsCRU6B42OJc8/Z0xeOwXdLX GF3GOeFqcGDv9GTwAfska9+XIuKBV3ljDdmuEFRsjp8mjpx+tTw2EUWnB6ih6MA9 jDAbLsH4itBq6o50Bly2qcERbqCugs3Y9dQed8mihD4Por0zu/L14Bxy5InEKs5i iasItnamKkDh8IKEPS7scycqYcgWzfHUcmgTiWZ+BqL2IdcIUDw8O2h26+4qQ7R1 crGskh9EW5Wa5i7FjYhxiP0v0pksQz1Z23gl4usAVfRKnEswhQDTKl3ja7ZoqWbU YtcIQl7Gf73ARuI7VtJtEjB+fAhjF0f/XaYajuEWLQ9Uu92HlHVTlc6dQ== 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=s7H5xNoV RDPFuBbzDDjkpePujFLvSWlQAMDmN1MVAZqi/1hjTH7j2VDkg+M2sJTCeNZIkUzP wUxLAPFJUrWIkjoGoXuP1uzW+gM+NZS1X+IL1QwyBmBb5LNw2zLxgdXt6/OHizMy z5h69MASHnqzDo/9c2cEAocR6HlIjGpV2Bmotq1BsctIfCYHdKjaAhktW+U2O4jV xq5TT3wwRnHEyWbdej6jFvbK0MBwZdpRkxaZaqDFVbbqK9ZpDh+gWaCMN9h1E5EA b0h2QcBTT3ynntxBvdzgN/iH4YD6nOZXXs5k7fjTJdi4tihCxOBA3BtmEsFHbMFC rm5I5tPPRIoGDw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrledtgddvvdcutefuodetggdotefrodftvf 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 CE01E3280064; Tue, 11 Aug 2020 05:58:53 -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 11:58:42 +0200 Message-Id: <20200811095842.1789162-2-thomas@monjalon.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200811095842.1789162-1-thomas@monjalon.net> References: <20200810151531.1297831-1-thomas@monjalon.net> <20200811095842.1789162-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 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