summaryrefslogtreecommitdiff
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-15 17:47:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-16 12:02:46 +0000
commite38d7702be279d6d6d4c79b3f2379e689a7473d2 (patch)
tree6a4031b440141e226d5568739c4cca7c07acf8e7 /meta/classes/package_rpm.bbclass
parent720d30aa5f0745185fc948376ce284cc17f0edb0 (diff)
downloadopenembedded-core-e38d7702be279d6d6d4c79b3f2379e689a7473d2.tar.gz
openembedded-core-e38d7702be279d6d6d4c79b3f2379e689a7473d2.tar.bz2
openembedded-core-e38d7702be279d6d6d4c79b3f2379e689a7473d2.zip
package_rpm: Fix a race with package_deb/package_ipk
We have the odd situation where the CONTROL/DEBIAN directory can be removed in the middle of the walk, the isdir() test would then fail and the walk code would assume its a file hence we check for the names in files too. This resolves the autobuilder failure: error: File not found: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-fsl-arm/build/build/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/xinit/1_1.3.3-r0/package/DEBIAN RPM build errors: File not found: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-fsl-arm/build/build/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/xinit/1_1.3.3-r0/package/DEBIAN Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass5
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 () {
# We can race against the ipk/deb backends which create CONTROL or DEBIAN directories
# when packaging. We just ignore these files which are created in
# packages-split/ and not package/
+ # We have the odd situation where the CONTROL/DEBIAN directory can be removed in the middle of
+ # of the walk, the isdir() test would then fail and the walk code would assume its a file
+ # hence we check for the names in files too.
for rootpath, dirs, files in os.walk(walkpath):
path = rootpath.replace(walkpath, "")
if path.endswith("DEBIAN") or path.endswith("CONTROL"):
@@ -669,6 +672,8 @@ python write_specfile () {
# All packages own the directories their files are in...
target.append('%dir "' + path + '/' + dir + '"')
for file in files:
+ if file == "CONTROL" or file == "DEBIAN":
+ continue
if conffiles.count(path + '/' + file):
target.append('%config "' + path + '/' + file + '"')
else: