diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-09-14 13:41:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-14 23:16:42 +0100 |
commit | f3961107e29bf854ea85dbba41f400c7e5dfc81c (patch) | |
tree | 1375224dcbe9517ce2d4e1e29d20c1b7b2fdbf20 /bitbake | |
parent | bf47addb34debc049b59e5e466228f00045c2061 (diff) | |
download | poky-f3961107e29bf854ea85dbba41f400c7e5dfc81c.tar.gz |
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 <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
3 files changed, 5 insertions, 5 deletions
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 | |||
208 | are used to set the variables :term:`PN` and | 208 | are used to set the variables :term:`PN` and |
209 | :term:`PV`:: | 209 | :term:`PV`:: |
210 | 210 | ||
211 | PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" | 211 | PN = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" |
212 | PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}" | 212 | PV = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}" |
213 | 213 | ||
214 | In this example, a recipe called "something_1.2.3.bb" would set | 214 | In this example, a recipe called "something_1.2.3.bb" would set |
215 | :term:`PN` to "something" and :term:`PV` to "1.2.3". | 215 | :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. | |||
216 | use some editor to create the ``bitbake.conf`` so that it contains | 216 | use some editor to create the ``bitbake.conf`` so that it contains |
217 | the following:: | 217 | the following:: |
218 | 218 | ||
219 | PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" | 219 | PN = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" |
220 | 220 | ||
221 | TMPDIR = "${TOPDIR}/tmp" | 221 | TMPDIR = "${TOPDIR}/tmp" |
222 | CACHE = "${TMPDIR}/cache" | 222 | 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 | |||
413 | lines select the values of a package name and its version number, | 413 | lines select the values of a package name and its version number, |
414 | respectively:: | 414 | respectively:: |
415 | 415 | ||
416 | PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" | 416 | PN = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" |
417 | PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}" | 417 | PV = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}" |
418 | 418 | ||
419 | .. note:: | 419 | .. note:: |
420 | 420 | ||