diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-05 22:08:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-06 11:02:26 +0000 |
| commit | 1eefcf0ba8c5c74312c78fbcf5f27c3840a6578a (patch) | |
| tree | 50e4c4b5fda6dc1efc84c333c6138bf568b811a9 /meta/classes/package_rpm.bbclass | |
| parent | d5a1538f0fb5112a9549a243b074bca681d9139b (diff) | |
| download | openembedded-core-contrib-1eefcf0ba8c5c74312c78fbcf5f27c3840a6578a.tar.gz | |
package_rpm: Remove need for locking
Currently if multiple package tasks are running against a recipe, package_rpm
is restricted to the slowest speed of them due to the locking. This patch
explicitly ignores the opkg/debian artefacts and hence allows a speedup.
It also removes an issue were a Ctrl+C interrupting a deb.ipk packaging task
would end up with CONTROL/DEBIAN files in the spec file resulting in a build
failure.
(From OE-Core rev: 4c3b3a57aa9ced231f5c0340920195c15a26f2b1)
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 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 36bad09ea1..31265d960a 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -660,9 +660,16 @@ python write_specfile () { array.append("%s: %s" % (tag, dep)) def walk_files(walkpath, target, conffiles): + # 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/ for rootpath, dirs, files in os.walk(walkpath): path = rootpath.replace(walkpath, "") + if path.endswith("DEBIAN") or path.endswith("CONTROL"): + continue for dir in dirs: + if dir == "CONTROL" or dir == "DEBIAN": + continue # All packages own the directories their files are in... target.append('%dir "' + path + '/' + dir + '"') for file in files: @@ -760,8 +767,6 @@ python write_specfile () { root = "%s/%s" % (pkgdest, pkg) - lf = bb.utils.lockfile(root + ".lock") - localdata.setVar('ROOT', '') localdata.setVar('ROOT_%s' % pkg, root) pkgname = localdata.getVar('PKG_%s' % pkg, True) @@ -842,8 +847,6 @@ python write_specfile () { else: bb.note("Creating EMPTY RPM Package for %s" % splitname) spec_files_top.append('') - - bb.utils.unlockfile(lf) continue # Process subpackage data @@ -949,7 +952,6 @@ python write_specfile () { spec_files_bottom.append('') del localdata - bb.utils.unlockfile(lf) add_prep(d,spec_files_bottom) spec_preamble_top.append('Summary: %s' % srcsummary) |