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-extended | |
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-extended')
-rw-r--r-- | meta/recipes-extended/cups/cups14.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/lsof/lsof_4.85.bb | 6 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/zip/zip.inc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index 48f493d6c7..8c01caf55e 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups14.inc | |||
@@ -58,7 +58,7 @@ fakeroot do_install () { | |||
58 | 58 | ||
59 | python do_package_append() { | 59 | python do_package_append() { |
60 | # Change permissions back the way they were, they probably had a reason... | 60 | # Change permissions back the way they were, they probably had a reason... |
61 | workdir = bb.data.getVar('WORKDIR', d, 1) | 61 | workdir = d.getVar('WORKDIR', 1) |
62 | os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) | 62 | os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) |
63 | } | 63 | } |
64 | 64 | ||
diff --git a/meta/recipes-extended/lsof/lsof_4.85.bb b/meta/recipes-extended/lsof/lsof_4.85.bb index 96bc0c54bc..8f25e24a50 100644 --- a/meta/recipes-extended/lsof/lsof_4.85.bb +++ b/meta/recipes-extended/lsof/lsof_4.85.bb | |||
@@ -17,10 +17,10 @@ LIC_FILES_CHKSUM = "file://${S}/00README;beginline=645;endline=679;md5=e0108f781 | |||
17 | 17 | ||
18 | python do_unpack () { | 18 | python do_unpack () { |
19 | bb.build.exec_func('base_do_unpack', d) | 19 | bb.build.exec_func('base_do_unpack', d) |
20 | src_uri = bb.data.getVar('SRC_URI', d) | 20 | src_uri = d.getVar('SRC_URI') |
21 | bb.data.setVar('SRC_URI', '${LOCALSRC}', d) | 21 | d.setVar('SRC_URI', '${LOCALSRC}') |
22 | bb.build.exec_func('base_do_unpack', d) | 22 | bb.build.exec_func('base_do_unpack', d) |
23 | bb.data.setVar('SRC_URI', src_uri, d) | 23 | d.setVar('SRC_URI', src_uri) |
24 | } | 24 | } |
25 | 25 | ||
26 | export LSOF_OS = "${TARGET_OS}" | 26 | export LSOF_OS = "${TARGET_OS}" |
diff --git a/meta/recipes-extended/pam/libpam_1.1.4.bb b/meta/recipes-extended/pam/libpam_1.1.4.bb index 868bffd960..afe17cc932 100644 --- a/meta/recipes-extended/pam/libpam_1.1.4.bb +++ b/meta/recipes-extended/pam/libpam_1.1.4.bb | |||
@@ -54,10 +54,10 @@ python populate_packages_prepend () { | |||
54 | 54 | ||
55 | def pam_plugin_append_file(pn, dir, file): | 55 | def pam_plugin_append_file(pn, dir, file): |
56 | nf = os.path.join(dir, file) | 56 | nf = os.path.join(dir, file) |
57 | of = bb.data.getVar('FILES_' + pn, d, True) | 57 | of = d.getVar('FILES_' + pn, True) |
58 | if of: | 58 | if of: |
59 | nf = of + " " + nf | 59 | nf = of + " " + nf |
60 | bb.data.setVar('FILES_' + pn, nf, d) | 60 | d.setVar('FILES_' + pn, nf) |
61 | 61 | ||
62 | dvar = bb.data.expand('${WORKDIR}/package', d, True) | 62 | dvar = bb.data.expand('${WORKDIR}/package', d, True) |
63 | pam_libdir = bb.data.expand('${base_libdir}/security', d) | 63 | pam_libdir = bb.data.expand('${base_libdir}/security', d) |
diff --git a/meta/recipes-extended/zip/zip.inc b/meta/recipes-extended/zip/zip.inc index 9550447264..8cce146b18 100644 --- a/meta/recipes-extended/zip/zip.inc +++ b/meta/recipes-extended/zip/zip.inc | |||
@@ -5,7 +5,7 @@ SECTION = "console/utils" | |||
5 | LICENSE = "Info-ZIP" | 5 | LICENSE = "Info-ZIP" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d" |
7 | 7 | ||
8 | SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tgz" | 8 | SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@d.getVar('PV',1).replace('.', '')}.tgz" |
9 | 9 | ||
10 | EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ | 10 | EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ |
11 | 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ | 11 | 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ |