summaryrefslogtreecommitdiffstats
path: root/bitbake/doc/bitbake-user-manual
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:57:53 +0100
commit69b69193411849de71cf7c81735c3239e28a2940 (patch)
tree054081264a49c9aa3002bc358ab0c4d7b7239015 /bitbake/doc/bitbake-user-manual
parent86d30d756a60d181a95cf07041920a367a0cd0ba (diff)
downloadpoky-69b69193411849de71cf7c81735c3239e28a2940.tar.gz
bitbake: bitbake: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` (Bitbake rev: 659ef95c9b8aced3c4ded81c48bcc0fbde4d429f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/doc/bitbake-user-manual')
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml4
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml2
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml6
3 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
index 17a74591ac..fa52e29898 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
@@ -287,8 +287,8 @@
287 <link linkend='var-PN'><filename>PN</filename></link> and 287 <link linkend='var-PN'><filename>PN</filename></link> and
288 <link linkend='var-PV'><filename>PV</filename></link>: 288 <link linkend='var-PV'><filename>PV</filename></link>:
289 <literallayout class='monospaced'> 289 <literallayout class='monospaced'>
290 PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}" 290 PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}"
291 PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}" 291 PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}"
292 </literallayout> 292 </literallayout>
293 In this example, a recipe called "something_1.2.3.bb" would set 293 In this example, a recipe called "something_1.2.3.bb" would set
294 <filename>PN</filename> to "something" and 294 <filename>PN</filename> to "something" and
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
index 2fb58e413e..b37b2ae42c 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
@@ -628,7 +628,7 @@
628 <literallayout class='monospaced'> 628 <literallayout class='monospaced'>
629 SRC_URI = "ccrc://cc.example.org/ccrc;vob=/example_vob;module=/example_module" 629 SRC_URI = "ccrc://cc.example.org/ccrc;vob=/example_vob;module=/example_module"
630 SRCREV = "EXAMPLE_CLEARCASE_TAG" 630 SRCREV = "EXAMPLE_CLEARCASE_TAG"
631 PV = "${@d.getVar("SRCREV").replace("/", "+")}" 631 PV = "${@d.getVar("SRCREV", False).replace("/", "+")}"
632 </literallayout> 632 </literallayout>
633 The fetcher uses the <filename>rcleartool</filename> or 633 The fetcher uses the <filename>rcleartool</filename> or
634 <filename>cleartool</filename> remote client, depending on 634 <filename>cleartool</filename> remote client, depending on
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
index fbffade348..1b9d800108 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
@@ -327,8 +327,8 @@
327 The following lines select the values of a package name 327 The following lines select the values of a package name
328 and its version number, respectively: 328 and its version number, respectively:
329 <literallayout class='monospaced'> 329 <literallayout class='monospaced'>
330 PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}" 330 PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}"
331 PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}" 331 PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}"
332 </literallayout> 332 </literallayout>
333 </para> 333 </para>
334 </section> 334 </section>
@@ -1163,7 +1163,7 @@
1163 <para> 1163 <para>
1164 The <filename>BB_ORIGENV</filename> variable returns a datastore 1164 The <filename>BB_ORIGENV</filename> variable returns a datastore
1165 object that can be queried using the standard datastore operators 1165 object that can be queried using the standard datastore operators
1166 such as <filename>getVar()</filename>. 1166 such as <filename>getVar(, False)</filename>.
1167 The datastore object is useful, for example, to find the original 1167 The datastore object is useful, for example, to find the original
1168 <filename>DISPLAY</filename> variable. 1168 <filename>DISPLAY</filename> variable.
1169 Here is an example: 1169 Here is an example: