diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-15 17:47:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-16 12:05:48 +0000 |
| commit | e4319b6dd0dbaed7a509cb82bc4251896f612c0f (patch) | |
| tree | 32a11d9817e4cbd7efccd3975b34548ab4d88353 /meta/classes/package_rpm.bbclass | |
| parent | fd291d0120ae171108d71eabf7d7b2e3e9fc0e44 (diff) | |
| download | openembedded-core-contrib-e4319b6dd0dbaed7a509cb82bc4251896f612c0f.tar.gz | |
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
(From OE-Core rev: e38d7702be279d6d6d4c79b3f2379e689a7473d2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -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 () { # 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: |