summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-04-16 08:54:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 22:34:16 +0100
commitcedb4ce2d86f55791325e5b4a8e30f97710ce75e (patch)
treecd5807f99dd144e8b6830a2200532ada0cad1d6c
parentbf64daa2ab88f40bcc9aace2098cd49cbce850d1 (diff)
downloadpoky-cedb4ce2d86f55791325e5b4a8e30f97710ce75e.tar.gz
ref-manual: Changes to the migration section
Paul gave this a review and we found some issues. Slight changes. (From yocto-docs rev: 1e64fe277a6daaf484e56c3e9117fd72bb107614) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/ref-manual/migration.xml17
-rw-r--r--documentation/ref-manual/ref-variables.xml8
2 files changed, 17 insertions, 8 deletions
diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml
index e1faea0fa9..69f0f8d3a2 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -314,6 +314,10 @@
314 <link linkend='var-MACHINEOVERRIDES'><filename>MACHINEOVERRIDES</filename></link> 314 <link linkend='var-MACHINEOVERRIDES'><filename>MACHINEOVERRIDES</filename></link>
315 or <link linkend='var-DISTROOVERRIDES'><filename>DISTROOVERRIDES</filename></link> 315 or <link linkend='var-DISTROOVERRIDES'><filename>DISTROOVERRIDES</filename></link>
316 variables, as appropriate. 316 variables, as appropriate.
317 For more changes regarding the
318 <filename>SRC_URI</filename> variable, see the
319 "<link linkend='migration-1.4-variables'>Variables</link>"
320 section.
317 </para></listitem> 321 </para></listitem>
318 </itemizedlist> 322 </itemizedlist>
319 </para> 323 </para>
@@ -367,16 +371,21 @@
367 <listitem><para><emphasis><filename>SRC_URI</filename>:</emphasis> 371 <listitem><para><emphasis><filename>SRC_URI</filename>:</emphasis>
368 The <filename>${</filename><link linkend='var-PN'><filename>PN</filename></link><filename>}</filename>, 372 The <filename>${</filename><link linkend='var-PN'><filename>PN</filename></link><filename>}</filename>,
369 <filename>${</filename><link linkend='var-PF'><filename>PF</filename></link><filename>}</filename>, 373 <filename>${</filename><link linkend='var-PF'><filename>PF</filename></link><filename>}</filename>,
370 and <filename>${</filename><link linkend='var-P'><filename>P</filename></link><filename>}</filename> 374 <filename>${</filename><link linkend='var-P'><filename>P</filename></link><filename>}</filename>,
371 directories have been dropped from the default value of the 375 and <filename>FILE_DIRNAME</filename> directories have been
376 dropped from the default value of the
372 <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link> 377 <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>
373 variable, which is used as the search path for finding files 378 variable, which is used as the search path for finding files
374 referred to in 379 referred to in
375 <link linkend='var-SRC_URI'><filename>SRC_URI</filename></link>. 380 <link linkend='var-SRC_URI'><filename>SRC_URI</filename></link>.
376 If you have a recipe that relied upon these directories, 381 If you have a recipe that relied upon these directories,
377 which would be unusual, then you will need to add the 382 which would be unusual, then you will need to add the
378 appropriate paths to 383 appropriate paths within the recipe or, alternatively,
379 <link linkend='var-FILESEXTRAPATHS'><filename>FILESEXTRAPATHS</filename></link>. 384 rearrange the files.
385 The most common locations are still covered by
386 <filename>${BP}</filename>, <filename>${BPN}</filename>,
387 and "files", which all remain in the default value of
388 <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>.
380 </para></listitem> 389 </para></listitem>
381 </itemizedlist> 390 </itemizedlist>
382 </para> 391 </para>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index b5f04cbf6c..e4bcb56aed 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -3395,10 +3395,10 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
3395 <filename>${<link linkend='var-BPN'>BPN</link>}-${PV}</filename>. 3395 <filename>${<link linkend='var-BPN'>BPN</link>}-${PV}</filename>.
3396 The base recipe name and version but without any special 3396 The base recipe name and version but without any special
3397 package name suffix.</para></listitem> 3397 package name suffix.</para></listitem>
3398 <listitem><para><emphasis>Files -</emphasis> Files beneath the directory in which the recipe 3398 <listitem><para><emphasis>files -</emphasis> Files within a
3399 resides.</para></listitem> 3399 directory, which is named <filename>files</filename>
3400 <listitem><para><emphasis>Directory -</emphasis> The directory itself in which the recipe 3400 and is also alongside the recipe.
3401 resides.</para></listitem> 3401 </para></listitem>
3402 </itemizedlist></para></listitem> 3402 </itemizedlist></para></listitem>
3403 <listitem><para><emphasis><filename>bzr://</filename> -</emphasis> Fetches files from a 3403 <listitem><para><emphasis><filename>bzr://</filename> -</emphasis> Fetches files from a
3404 Bazaar revision control repository.</para></listitem> 3404 Bazaar revision control repository.</para></listitem>