lib: package: Add file_reverse_translate
PATCH 1/2 lib: package: Add file_reverse_translate
Adds API to reverse the removal of special characters from file names so it can be correctly done in multiple places without open-coding it.
Replace the translation done in the package_rpm.bbclass with the new API
Signed-off-by Joshua Watt <[email protected]>
--- meta/classes-global/package_rpm.bbclass | 8 ++------ meta/lib/oe/package.py | 25 +++++++++++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-)
meta/classes-global/package_rpm.bbclass +2 -6
@@ -38,6 +38,7 @@ def filter_nativesdk_deps(srcname, var): # Construct per file dependencies file def write_rpm_perfiledata(srcname, d): + import oe.package workdir = d.getVar('WORKDIR') packages = d.getVar('PACKAGES') pkgd = d.getVar('PKGD')
@@ -53,12 +54,7 @@ def write_rpm_perfiledata(srcname, d): key = "FILE" + varname + ":" + dfile + ":" + pkg deps = filter_nativesdk_deps(srcname, d.getVar(key) or "") depends_dict = bb.utils.explode_dep_versions(deps) - file = dfile.replace("@underscore@", "_") - file = file.replace("@closebrace@", "]") - file = file.replace("@openbrace@", "[") - file = file.replace("@tab@", "\t") - file = file.replace("@space@", " ") - file = file.replace("@at@", "@") + file = oe.package.file_reverse_translate(dfile) outfile.write('"' + pkgd + file + '" : "') for dep in depends_dict: ver = depends_dict[dep]
meta/lib/oe/package.py +19 -6
@@ -195,14 +195,27 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, max_process, qa_alre oe.utils.multiprocess_launch_mp(runstrip, sfiles, max_process) +TRANSLATE = ( + ("@", "@at@"), + (" ", "@space@"), + ("\t", "@tab@"), + ("[", "@openbrace@"), + ("]", "@closebrace@"), + ("_", "@underscore@"), +) def file_translate(file): - ft = file.replace("@", "@at@") - ft = ft.replace(" ", "@space@") - ft = ft.replace("\t", "@tab@") - ft = ft.replace("[", "@openbrace@") - ft = ft.replace("]", "@closebrace@") - ft = ft.replace("_", "@underscore@") + ft = file + for s, replace in TRANSLATE: + ft = ft.replace(s, replace) + + return ft + +def file_reverse_translate(file): + ft = file + for s, replace in reversed(TRANSLATE): + ft = ft.replace(replace, s) + return ft def filedeprunner(arg):
Signature · 1 line
2.43.2
PATCH 2/2 lib: package: Replace ":" in file names
The purpose of this translation API is to make sure that the file name can be used in a bitbake variable without adding special meaning, therefore the ":" should also be replaced since it is the override separator
Signed-off-by Joshua Watt <[email protected]>
--- meta/lib/oe/package.py | 1 + 1 file changed, 1 insertion(+)
meta/lib/oe/package.py +1 -0
@@ -202,6 +202,7 @@ TRANSLATE = ( ("[", "@openbrace@"), ("]", "@closebrace@"), ("_", "@underscore@"), + (":", "@colon@"), ) def file_translate(file):
Signature · 1 line
2.43.2