From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH v2 15/16] devtools: add script to ease backport of renamed files
Date: Tue, 20 Apr 2021 11:22:31 +0100 [thread overview]
Message-ID: <20210420102232.314452-16-bruce.richardson@intel.com> (raw)
In-Reply-To: <20210420102232.314452-1-bruce.richardson@intel.com>
With all the library folders renamed to remove the "librte_" prefix,
we need to fixup patches for easier backport, i.e. add back in the
prefix for any references to those renamed files.
In the script itself we use a general approach to allow other functions
to be added in future for other modifications needed to patches.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
devtools/update_patches.py | 53 ++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100755 devtools/update_patches.py
diff --git a/devtools/update_patches.py b/devtools/update_patches.py
new file mode 100755
index 0000000000..0cff215a96
--- /dev/null
+++ b/devtools/update_patches.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+import os
+import sys
+import shutil
+from os.path import abspath, dirname, join
+
+def fixup_library_renames(contents):
+ """since library directory names have dropped the 'librte_' prefix,
+ add those prefixes back in for patches than need it"""
+ modified = False
+
+ # first get all the DPDK libs to build up replacement list
+ # stored in function attribute between calls
+ try:
+ libdirs = fixup_library_renames.libdirs
+ except AttributeError:
+ dpdk_libdir = abspath(join(dirname(sys.argv[0]), '..', 'lib'))
+ for root, dirs, files in os.walk(dpdk_libdir):
+ fixup_library_renames.libdirs = dirs
+ libdirs = dirs
+ break
+
+ for i in range(len(contents)):
+ # skip over any lines which don't have lib in it
+ if not "lib/" in contents[i]:
+ continue
+ for d in libdirs:
+ if f'lib/{d}' in contents[i]:
+ modified = True
+ contents[i] = contents[i].replace(f'lib/{d}', f'lib/librte_{d}')
+ return modified
+
+def main():
+ "takes list of patches off argv and processes each"
+ for patch in sys.argv[1:]:
+ modified = False
+ with open(patch) as f:
+ contents = f.readlines()
+
+ modified |= fixup_library_renames(contents)
+ # other functions to change the patch go here
+
+ if not modified:
+ continue
+ shutil.copyfile(f'{patch}', f'{patch}.bak')
+ with open(patch, 'w') as f:
+ f.writelines(contents)
+
+if __name__ == "__main__":
+ main()
--
2.27.0
next prev parent reply other threads:[~2021-04-20 10:24 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 11:49 [dpdk-dev] [RFC PATCH 00/14] Build file update proposals Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 01/14] editorconfig: add entry for meson files Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 02/14] build: simplify library build file Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 03/14] build: correct indentation in list of libs Bruce Richardson
2021-04-01 13:30 ` Thomas Monjalon
2021-04-01 14:01 ` Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 04/14] build: simplify the driver build configuration file Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation Bruce Richardson
2021-04-01 12:14 ` Andrew Rybchenko
2021-04-01 12:33 ` Bruce Richardson
2021-04-01 12:40 ` Andrew Rybchenko
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 06/14] build: reduce indentation in app build spec Bruce Richardson
2021-04-01 13:32 ` Thomas Monjalon
2021-04-01 14:05 ` Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 07/14] build: reduce indentation in examples " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 08/14] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 09/14] lib: change meson " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 10/14] drivers: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 11/14] examples: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 12/14] app: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 13/14] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-01 13:42 ` Thomas Monjalon
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 14/14] lib: allow disabling optional libraries Bruce Richardson
2021-04-01 12:27 ` [dpdk-dev] [RFC PATCH 00/14] Build file update proposals Andrew Rybchenko
2021-04-01 13:15 ` Luca Boccassi
2021-04-01 13:36 ` Thomas Monjalon
2021-04-01 14:10 ` Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 00/14] Build file updates Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 01/14] build: simplify library build file Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 02/14] build: tidy up list of libraries to build Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 03/14] build: simplify the driver build configuration file Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 04/14] build: clean up driver lists Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 05/14] build: reduce indentation in app build spec Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 06/14] build: reduce indentation in examples " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 07/14] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 08/14] lib: cleanup whitespace in meson build files Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 09/14] drivers: change meson file tabs to spaces Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 10/14] examples: " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 11/14] app: " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 12/14] editorconfig: add entry for meson files Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 13/14] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 14/14] lib: allow disabling optional libraries Bruce Richardson
2021-04-18 8:45 ` [dpdk-dev] [PATCH 00/14] Build file updates Xueming(Steven) Li
2021-04-19 13:06 ` Bruce Richardson
2021-04-21 13:01 ` Xueming(Steven) Li
2021-04-21 15:52 ` Xueming(Steven) Li
2021-04-19 0:20 ` Thomas Monjalon
2021-04-19 13:09 ` Bruce Richardson
2021-04-19 13:47 ` Thomas Monjalon
2021-04-19 14:23 ` Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 00/16] " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 01/16] build: simplify library build file Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 02/16] build: tidy up list of libraries to build Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 03/16] build: simplify the driver build configuration file Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 04/16] build: clean up driver lists Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 05/16] build: reduce indentation in app build spec Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 06/16] build: reduce indentation in examples " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 07/16] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-27 19:16 ` David Christensen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 08/16] lib: cleanup whitespace in meson build files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 09/16] drivers: change meson file tabs to spaces Bruce Richardson
2021-04-21 1:48 ` Xu, Rosen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 10/16] examples: " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 11/16] app: " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 12/16] editorconfig: add entry for meson files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 13/16] doc: add meson coding style section to contributors guide Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 14/16] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-28 20:18 ` David Christensen
2021-04-20 10:22 ` Bruce Richardson [this message]
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 16/16] lib: allow disabling optional libraries Bruce Richardson
2021-04-21 12:08 ` [dpdk-dev] [PATCH v2 00/16] Build file updates 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=20210420102232.314452-16-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
/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).