diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-18 15:14:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:57:25 +0100 |
commit | 86d30d756a60d181a95cf07041920a367a0cd0ba (patch) | |
tree | 950353e2e1cd1e7b812ff941b4d06076acd2c752 /meta/classes/populate_sdk_ext.bbclass | |
parent | f98c8490099a02c42306e1671579631a61c9df73 (diff) | |
download | poky-86d30d756a60d181a95cf07041920a367a0cd0ba.tar.gz |
meta: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False)
since at some point in the future, having the default of expansion would
be nice. This is the first step towards that.
This patch was mostly made using the command:
sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *`
(From OE-Core rev: ab7c1d239b122c8e549e8112c88fd46c9e2b061b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index dc2c58e2d1..8a80a563f0 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -98,7 +98,7 @@ python copy_buildsystem () { | |||
98 | f.write('# this configuration provides, it is strongly suggested that you set\n') | 98 | f.write('# this configuration provides, it is strongly suggested that you set\n') |
99 | f.write('# up a proper instance of the full build system and use that instead.\n\n') | 99 | f.write('# up a proper instance of the full build system and use that instead.\n\n') |
100 | 100 | ||
101 | f.write('LCONF_VERSION = "%s"\n\n' % d.getVar('LCONF_VERSION')) | 101 | f.write('LCONF_VERSION = "%s"\n\n' % d.getVar('LCONF_VERSION', False)) |
102 | f.write('BBPATH = "$' + '{TOPDIR}"\n') | 102 | f.write('BBPATH = "$' + '{TOPDIR}"\n') |
103 | f.write('SDKBASEMETAPATH = "$' + '{TOPDIR}"\n') | 103 | f.write('SDKBASEMETAPATH = "$' + '{TOPDIR}"\n') |
104 | f.write('BBLAYERS := " \\\n') | 104 | f.write('BBLAYERS := " \\\n') |
@@ -115,7 +115,7 @@ python copy_buildsystem () { | |||
115 | f.write('# up a proper instance of the full build system and use that instead.\n\n') | 115 | f.write('# up a proper instance of the full build system and use that instead.\n\n') |
116 | 116 | ||
117 | f.write('INHERIT += "%s"\n\n' % 'uninative') | 117 | f.write('INHERIT += "%s"\n\n' % 'uninative') |
118 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION')) | 118 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) |
119 | 119 | ||
120 | # This is a bit of a hack, but we really don't want these dependencies | 120 | # This is a bit of a hack, but we really don't want these dependencies |
121 | # (we're including them in the SDK as nativesdk- versions instead) | 121 | # (we're including them in the SDK as nativesdk- versions instead) |