From 242be0888c80df082c7f19f2bce6afaaac095d7d Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Thu, 23 May 2024 12:26:54 -0600 Subject: 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 (From OE-Core rev: 4cb7e93c624987d146aaf626ce8e99568e938a70) Signed-off-by: Joshua Watt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-global/package_rpm.bbclass | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'meta/classes-global') diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 790ccbfaf0..474d2491eb 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -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] -- cgit v1.2.3-54-g00ecf