From f3961107e29bf854ea85dbba41f400c7e5dfc81c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 14 Sep 2021 13:41:03 +0200 Subject: bitbake: bitbake.conf: fix vars_from_file() call The reference to this function was dropped from BBHandler.py in: https://git.openembedded.org/bitbake/commit/?id=aaa5292ef96ea27f505bc5c5a4b1eb4f497ed061 (Bitbake rev: b4fe8507079b6464287549f3eac1f1fc8d0d9be2) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst | 4 ++-- bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.rst | 2 +- bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'bitbake/doc/bitbake-user-manual') diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst index 6153f36a0f..a4b1efbe8b 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst @@ -208,8 +208,8 @@ metadata. For example, in ``bitbake.conf`` the recipe name and version are used to set the variables :term:`PN` and :term:`PV`:: - 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'}" + 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'}" In this example, a recipe called "something_1.2.3.bb" would set :term:`PN` to "something" and :term:`PV` to "1.2.3". diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.rst index c5a4ce60bf..83a415d994 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.rst @@ -216,7 +216,7 @@ Following is the complete "Hello World" example. use some editor to create the ``bitbake.conf`` so that it contains the following:: - PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" + PN = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache" diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst index ff60381f5c..119720d527 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst @@ -413,8 +413,8 @@ variables from BitBake's internal data dictionary, ``d``. The following lines select the values of a package name and its version number, respectively:: - 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'}" + 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'}" .. note:: -- cgit v1.2.3-54-g00ecf