From 5ed1c7f556df3fafd45d493010cc0bbe74d05ebd Mon Sep 17 00:00:00 2001 From: Sébastien Mennetrier Date: Wed, 20 May 2015 16:48:19 +0200 Subject: package_rpm.bbclass : escape "%" in files and directories name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rpm process replace all the "%name" in the spec file by the name of the package. So, if the package is composed of some files or directories named "%name...", the rpm package process failed. Replace all "%" present in files or directories names by "%%%%%%%%" to correctly escape "%" due to the number of times that % is treated as an escape character. Jeff Johnson says this is the Right Thing To Do. [ YOCTO #5397 ] Signed-off-by: Sébastien Mennetrier Signed-off-by: Michaël Burtin Signed-off-by: Ross Burton --- meta/classes/package_rpm.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes/package_rpm.bbclass') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 271b9ae772..8fd068525b 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -196,6 +196,7 @@ python write_specfile () { path = rootpath.replace(walkpath, "") if path.endswith("DEBIAN") or path.endswith("CONTROL"): continue + path = path.replace("%", "%%%%%%%%") # Treat all symlinks to directories as normal files. # os.walk() lists them as directories. @@ -214,6 +215,7 @@ python write_specfile () { for dir in dirs: if dir == "CONTROL" or dir == "DEBIAN": continue + dir = dir.replace("%", "%%%%%%%%") # All packages own the directories their files are in... target.append('%dir "' + path + '/' + dir + '"') else: @@ -227,6 +229,7 @@ python write_specfile () { for file in files: if file == "CONTROL" or file == "DEBIAN": continue + file = file.replace("%", "%%%%%%%%") if conffiles.count(path + '/' + file): target.append('%config "' + path + '/' + file + '"') else: -- cgit 1.2.3-korg