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:51:19 +0000 |
commit | c8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch) | |
tree | 5f1b86954646a0f3bb914407994388a6a4346769 /meta/recipes-core/eglibc | |
parent | 5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff) | |
download | poky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.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 *`
(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-options.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.14.bb | 4 |
4 files changed, 9 insertions, 9 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): | |||
83 | # Map distro features to eglibc options settings | 83 | # Map distro features to eglibc options settings |
84 | def features_to_eglibc_settings(d): | 84 | def features_to_eglibc_settings(d): |
85 | cnf = ([]) | 85 | cnf = ([]) |
86 | distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split() | 86 | distro_features = (d.getVar('DISTRO_FEATURES', True) or '').split() |
87 | 87 | ||
88 | distro_features_check_deps(distro_features) | 88 | distro_features_check_deps(distro_features) |
89 | 89 | ||
@@ -128,8 +128,8 @@ def features_to_eglibc_settings(d): | |||
128 | 128 | ||
129 | # try to fix disable charsets/locales/locale-code compile fail | 129 | # try to fix disable charsets/locales/locale-code compile fail |
130 | if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features: | 130 | if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features: |
131 | bb.data.setVar('PACKAGE_NO_GCONV', '0', d) | 131 | d.setVar('PACKAGE_NO_GCONV', '0') |
132 | else: | 132 | else: |
133 | bb.data.setVar('PACKAGE_NO_GCONV', '1', d) | 133 | d.setVar('PACKAGE_NO_GCONV', '1') |
134 | 134 | ||
135 | return "\n".join(cnf) | 135 | return "\n".join(cnf) |
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 519a49c75f..020f55876b 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
@@ -8,10 +8,10 @@ | |||
8 | 8 | ||
9 | python __anonymous () { | 9 | python __anonymous () { |
10 | import bb, re | 10 | import bb, re |
11 | uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) | 11 | uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS', 1)) != None) |
12 | if uc_os: | 12 | if uc_os: |
13 | raise bb.parse.SkipPackage("incompatible with target %s" % | 13 | raise bb.parse.SkipPackage("incompatible with target %s" % |
14 | bb.data.getVar('TARGET_OS', d, 1)) | 14 | d.getVar('TARGET_OS', 1)) |
15 | } | 15 | } |
16 | 16 | ||
17 | # Set this to zero if you don't want ldconfig in the output package | 17 | # Set this to zero if you don't want ldconfig in the output package |
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index fc8ac64a1c..f076ae7c7f 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb | |||
@@ -53,10 +53,10 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIR | |||
53 | 53 | ||
54 | python __anonymous () { | 54 | python __anonymous () { |
55 | import bb, re | 55 | import bb, re |
56 | uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) | 56 | uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', 1)) != None) |
57 | if uc_os: | 57 | if uc_os: |
58 | raise bb.parse.SkipPackage("incompatible with target %s" % | 58 | raise bb.parse.SkipPackage("incompatible with target %s" % |
59 | bb.data.getVar('TARGET_OS', d, 1)) | 59 | d.getVar('TARGET_OS', 1)) |
60 | } | 60 | } |
61 | 61 | ||
62 | export libc_cv_slibdir = "${base_libdir}" | 62 | export libc_cv_slibdir = "${base_libdir}" |
diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.14.bb index 571d39d26e..501987525e 100644 --- a/meta/recipes-core/eglibc/eglibc_2.14.bb +++ b/meta/recipes-core/eglibc/eglibc_2.14.bb | |||
@@ -54,10 +54,10 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIR | |||
54 | 54 | ||
55 | python __anonymous () { | 55 | python __anonymous () { |
56 | import bb, re | 56 | import bb, re |
57 | uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) | 57 | uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', 1)) != None) |
58 | if uc_os: | 58 | if uc_os: |
59 | raise bb.parse.SkipPackage("incompatible with target %s" % | 59 | raise bb.parse.SkipPackage("incompatible with target %s" % |
60 | bb.data.getVar('TARGET_OS', d, 1)) | 60 | d.getVar('TARGET_OS', 1)) |
61 | } | 61 | } |
62 | 62 | ||
63 | export libc_cv_slibdir = "${base_libdir}" | 63 | export libc_cv_slibdir = "${base_libdir}" |