summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.xml10
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml27
-rw-r--r--documentation/ref-manual/ref-variables.xml6
3 files changed, 19 insertions, 24 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 5c34bfdca9..8c0a344f5a 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -312,14 +312,14 @@
312 <para> 312 <para>
313 <literallayout class='monospaced'> 313 <literallayout class='monospaced'>
314 # We have a conf and classes directory, add to BBPATH 314 # We have a conf and classes directory, add to BBPATH
315 BBPATH := "${BBPATH}:${LAYERDIR}" 315 BBPATH .= ":${LAYERDIR}"
316 316
317 # We have a recipes directory, add to BBFILES 317 # We have recipes-* directories, add to BBFILES
318 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*.bb \ 318 BBFILES += "${LAYERDIR}/recipes-*/*.bb \
319 ${LAYERDIR}/recipes-*/*.bbappend" 319 ${LAYERDIR}/recipes-*/*.bbappend"
320 320
321 BBFILE_COLLECTIONS += "bsp" 321 BBFILE_COLLECTIONS += "bsp"
322 BBFILE_PATTERN_bsp := "^${LAYERDIR}/" 322 BBFILE_PATTERN_bsp = "^${LAYERDIR}/"
323 BBFILE_PRIORITY_bsp = "6" 323 BBFILE_PRIORITY_bsp = "6"
324 </literallayout> 324 </literallayout>
325 </para> 325 </para>
@@ -329,7 +329,7 @@
329 Bay <filename>conf/layer.conf</filename> file: 329 Bay <filename>conf/layer.conf</filename> file:
330 <literallayout class='monospaced'> 330 <literallayout class='monospaced'>
331 BBFILE_COLLECTIONS += "crownbay" 331 BBFILE_COLLECTIONS += "crownbay"
332 BBFILE_PATTERN_crownbay := "^${LAYERDIR}/" 332 BBFILE_PATTERN_crownbay = "^${LAYERDIR}/"
333 BBFILE_PRIORITY_crownbay = "6" 333 BBFILE_PRIORITY_crownbay = "6"
334 </literallayout> 334 </literallayout>
335 </para> 335 </para>
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 031d9fca37..629f64a427 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -106,14 +106,14 @@
106 required syntax: 106 required syntax:
107 <literallayout class='monospaced'> 107 <literallayout class='monospaced'>
108 # We have a conf and classes directory, add to BBPATH 108 # We have a conf and classes directory, add to BBPATH
109 BBPATH := "${BBPATH}:${LAYERDIR}" 109 BBPATH .= ":${LAYERDIR}"
110 110
111 # We have a packages directory, add to BBFILES 111 # We have recipes-* directories, add to BBFILES
112 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ 112 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
113 ${LAYERDIR}/recipes-*/*/*.bbappend" 113 ${LAYERDIR}/recipes-*/*/*.bbappend"
114 114
115 BBFILE_COLLECTIONS += "yoctobsp" 115 BBFILE_COLLECTIONS += "yoctobsp"
116 BBFILE_PATTERN_yoctobsp := "^${LAYERDIR}/" 116 BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/"
117 BBFILE_PRIORITY_yoctobsp = "5" 117 BBFILE_PRIORITY_yoctobsp = "5"
118 </literallayout></para> 118 </literallayout></para>
119 <para>Here is an explanation of the example: 119 <para>Here is an explanation of the example:
@@ -148,9 +148,9 @@
148 used to match files from 148 used to match files from
149 <filename>BBFILES</filename> into a particular 149 <filename>BBFILES</filename> into a particular
150 layer. 150 layer.
151 In this case, immediate expansion of 151 In this case,
152 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-LAYERDIR'>LAYERDIR</ulink></filename> 152 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-LAYERDIR'>LAYERDIR</ulink></filename>
153 sets <filename>BBFILE_PATTERN</filename> to the 153 is used to make <filename>BBFILE_PATTERN</filename> match within the
154 layer's path.</para></listitem> 154 layer's path.</para></listitem>
155 <listitem><para>The 155 <listitem><para>The
156 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-BBFILE_PRIORITY'>BBFILE_PRIORITY</ulink></filename> 156 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-BBFILE_PRIORITY'>BBFILE_PRIORITY</ulink></filename>
@@ -162,10 +162,7 @@
162 </itemizedlist></para> 162 </itemizedlist></para>
163 <para>Note the use of the 163 <para>Note the use of the
164 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-LAYERDIR'>LAYERDIR</ulink></filename> 164 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-LAYERDIR'>LAYERDIR</ulink></filename>
165 variable with the immediate expansion operator. 165 variable, which expands to the directory of the current layer.</para>
166 The <filename>LAYERDIR</filename> variable expands to the directory of the current layer and
167 requires the immediate expansion operator so that BitBake does not wait to expand the variable
168 when it's parsing a different directory.</para>
169 <para>Through the use of the <filename>BBPATH</filename> variable, 166 <para>Through the use of the <filename>BBPATH</filename> variable,
170 BitBake locates <filename>.bbclass</filename> files, configuration 167 BitBake locates <filename>.bbclass</filename> files, configuration
171 files, and files that are included with <filename>include</filename> 168 files, and files that are included with <filename>include</filename>
@@ -402,7 +399,7 @@
402 variable. 399 variable.
403 For example: 400 For example:
404 <literallayout class='monospaced'> 401 <literallayout class='monospaced'>
405 BBFILE_PRIORITY := "1" 402 BBFILE_PRIORITY_mylayer = "1"
406 </literallayout> 403 </literallayout>
407 </para> 404 </para>
408 405
@@ -1963,14 +1960,14 @@
1963 the <filename>layer.conf</filename> file as follows: 1960 the <filename>layer.conf</filename> file as follows:
1964 <literallayout class='monospaced'> 1961 <literallayout class='monospaced'>
1965 # We have a conf and classes directory, add to BBPATH 1962 # We have a conf and classes directory, add to BBPATH
1966 BBPATH := "${BBPATH}:${LAYERDIR}" 1963 BBPATH .= ":${LAYERDIR}"
1967 1964
1968 # We have a packages directory, add to BBFILES 1965 # We have recipes-* directories, add to BBFILES
1969 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ 1966 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
1970 ${LAYERDIR}/recipes-*/*/*.bbappend" 1967 ${LAYERDIR}/recipes-*/*/*.bbappend"
1971 1968
1972 BBFILE_COLLECTIONS += "mylayer" 1969 BBFILE_COLLECTIONS += "mylayer"
1973 BBFILE_PATTERN_mylayer := "^${LAYERDIR}/" 1970 BBFILE_PATTERN_mylayer = "^${LAYERDIR}/"
1974 BBFILE_PRIORITY_mylayer = "5" 1971 BBFILE_PRIORITY_mylayer = "5"
1975 </literallayout> 1972 </literallayout>
1976 Notice <filename>mylayer</filename> as part of the last three 1973 Notice <filename>mylayer</filename> as part of the last three
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index acb1446386..258b13efde 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -1869,10 +1869,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
1869 <glossdef> 1869 <glossdef>
1870 <para>When used inside the <filename>layer.conf</filename> configuration 1870 <para>When used inside the <filename>layer.conf</filename> configuration
1871 file, this variable provides the path of the current layer. 1871 file, this variable provides the path of the current layer.
1872 This variable requires immediate expansion 1872 This variable is not available outside of <filename>layer.conf</filename>
1873 (see the BitBake manual) as lazy expansion can result in 1873 and references are expanded immediately when parsing of the file completes.</para>
1874 the expansion happening in the wrong directory and therefore
1875 giving the wrong value.</para>
1876 </glossdef> 1874 </glossdef>
1877 </glossentry> 1875 </glossentry>
1878 1876