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-kernel | |
| parent | 5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff) | |
| download | ast2050-yocto-poky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.zip ast2050-yocto-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-kernel')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-dtb.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_2.6.34.bb | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc index eb89456..7ec7584 100644 --- a/meta/recipes-kernel/linux/linux-dtb.inc +++ b/meta/recipes-kernel/linux/linux-dtb.inc @@ -5,12 +5,12 @@ KERNEL_DEVICETREE_FLAGS = "-R 8 -p 0x3000" python __anonymous () { import bb - devicetree = bb.data.getVar("KERNEL_DEVICETREE", d, 1) or '' + devicetree = d.getVar("KERNEL_DEVICETREE", 1) or '' if devicetree: - depends = bb.data.getVar("DEPENDS", d, 1) - bb.data.setVar("DEPENDS", "%s dtc-native" % depends, d) - packages = bb.data.getVar("PACKAGES", d, 1) - bb.data.setVar("PACKAGES", "%s kernel-devicetree" % packages, d) + depends = d.getVar("DEPENDS", 1) + d.setVar("DEPENDS", "%s dtc-native" % depends) + packages = d.getVar("PACKAGES", 1) + d.setVar("PACKAGES", "%s kernel-devicetree" % packages) } do_install_append() { diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb index d92a902..2642325 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb @@ -27,7 +27,7 @@ python __anonymous () { import bb, re, string kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") - bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) + d.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype) } SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta" diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb index 4891463..cbcfa56 100644 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb @@ -33,7 +33,7 @@ python __anonymous () { import bb, re, string kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") - bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) + d.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype) } SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta" |
