package.bbclass: Update locking now that pstaging is always on.

In a few functions we checked if pstagingactive was set and if so, grabbed
the lock.  But really, we should always be locking here.  And inside of
package_do_shlibs we need to keep the lock a little longer than we had
been otherwise we can run into a race..

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 7 insertions, 17 deletions

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 2769595bf9..39fbe5cfcb 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -542,9 +542,7 @@ python emit_pkgdata() {
 	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 	pkgdatadir = bb.data.getVar('PKGDATA_DIR', d, True)
 
-	pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
-	if pstageactive == "1":
-		lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+	lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
 
 	data_file = pkgdatadir + bb.data.expand("/${PN}" , d)
 	f = open(data_file, 'w')
@@ -592,8 +590,7 @@ python emit_pkgdata() {
 			packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg
 			file(packagedfile, 'w').close()
 			package_stagefile(packagedfile, d)
-	if pstageactive == "1":
-		bb.utils.unlockfile(lf)
+	bb.utils.unlockfile(lf)
 }
 emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
 
@@ -633,10 +630,6 @@ python package_do_shlibs() {
 	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
 	bb.mkdirhier(shlibs_dir)
 
-	pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
-	if pstageactive == "1":
-		lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
-
 	if bb.data.getVar('PACKAGE_SNAP_LIB_SYMLINKS', d, True) == "1":
 		snap_symlinks = True
 	else:
@@ -649,6 +642,8 @@ python package_do_shlibs() {
 
 	needed = {}
 	private_libs = bb.data.getVar('PRIVATE_LIBS', d, True)
+
+	lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
 	for pkg in packages.split():
 		needs_ldconfig = False
 		bb.debug(2, "calculating shlib provides for %s" % pkg)
@@ -714,9 +709,6 @@ python package_do_shlibs() {
 			postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True)
 			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
-	if pstageactive == "1":
-		bb.utils.unlockfile(lf)
-
 	shlib_provider = {}
 	list_re = re.compile('^(.*)\.list$')
 	for dir in [shlibs_dir]: 
@@ -737,6 +729,7 @@ python package_do_shlibs() {
 					fd.close()
 				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:
@@ -830,9 +823,7 @@ python package_do_pkgconfig () {
 							if hdr == 'Requires':
 								pkgconfig_needed[pkg] += exp.replace(',', ' ').split()
 
-	pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
-	if pstageactive == "1":
-		lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+	lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
 
 	for pkg in packages.split():
 		pkgs_file = os.path.join(shlibs_dir, pkg + ".pclist")
@@ -880,8 +871,7 @@ python package_do_pkgconfig () {
 			fd.close()
 			package_stagefile(deps_file, d)
 
-	if pstageactive == "1":
-		bb.utils.unlockfile(lf)
+	bb.utils.unlockfile(lf)
 }
 
 python read_shlibdeps () {