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 | |
parent | 203bf3f772f1ab1691a786e13d63cdbbc4dd458f (diff) | |
download | poky-ca95d02ce0dd7e1ab8a6ed5efb5fc382df5b7a81.tar.gz |
package.bbclass: Fix shlibs race
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-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() { | |||
761 | postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True) | 761 | postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True) |
762 | bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) | 762 | bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) |
763 | 763 | ||
764 | bb.utils.unlockfile(lf) | ||
765 | |||
766 | list_re = re.compile('^(.*)\.list$') | 764 | list_re = re.compile('^(.*)\.list$') |
767 | for dir in [shlibs_dir]: | 765 | for dir in [shlibs_dir]: |
768 | if not os.path.exists(dir): | 766 | if not os.path.exists(dir): |
@@ -783,6 +781,8 @@ python package_do_shlibs() { | |||
783 | for l in lines: | 781 | for l in lines: |
784 | shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) | 782 | shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) |
785 | 783 | ||
784 | bb.utils.unlockfile(lf) | ||
785 | |||
786 | assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True) | 786 | assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True) |
787 | if assumed_libs: | 787 | if assumed_libs: |
788 | for e in assumed_libs.split(): | 788 | for e in assumed_libs.split(): |