]> code.ossystems Code Review - openembedded-core.git/commitdiff
package.bbclass: Fix shlibs race
authorRichard Purdie <rpurdie@linux.intel.com>
Mon, 23 Aug 2010 14:41:21 +0000 (15:41 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Mon, 23 Aug 2010 14:41:21 +0000 (15:41 +0100)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/classes/package.bbclass

index 04ea9e384fb6d1d4d25bd974ea1acefcf291317d..8d22d0fa8fe2f6de20ae943d2cb10354655d482c 100644 (file)
@@ -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():