From c8dee9b92dfd545852ecac8dc2adfc95ac02e957 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Nov 2011 15:00:01 +0000 Subject: 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 --- meta/recipes-bsp/grub/grub_0.97.bb | 2 +- meta/recipes-bsp/grub/grub_1.99.bb | 2 +- meta/recipes-bsp/uboot/u-boot_2011.03.bb | 2 +- meta/recipes-bsp/uboot/u-boot_2011.06.bb | 2 +- meta/recipes-bsp/x-load/x-load_git.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/grub/grub_0.97.bb b/meta/recipes-bsp/grub/grub_0.97.bb index 0f297ff3ff..6ec66e3b0f 100644 --- a/meta/recipes-bsp/grub/grub_0.97.bb +++ b/meta/recipes-bsp/grub/grub_0.97.bb @@ -23,7 +23,7 @@ inherit autotools python __anonymous () { import re - host = bb.data.getVar('HOST_SYS', d, 1) + host = d.getVar('HOST_SYS', 1) if not re.match('i.86.*-linux', host): raise bb.parse.SkipPackage("incompatible with host %s" % host) } diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb index afd10f473f..b6aa827a5b 100644 --- a/meta/recipes-bsp/grub/grub_1.99.bb +++ b/meta/recipes-bsp/grub/grub_1.99.bb @@ -33,7 +33,7 @@ do_configure() { python __anonymous () { import re - host = bb.data.getVar('HOST_SYS', d, 1) + host = d.getVar('HOST_SYS', 1) if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', host): raise bb.parse.SkipPackage("incompatible with host %s" % host) } diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb b/meta/recipes-bsp/uboot/u-boot_2011.03.bb index 34655ead59..1ebdbeabca 100644 --- a/meta/recipes-bsp/uboot/u-boot_2011.03.bb +++ b/meta/recipes-bsp/uboot/u-boot_2011.03.bb @@ -10,7 +10,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}" +FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" # This revision corresponds to the tag "v2011.03" # We use the revision in order to avoid having to fetch it from the repo during parse diff --git a/meta/recipes-bsp/uboot/u-boot_2011.06.bb b/meta/recipes-bsp/uboot/u-boot_2011.06.bb index acd0944a8a..8ebdbff5ea 100644 --- a/meta/recipes-bsp/uboot/u-boot_2011.06.bb +++ b/meta/recipes-bsp/uboot/u-boot_2011.06.bb @@ -10,7 +10,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}" +FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" # This revision corresponds to the tag "v2011.06" # We use the revision in order to avoid having to fetch it from the repo during parse diff --git a/meta/recipes-bsp/x-load/x-load_git.bb b/meta/recipes-bsp/x-load/x-load_git.bb index 8114fd2389..87fc16f0a5 100644 --- a/meta/recipes-bsp/x-load/x-load_git.bb +++ b/meta/recipes-bsp/x-load/x-load_git.bb @@ -1,6 +1,6 @@ require x-load.inc -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}" +FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/x-load-git/${MACHINE}" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=25;md5=ef08d08cb99057bbb5b9d6d0c5a4396f" -- cgit v1.2.3-54-g00ecf