summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/uclibc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-25 14:25:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-27 10:25:34 +0000
commit0a434ac10158e2011d41a1189e65e9474b1672be (patch)
tree6171516b25cb337343a6373e34aec0d061e4f5e8 /meta/recipes-core/uclibc
parent71fded5145454b144413057e11f78f718d947093 (diff)
downloadpoky-0a434ac10158e2011d41a1189e65e9474b1672be.tar.gz
getVar/setVar cleanups
Complete the bb.data.getVar/setVar replacements with accesses directly to the data store object. (From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/uclibc')
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc29
1 files changed, 12 insertions, 17 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 8438f25450..92157bdb2a 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -141,11 +141,10 @@ python () {
141 if "${OE_DEL}": 141 if "${OE_DEL}":
142 d.setVar('configmangle_append', "${OE_DEL}" + "\n") 142 d.setVar('configmangle_append', "${OE_DEL}" + "\n")
143 if "${OE_FEATURES}": 143 if "${OE_FEATURES}":
144 bb.data.setVar('configmangle_append', 144 d.setVar('configmangle_append',
145 "/^### DISTRO FEATURES$/a\\\n%s\n\n" % 145 "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
146 ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n")))), 146 ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n")))))
147 d) 147 d.setVar('configmangle_append',
148 bb.data.setVar('configmangle_append',
149 "/^### CROSS$/a\\\n%s\n" % 148 "/^### CROSS$/a\\\n%s\n" %
150 ("\\n".join(["CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"", 149 ("\\n".join(["CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"",
151 "UCLIBC_EXTRA_CFLAGS=\"${UCLIBC_EXTRA_CFLAGS}\"", 150 "UCLIBC_EXTRA_CFLAGS=\"${UCLIBC_EXTRA_CFLAGS}\"",
@@ -154,22 +153,18 @@ python () {
154 "DEVEL_PREFIX=\"/${prefix}\"", 153 "DEVEL_PREFIX=\"/${prefix}\"",
155 "SHARED_LIB_LOADER_PREFIX=\"/lib\"", 154 "SHARED_LIB_LOADER_PREFIX=\"/lib\"",
156 ]) 155 ])
157 ), 156 ))
158 d) 157 d.setVar('configmangle_append',
159 bb.data.setVar('configmangle_append',
160 "/^### TGT$/a\\\nTARGET_ARCH=\"%s\"\\nTARGET_%s=y\n" % 158 "/^### TGT$/a\\\nTARGET_ARCH=\"%s\"\\nTARGET_%s=y\n" %
161 ("${UCLIBC_ARCH}", "${UCLIBC_ARCH}"), 159 ("${UCLIBC_ARCH}", "${UCLIBC_ARCH}"))
162 d) 160 d.setVar('configmangle_append',
163 bb.data.setVar('configmangle_append', 161 "/^### FPU$/a\\\n%s\n\n" % (["UCLIBC_HAS_FPU=y","# UCLIBC_HAS_FPU is not set"][d.getVar('TARGET_FPU', True) in [ 'soft' ]]))
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}": 162 if "${UCLIBC_ENDIAN}":
166 bb.data.setVar('configmangle_append', 163 d.setVar('configmangle_append',
167 "/^### ABI$/a\\\nARCH_WANTS_%s_ENDIAN=y\n\n" % ("${UCLIBC_ENDIAN}"), 164 "/^### ABI$/a\\\nARCH_WANTS_%s_ENDIAN=y\n\n" % ("${UCLIBC_ENDIAN}"))
168 d)
169 if "${UCLIBC_ABI}": 165 if "${UCLIBC_ABI}":
170 bb.data.setVar('configmangle_append', 166 d.setVar('configmangle_append',
171 "/^### ABI$/a\\\nCONFIG_%s=y\n\n" % ("${UCLIBC_ABI}"), 167 "/^### ABI$/a\\\nCONFIG_%s=y\n\n" % ("${UCLIBC_ABI}"))
172 d)
173} 168}
174 169
175do_patch_append() { 170do_patch_append() {