[oe-commits] org.oe.dev binconfig.bbclass: Fix path rewriting for staged packages.

[pfalcon commit]

binconfig.bbclass: Fix path rewriting for staged packages.
* This bbclass does path rewriting within *-config scripts for packages 
being staged. However, it used to expect variable assignments in form foo=bar, 
whereas some packages (e.g. libpng) have foo="bar". Fixed to understand both 
formats.
* Note: I consider this fix a workaround, as it uses overquoted regexps passed
via command line. Instead, whole rewriting should be reimplemented in Python.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: de34b2edcff91126ab8efe054f15964ad639fc4e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=de34b2edcff91126ab8efe054f15964ad639fc4e
Files:
1
classes/binconfig.bbclass
Diffs:

#
# mt diff -r539d974b2217fb30c8b1d400aa8a8c1820a9c2e9 -rde34b2edcff91126ab8efe054f15964ad639fc4e
#
# 
# 
# patch "classes/binconfig.bbclass"
#  from [1a5eb9029fda4b2e3126727ac113eb6995ed5ead]
#    to [7fef4241e7aff369e878642422b6a42fdb44bc24]
# 
============================================================
--- classes/binconfig.bbclass	1a5eb9029fda4b2e3126727ac113eb6995ed5ead
+++ classes/binconfig.bbclass	7fef4241e7aff369e878642422b6a42fdb44bc24
@@ -5,11 +5,12 @@ def get_binconfig_mangle(d):
 	import bb.data
 	s = "-e ''"
 	if not bb.data.inherits_class('native', d):
-		s += " -e 's:=${libdir}:=OELIBDIR:;'"
-		s += " -e 's:=${includedir}:=OEINCDIR:;'"
-		s += " -e 's:=${datadir}:=OEDATADIR:'"
-		s += " -e 's:=${prefix}:=OEPREFIX:'"
-		s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'"
+		optional_quote = r"\(\"\?\)"
+		s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
+		s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
+		s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
+		s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote
+		s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote
 		s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
 		s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
 		s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"