diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-28 13:49:59 +0000 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-28 14:32:06 +0000 |
commit | 3a30c562385cb3d9cd1b3043f6fe677a22024018 (patch) | |
tree | 66dc67f338ba316c25ca672950ef334e9e357386 /meta-oe/classes | |
parent | d66c9a8b625f7b19f7b17e728dc82413399c2e19 (diff) | |
download | meta-openembedded-3a30c562385cb3d9cd1b3043f6fe677a22024018.tar.gz |
Replace bb.data.* with d.*
Used sed expression given here:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012373.html
Plus an additional expression for .expand. Full expression is:
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' \
-e 's:bb.data.\(expand([^,]*\), \([^ )]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`
Some minor correction in systemd.bbclass was needed for some expressions
that didn't quite match the regex in the desired way; additionally a few
instances were manually changed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r-- | meta-oe/classes/gitpkgv.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 238b0d2ea..165ba1e8d 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass | |||
@@ -51,14 +51,14 @@ def get_git_pkgv(d, use_tags): | |||
51 | import os | 51 | import os |
52 | import bb | 52 | import bb |
53 | 53 | ||
54 | src_uri = bb.data.getVar('SRC_URI', d, 1).split() | 54 | src_uri = d.getVar('SRC_URI', 1).split() |
55 | fetcher = bb.fetch2.Fetch(src_uri, d) | 55 | fetcher = bb.fetch2.Fetch(src_uri, d) |
56 | ud = fetcher.ud | 56 | ud = fetcher.ud |
57 | 57 | ||
58 | # | 58 | # |
59 | # If SRCREV_FORMAT is set respect it for tags | 59 | # If SRCREV_FORMAT is set respect it for tags |
60 | # | 60 | # |
61 | format = bb.data.getVar('SRCREV_FORMAT', d, True) | 61 | format = d.getVar('SRCREV_FORMAT', True) |
62 | if not format: | 62 | if not format: |
63 | format = 'default' | 63 | format = 'default' |
64 | 64 | ||