diff options
-rw-r--r-- | meta/classes/package_rpm.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index fcde73ebe9..acbb18d686 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -659,6 +659,9 @@ python write_specfile () { | |||
659 | # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories | 659 | # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories |
660 | # when packaging. We just ignore these files which are created in | 660 | # when packaging. We just ignore these files which are created in |
661 | # packages-split/ and not package/ | 661 | # packages-split/ and not package/ |
662 | # We have the odd situation where the CONTROL/DEBIAN directory can be removed in the middle of | ||
663 | # of the walk, the isdir() test would then fail and the walk code would assume its a file | ||
664 | # hence we check for the names in files too. | ||
662 | for rootpath, dirs, files in os.walk(walkpath): | 665 | for rootpath, dirs, files in os.walk(walkpath): |
663 | path = rootpath.replace(walkpath, "") | 666 | path = rootpath.replace(walkpath, "") |
664 | if path.endswith("DEBIAN") or path.endswith("CONTROL"): | 667 | if path.endswith("DEBIAN") or path.endswith("CONTROL"): |
@@ -669,6 +672,8 @@ python write_specfile () { | |||
669 | # All packages own the directories their files are in... | 672 | # All packages own the directories their files are in... |
670 | target.append('%dir "' + path + '/' + dir + '"') | 673 | target.append('%dir "' + path + '/' + dir + '"') |
671 | for file in files: | 674 | for file in files: |
675 | if file == "CONTROL" or file == "DEBIAN": | ||
676 | continue | ||
672 | if conffiles.count(path + '/' + file): | 677 | if conffiles.count(path + '/' + file): |
673 | target.append('%config "' + path + '/' + file + '"') | 678 | target.append('%config "' + path + '/' + file + '"') |
674 | else: | 679 | else: |