[oe-commits] Paul Eggleton : classes/binconfig: fix indentation in python function
git at git.openembedded.org
git at git.openembedded.org
Tue Mar 25 09:47:56 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: a30a204270ee5b91d9c0904d3c3dda34bdb9ce1c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a30a204270ee5b91d9c0904d3c3dda34bdb9ce1c
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Mon Mar 24 15:18:52 2014 +0000
classes/binconfig: fix indentation in python function
If we don't fix this, the recently added dependency from
do_populate_sysroot on functions in SYSROOT_PREPROCESS_FUNCS in
staging.bbclass triggers warnings that the get_binconfig_mangle
function contains tabs for all recipes that inherit binconfig.
Related to fix for [YOCTO #5852].
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/binconfig.bbclass | 44 +++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 848c744..7158c8c 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -2,29 +2,29 @@ FILES_${PN}-dev += "${bindir}/*-config"
# The namespaces can clash here hence the two step replace
def get_binconfig_mangle(d):
- s = "-e ''"
- if not bb.data.inherits_class('native', d):
- optional_quote = r"\(\"\?\)"
- s += " -e 's:=%s${base_libdir}:=\\1OEBASELIBDIR:;'" % optional_quote
- 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:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
- s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
- s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
- s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
- s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
- s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
- s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
- s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
- if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
- s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
+ s = "-e ''"
+ if not bb.data.inherits_class('native', d):
+ optional_quote = r"\(\"\?\)"
+ s += " -e 's:=%s${base_libdir}:=\\1OEBASELIBDIR:;'" % optional_quote
+ 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:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
+ s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
+ s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
+ s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
+ s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
+ s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
+ s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
+ s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
+ if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
+ s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
- return s
+ return s
BINCONFIG_GLOB ?= "*-config"
More information about the Openembedded-commits
mailing list