[OE-core] [PATCH] package_rpm.bbclass : escape "%" in files and directories name
Michaël Burtin
mburtin at voxtok.com
Wed May 20 14:48:19 UTC 2015
From: Sébastien Mennetrier <smennetrier at voxtok.com>
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 "%".
Signed-off-by: Sébastien Mennetrier <smennetrier at voxtok.com>
Signed-off-by: Michaël Burtin <mburtin at voxtok.com>
---
meta/classes/package_rpm.bbclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index e305e8b..3e8ae3d 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:
--
2.1.4
More information about the Openembedded-core
mailing list