From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 7 Dec 2018 00:05:26 +0000 (+0000)
Subject: bitbake.conf: Cleanup deprecated function usage
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~15928
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeb189ac8bc6625ec936fd69f18974ebde758946;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake.conf: Cleanup deprecated function usage

This function was moved in bitbake a long time ago, use the
preferred version to avoid a Deprecation warning.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index dcf20078831..64800623545 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -199,9 +199,9 @@ ASSUME_PROVIDED = "\
 # Package default variables.
 ##################################################################
 
-PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}"
-PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}"
-PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}"
+PN = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}"
+PV = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}"
+PR = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}"
 PE = ""
 PF = "${PN}-${EXTENDPE}${PV}-${PR}"
 EXTENDPE = "${@['','${PE}_'][int(d.getVar('PE') or 0) > 0]}"