summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 15:00:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:51:19 +0000
commitc8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch)
tree5f1b86954646a0f3bb914407994388a6a4346769 /meta/recipes-support
parent5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff)
downloadpoky-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-support')
-rw-r--r--meta/recipes-support/attr/ea-acl.inc4
-rw-r--r--meta/recipes-support/boost/boost-36.inc10
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index ce98a95cdb..1fda792b77 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -34,8 +34,8 @@ FILES_lib${BPN}-doc = "${mandir}/man2 \
34 34
35BBCLASSEXTEND = "native" 35BBCLASSEXTEND = "native"
36# Only append ldflags for target recipe and if USE_NLS is enabled 36# Only append ldflags for target recipe and if USE_NLS is enabled
37LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}" 37LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'yes')]}"
38EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}" 38EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'no')]}"
39 39
40fix_symlink () { 40fix_symlink () {
41 if test "${libdir}" = "${base_libdir}" ; then 41 if test "${libdir}" = "${base_libdir}" ; then
diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc
index bb267d791c..8b0622f6ba 100644
--- a/meta/recipes-support/boost/boost-36.inc
+++ b/meta/recipes-support/boost/boost-36.inc
@@ -11,8 +11,8 @@ LICENSE = "Boost"
11PR = "r4" 11PR = "r4"
12 12
13ARM_INSTRUCTION_SET = "arm" 13ARM_INSTRUCTION_SET = "arm"
14BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" 14BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
15BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" 15BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
16BOOST_P = "boost_${BOOST_VER}" 16BOOST_P = "boost_${BOOST_VER}"
17 17
18BOOST_LIBS = "\ 18BOOST_LIBS = "\
@@ -46,12 +46,12 @@ python __anonymous () {
46 46
47 packages = [] 47 packages = []
48 extras = [] 48 extras = []
49 for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): 49 for lib in d.getVar('BOOST_LIBS', 1).split( ):
50 pkg = "boost-%s" % lib.replace("_", "-") 50 pkg = "boost-%s" % lib.replace("_", "-")
51 extras.append("--with-%s" % lib) 51 extras.append("--with-%s" % lib)
52 packages.append(pkg) 52 packages.append(pkg)
53 if not bb.data.getVar("FILES_%s" % pkg, d, 1): 53 if not d.getVar("FILES_%s" % pkg, 1):
54 bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib, d) 54 d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib)
55 bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) 55 bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d)
56 bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) 56 bb.data.setVar("BJAM_EXTRA", " ".join(extras), d)
57} 57}