diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-23 15:41:21 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-23 15:41:21 +0100 |
| commit | ca95d02ce0dd7e1ab8a6ed5efb5fc382df5b7a81 (patch) | |
| tree | 31bda78740c21eaf60dac5cc2d3d71ea8c7752bc /meta/classes | |
| parent | 203bf3f772f1ab1691a786e13d63cdbbc4dd458f (diff) | |
| download | openembedded-core-ca95d02ce0dd7e1ab8a6ed5efb5fc382df5b7a81.tar.gz openembedded-core-ca95d02ce0dd7e1ab8a6ed5efb5fc382df5b7a81.tar.bz2 openembedded-core-ca95d02ce0dd7e1ab8a6ed5efb5fc382df5b7a81.zip | |
package.bbclass: Fix shlibs race
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 04ea9e384f..8d22d0fa8f 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -761,8 +761,6 @@ python package_do_shlibs() { postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True) bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) - bb.utils.unlockfile(lf) - list_re = re.compile('^(.*)\.list$') for dir in [shlibs_dir]: if not os.path.exists(dir): @@ -783,6 +781,8 @@ python package_do_shlibs() { for l in lines: shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) + bb.utils.unlockfile(lf) + assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True) if assumed_libs: for e in assumed_libs.split(): |