diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-09 15:00:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:35:32 +0000 |
commit | b22831fd63164c4db9c0b72934d7d734a6585251 (patch) | |
tree | edb6581a041190290855bf86714430515c9f235a /meta/recipes-core/eglibc/eglibc-options.inc | |
parent | 07ded02ffd37b4fe60a6210dbf56490ea306f0b6 (diff) | |
download | openembedded-core-contrib-b22831fd63164c4db9c0b72934d7d734a6585251.tar.gz |
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:
sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-options.inc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-options.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc index 112029dab8..baf4f4b06c 100644 --- a/meta/recipes-core/eglibc/eglibc-options.inc +++ b/meta/recipes-core/eglibc/eglibc-options.inc @@ -83,7 +83,7 @@ def distro_features_check_deps(distro_features): # Map distro features to eglibc options settings def features_to_eglibc_settings(d): cnf = ([]) - distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split() + distro_features = (d.getVar('DISTRO_FEATURES', True) or '').split() distro_features_check_deps(distro_features) @@ -128,8 +128,8 @@ def features_to_eglibc_settings(d): # try to fix disable charsets/locales/locale-code compile fail if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features: - bb.data.setVar('PACKAGE_NO_GCONV', '0', d) + d.setVar('PACKAGE_NO_GCONV', '0') else: - bb.data.setVar('PACKAGE_NO_GCONV', '1', d) + d.setVar('PACKAGE_NO_GCONV', '1') return "\n".join(cnf) |