summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Schmidt <joerg.schmidt@garmin.com>2025-02-20 08:35:59 -0700
committerSteve Sakoman <steve@sakoman.com>2025-02-21 06:25:05 -0800
commit9877f433a6de8ce8dedfe2dcdbbd1ae31a078018 (patch)
tree85b53af4b6c21d1d1547feb5a8a71e3a630e0d78
parentce9f4eaaae324ef4182a39293f3a6b2aa7207680 (diff)
downloadpoky-9877f433a6de8ce8dedfe2dcdbbd1ae31a078018.tar.gz
bitbake: bblayers/query: Fix using "removeprefix" string method
The minimum Python version required for Yocto 5.0 is 3.8 which causes failure in poky/bitbake/lib/bblayers/query.py when listing layers by using command "bitbake-layers show-recipes -f --bare --mc MC" for the given multiconfig MC. The reason for that failure is the use of "removeprefix" string method which got introduced in Python 3.9. This patch replaces the "removeprefix" method with an equivalent solution supported by Python 3.8. (Bitbake rev: f6635b32ab553e812fe7c05998ef05834fccd0f3) Signed-off-by: Joerg Schmidt <joerg.schmidt@garmin.com> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--bitbake/lib/bblayers/query.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bblayers/query.py b/bitbake/lib/bblayers/query.py
index eb7cb465b4..9b2e081cfd 100644
--- a/bitbake/lib/bblayers/query.py
+++ b/bitbake/lib/bblayers/query.py
@@ -145,7 +145,8 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
145 skiplist = list(self.tinfoil.cooker.skiplist_by_mc[mc].keys()) 145 skiplist = list(self.tinfoil.cooker.skiplist_by_mc[mc].keys())
146 146
147 if mc: 147 if mc:
148 skiplist = [s.removeprefix(f'mc:{mc}:') for s in skiplist] 148 mcspec = f'mc:{mc}:'
149 skiplist = [s[len(mcspec):] if s.startswith(mcspec) else s for s in skiplist]
149 150
150 for fn in skiplist: 151 for fn in skiplist:
151 recipe_parts = os.path.splitext(os.path.basename(fn))[0].split('_') 152 recipe_parts = os.path.splitext(os.path.basename(fn))[0].split('_')