From 065dab7480ea0fae66db4b5a01d09814b1f38e03 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 11:21:22 +0000 Subject: meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx) sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie --- meta/recipes-core/base-passwd/base-passwd_3.5.22.bb | 4 ++-- meta/recipes-core/busybox/busybox.inc | 2 +- meta/recipes-core/ncurses/ncurses.inc | 4 ++-- meta/recipes-core/uclibc/uclibc.inc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb index 92ad0d9776..ae3864c0a6 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb @@ -63,10 +63,10 @@ python populate_packages_prepend() { # time before the files from the package may be available, hence # storing the data from the files in the preinst directly. - f = open(bb.data.expand("${STAGING_DATADIR}/base-passwd/passwd.master", d), 'r') + f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') passwd = "".join(f.readlines()) f.close() - f = open(bb.data.expand("${STAGING_DATADIR}/base-passwd/group.master", d), 'r') + f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') group = "".join(f.readlines()) f.close() diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 7aa131cf69..ec76ad2902 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -82,7 +82,7 @@ python () { if "${OE_FEATURES}": d.setVar('configmangle_append', "/^### DISTRO FEATURES$/a\\\n%s\n\n" % - ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n"))))) + ("\\n".join((d.expand("${OE_FEATURES}").split("\n"))))) d.setVar('configmangle_append', "/^### CROSS$/a\\\n%s\n" % ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"", diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 43303b7196..3b10c4329e 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -178,8 +178,8 @@ do_install() { } python populate_packages_prepend () { - base_libdir = bb.data.expand("${base_libdir}", d) - pnbase = bb.data.expand("${PN}-lib%s", d) + base_libdir = d.expand("${base_libdir}") + pnbase = d.expand("${PN}-lib%s") do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) } diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 69d8921e3e..78010db25f 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc @@ -142,7 +142,7 @@ python () { if "${OE_FEATURES}": d.setVar('configmangle_append', "/^### DISTRO FEATURES$/a\\\n%s\n\n" % - ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n"))))) + ("\\n".join((d.expand("${OE_FEATURES}").split("\n"))))) d.setVar('configmangle_append', "/^### CROSS$/a\\\n%s\n" % ("\\n".join(["CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"", -- cgit 1.2.3-korg