summaryrefslogtreecommitdiffstats
path: root/meta/classes/gconf.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 15:00:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:51:19 (GMT)
commitc8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch)
tree5f1b86954646a0f3bb914407994388a6a4346769 /meta/classes/gconf.bbclass
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/classes/gconf.bbclass')
-rw-r--r--meta/classes/gconf.bbclass16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index 6798678..bffc92e 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -27,8 +27,8 @@ done
27 27
28python populate_packages_append () { 28python populate_packages_append () {
29 import re 29 import re
30 packages = bb.data.getVar('PACKAGES', d, 1).split() 30 packages = d.getVar('PACKAGES', 1).split()
31 pkgdest = bb.data.getVar('PKGDEST', d, 1) 31 pkgdest = d.getVar('PKGDEST', 1)
32 32
33 for pkg in packages: 33 for pkg in packages:
34 schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) 34 schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg)
@@ -41,15 +41,15 @@ python populate_packages_append () {
41 if schemas != []: 41 if schemas != []:
42 bb.note("adding gconf postinst and prerm scripts to %s" % pkg) 42 bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
43 bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d) 43 bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d)
44 postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) 44 postinst = d.getVar('pkg_postinst_%s' % pkg, 1) or d.getVar('pkg_postinst', 1)
45 if not postinst: 45 if not postinst:
46 postinst = '#!/bin/sh\n' 46 postinst = '#!/bin/sh\n'
47 postinst += bb.data.getVar('gconf_postinst', d, 1) 47 postinst += d.getVar('gconf_postinst', 1)
48 bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) 48 d.setVar('pkg_postinst_%s' % pkg, postinst)
49 prerm = bb.data.getVar('pkg_prerm_%s' % pkg, d, 1) or bb.data.getVar('pkg_prerm', d, 1) 49 prerm = d.getVar('pkg_prerm_%s' % pkg, 1) or d.getVar('pkg_prerm', 1)
50 if not prerm: 50 if not prerm:
51 prerm = '#!/bin/sh\n' 51 prerm = '#!/bin/sh\n'
52 prerm += bb.data.getVar('gconf_prerm', d, 1) 52 prerm += d.getVar('gconf_prerm', 1)
53 bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d) 53 d.setVar('pkg_prerm_%s' % pkg, prerm)
54 54
55} 55}