From 6a39835af2b2b3c7797fe05479341d71a3f3aaf6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Sep 2013 08:52:40 +0100 Subject: meta: Don't use deprecated bitbake API These have been deprecated for a long time, convert the remaining references to the correct modules and prepare for removal of the compatibility support from bitbake. Signed-off-by: Richard Purdie --- meta/recipes-devtools/automake/automake.inc | 2 +- meta/recipes-devtools/gcc/gcc-multilib-config.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc index ae743cc58a..507c062e4a 100644 --- a/meta/recipes-devtools/automake/automake.inc +++ b/meta/recipes-devtools/automake/automake.inc @@ -13,6 +13,6 @@ do_configure() { oe_runconf } -export AUTOMAKE = "${@bb.which('automake', d.getVar('PATH', True))}" +export AUTOMAKE = "${@bb.utils.which('automake', d.getVar('PATH', True))}" FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index f89aa8ea7f..005aa6b814 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc @@ -34,7 +34,7 @@ python gcc_multilib_setup() { rel_path = os.path.relpath(fn, src_conf_dir) parent_dir = os.path.dirname(rel_path) bb.utils.mkdirhier('%s/%s' % (build_conf_dir, parent_dir)) - bb.copyfile(fn, '%s/%s' % (build_conf_dir, rel_path)) + bb.utils.copyfile(fn, '%s/%s' % (build_conf_dir, rel_path)) multilibs = (d.getVar('MULTILIB_VARIANTS', True) or '').split() if not multilibs: -- cgit 1.2.3-korg