summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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
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')
-rw-r--r--meta/recipes-core/busybox/busybox.inc10
-rw-r--r--meta/recipes-core/tasks/task-core-sdk.bb4
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc29
3 files changed, 18 insertions, 25 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 0b74ea6780..b948e2ce6b 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -81,17 +81,15 @@ python () {
81 if "${OE_DEL}": 81 if "${OE_DEL}":
82 d.setVar('configmangle_append', "${OE_DEL}" + "\n") 82 d.setVar('configmangle_append', "${OE_DEL}" + "\n")
83 if "${OE_FEATURES}": 83 if "${OE_FEATURES}":
84 bb.data.setVar('configmangle_append', 84 d.setVar('configmangle_append',
85 "/^### DISTRO FEATURES$/a\\\n%s\n\n" % 85 "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
86 ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n")))), 86 ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n")))))
87 d) 87 d.setVar('configmangle_append',
88 bb.data.setVar('configmangle_append',
89 "/^### CROSS$/a\\\n%s\n" % 88 "/^### CROSS$/a\\\n%s\n" %
90 ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"", 89 ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"",
91 "CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\"" 90 "CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\""
92 ]) 91 ])
93 ), 92 ))
94 d)
95} 93}
96 94
97do_prepare_config () { 95do_prepare_config () {
diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb
index a74de01b07..d940e39318 100644
--- a/meta/recipes-core/tasks/task-core-sdk.bb
+++ b/meta/recipes-core/tasks/task-core-sdk.bb
@@ -80,11 +80,11 @@ RDEPENDS_task-core-sdk = "\
80# rreclist.append('%s-dev' % name) 80# rreclist.append('%s-dev' % name)
81# 81#
82# oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg) or '' 82# oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg) or ''
83# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) 83# d.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist))
84# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS_%s' % newpkg))) 84# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS_%s' % newpkg)))
85# 85#
86# # bb.note('pkgs is %s' % pkgs) 86# # bb.note('pkgs is %s' % pkgs)
87# bb.data.setVar('PACKAGES', ' '.join(pkgs), d) 87# d.setVar('PACKAGES', ' '.join(pkgs))
88#} 88#}
89# 89#
90#PACKAGES_DYNAMIC = "task-core-sdk-*" 90#PACKAGES_DYNAMIC = "task-core-sdk-*"
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() {