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/uclibc/uclibc.inc | |
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/uclibc/uclibc.inc')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 222c34f383..8438f25450 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc | |||
@@ -125,9 +125,9 @@ configmangle = '/^KERNEL_HEADERS/d; \ | |||
125 | /^SHARED_LIB_LOADER_PREFIX/d; \ | 125 | /^SHARED_LIB_LOADER_PREFIX/d; \ |
126 | /^UCLIBC_EXTRA_CFLAGS/d; \ | 126 | /^UCLIBC_EXTRA_CFLAGS/d; \ |
127 | s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \ | 127 | s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \ |
128 | ${@["","s,.*COMPILE_IN_THUMB_MODE.*,COMPILE_IN_THUMB_MODE=y,;"][bb.data.getVar("ARM_INSTRUCTION_SET", d, 1) != "arm"]} \ | 128 | ${@["","s,.*COMPILE_IN_THUMB_MODE.*,COMPILE_IN_THUMB_MODE=y,;"][d.getVar("ARM_INSTRUCTION_SET", 1) != "arm"]} \ |
129 | ${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \ | 129 | ${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][d.getVar("USE_NLS", 1) == "yes"]} \ |
130 | ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]} \ | 130 | ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][d.getVar("TARGET_ARCH", 1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]} \ |
131 | /^CROSS/d; \ | 131 | /^CROSS/d; \ |
132 | /^TARGET_ARCH=/d; \ | 132 | /^TARGET_ARCH=/d; \ |
133 | /^TARGET_/s,^\([^=]*\).*,# \1 is not set,g; \ | 133 | /^TARGET_/s,^\([^=]*\).*,# \1 is not set,g; \ |
@@ -139,7 +139,7 @@ OE_FEATURES := "${@features_to_uclibc_conf(d)}" | |||
139 | OE_DEL := "${@features_to_uclibc_del(d)}" | 139 | OE_DEL := "${@features_to_uclibc_del(d)}" |
140 | python () { | 140 | python () { |
141 | if "${OE_DEL}": | 141 | if "${OE_DEL}": |
142 | bb.data.setVar('configmangle_append', "${OE_DEL}" + "\n", d) | 142 | d.setVar('configmangle_append', "${OE_DEL}" + "\n") |
143 | if "${OE_FEATURES}": | 143 | if "${OE_FEATURES}": |
144 | bb.data.setVar('configmangle_append', | 144 | bb.data.setVar('configmangle_append', |
145 | "/^### DISTRO FEATURES$/a\\\n%s\n\n" % | 145 | "/^### DISTRO FEATURES$/a\\\n%s\n\n" % |
@@ -161,7 +161,7 @@ python () { | |||
161 | ("${UCLIBC_ARCH}", "${UCLIBC_ARCH}"), | 161 | ("${UCLIBC_ARCH}", "${UCLIBC_ARCH}"), |
162 | d) | 162 | d) |
163 | bb.data.setVar('configmangle_append', | 163 | bb.data.setVar('configmangle_append', |
164 | "/^### FPU$/a\\\n%s\n\n" % (["UCLIBC_HAS_FPU=y","# UCLIBC_HAS_FPU is not set"][bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]]), d) | 164 | "/^### FPU$/a\\\n%s\n\n" % (["UCLIBC_HAS_FPU=y","# UCLIBC_HAS_FPU is not set"][d.getVar('TARGET_FPU', 1) in [ 'soft' ]]), d) |
165 | if "${UCLIBC_ENDIAN}": | 165 | if "${UCLIBC_ENDIAN}": |
166 | bb.data.setVar('configmangle_append', | 166 | bb.data.setVar('configmangle_append', |
167 | "/^### ABI$/a\\\nARCH_WANTS_%s_ENDIAN=y\n\n" % ("${UCLIBC_ENDIAN}"), | 167 | "/^### ABI$/a\\\nARCH_WANTS_%s_ENDIAN=y\n\n" % ("${UCLIBC_ENDIAN}"), |