[oe-commits] org.oe.dev base.bbclass: Merge some minor fixes/optimisations/cleanups from Poky

[rpurdie commit]

base.bbclass: Merge some minor fixes/optimisations/cleanups from Poky

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 8562d4dc68676b8d6dba7bff5b7551ea90af2a0a
ViewMTN: http://monotone.openembedded.org/revision/info/8562d4dc68676b8d6dba7bff5b7551ea90af2a0a
Files:
1
classes/base.bbclass
Diffs:

#
# mt diff -r73fcb901305a5da0ea4157fd569f9d4740a22183 -r8562d4dc68676b8d6dba7bff5b7551ea90af2a0a
#
#
#
# patch "classes/base.bbclass"
#  from [87dd03979cb29f273e7a4b617c08482a5f141bea]
#    to [66c3e24f49a03affea849e95b7d93a3bbf7ae4f5]
#
============================================================
--- classes/base.bbclass	87dd03979cb29f273e7a4b617c08482a5f141bea
+++ classes/base.bbclass	66c3e24f49a03affea849e95b7d93a3bbf7ae4f5
@@ -160,9 +160,9 @@ def base_set_filespath(path, d):
 def base_set_filespath(path, d):
 	import os, bb
 	filespath = []
+	# The ":" ensures we have an 'empty' override
+	overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
 	for p in path:
-		overrides = bb.data.getVar("OVERRIDES", d, 1) or ""
-		overrides = overrides + ":"
 		for o in overrides.split(":"):
 			filespath.append(os.path.join(p, o))
 	return ":".join(filespath)
@@ -325,7 +325,7 @@ oe_libinstall() {
 			__runcmd rm -f $destpath/$libname.la
 			__runcmd sed -e 's/^installed=yes$/installed=no/' \
 				     -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
-				     -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \
+				     -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
 				     $dotlai >$destpath/$libname.la
 		else
 			__runcmd install -m 0644 $dotlai $destpath/$libname.la
@@ -848,7 +848,7 @@ def read_subpkgdata(pkg, d):
 	return os.access(get_subpkgedata_fn(pkg, d), os.R_OK)
 
 def read_subpkgdata(pkg, d):
-	import bb, os
+	import bb
 	return read_pkgdatafile(get_subpkgedata_fn(pkg, d))
 
 def has_pkgdata(pn, d):
@@ -857,7 +857,7 @@ def read_pkgdata(pn, d):
 	return os.access(fn, os.R_OK)
 
 def read_pkgdata(pn, d):
-	import bb, os
+	import bb
 	fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
 	return read_pkgdatafile(fn)