From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 23 Aug 2010 14:41:21 +0000 (+0100)
Subject: package.bbclass: Fix shlibs race
X-Git-Tag: 2011-1~4776
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ca95d02ce0dd7e1ab8a6ed5efb5fc382df5b7a81;p=openembedded-core.git

package.bbclass: Fix shlibs race

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

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():