diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-03-24 15:18:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-25 09:55:36 +0000 |
commit | 169d67e282d80a242f5ba6efb9c9738f54a51eb4 (patch) | |
tree | aa5ef1463893ea3b63e43702431c30895d5cd9b4 /meta | |
parent | 5d8552e1b4378dbde8439b2b7eb20c882e166a62 (diff) | |
download | poky-169d67e282d80a242f5ba6efb9c9738f54a51eb4.tar.gz |
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].
(From OE-Core rev: a30a204270ee5b91d9c0904d3c3dda34bdb9ce1c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/binconfig.bbclass | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 848c74427b..7158c8c705 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass | |||
@@ -2,29 +2,29 @@ FILES_${PN}-dev += "${bindir}/*-config" | |||
2 | 2 | ||
3 | # The namespaces can clash here hence the two step replace | 3 | # The namespaces can clash here hence the two step replace |
4 | def get_binconfig_mangle(d): | 4 | def get_binconfig_mangle(d): |
5 | s = "-e ''" | 5 | s = "-e ''" |
6 | if not bb.data.inherits_class('native', d): | 6 | if not bb.data.inherits_class('native', d): |
7 | optional_quote = r"\(\"\?\)" | 7 | optional_quote = r"\(\"\?\)" |
8 | s += " -e 's:=%s${base_libdir}:=\\1OEBASELIBDIR:;'" % optional_quote | 8 | s += " -e 's:=%s${base_libdir}:=\\1OEBASELIBDIR:;'" % optional_quote |
9 | s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote | 9 | s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote |
10 | s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote | 10 | s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote |
11 | s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote | 11 | s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote |
12 | s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote | 12 | s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote |
13 | s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote | 13 | s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote |
14 | s += " -e 's:-L${libdir}:-LOELIBDIR:;'" | 14 | s += " -e 's:-L${libdir}:-LOELIBDIR:;'" |
15 | s += " -e 's:-I${includedir}:-IOEINCDIR:;'" | 15 | s += " -e 's:-I${includedir}:-IOEINCDIR:;'" |
16 | s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'" | 16 | s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'" |
17 | s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" | 17 | s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" |
18 | s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" | 18 | s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" |
19 | s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" | 19 | s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" |
20 | s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'" | 20 | s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'" |
21 | s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'" | 21 | s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'" |
22 | s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" | 22 | s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" |
23 | s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" | 23 | s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" |
24 | if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d): | 24 | if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d): |
25 | s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d) | 25 | s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d) |
26 | 26 | ||
27 | return s | 27 | return s |
28 | 28 | ||
29 | BINCONFIG_GLOB ?= "*-config" | 29 | BINCONFIG_GLOB ?= "*-config" |
30 | 30 | ||