summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-11-09 17:22:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-16 10:38:24 (GMT)
commit3bf928a3b6354bc09c87fcbf9e3972c8d368aaa3 (patch)
tree346be8341109edf075ee5b06319298deda2a65be
parent0742e8a43bdde176f9ba4e11bc9208f29d6c34ec (diff)
downloadpoky-3bf928a3b6354bc09c87fcbf9e3972c8d368aaa3.tar.gz
dev-manual: Fixed typo for "${INC_PR}.0"
The string appeared in the text as "$(INC_PR).0". So, fixed it to be proper with the curly braces. (From yocto-docs rev: 5fa1691503fdf82476616a4ebb13c47d92deb03e) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml40
1 files changed, 22 insertions, 18 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index e9032cd..1efb6dc 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -7160,26 +7160,29 @@
7160 </para> 7160 </para>
7161 7161
7162 <para> 7162 <para>
7163 If a committed change results in changing the package output, 7163 If a committed change results in changing the package
7164 then the value of the PR variable needs to be increased 7164 output, then the value of the PR variable needs to be
7165 (or "bumped") as part of that commit. 7165 increased (or "bumped") as part of that commit.
7166 For new recipes you should add the <filename>PR</filename> 7166 For new recipes you should add the <filename>PR</filename>
7167 variable and set its initial value equal to "r0", which is the default. 7167 variable and set its initial value equal to "r0", which is
7168 Even though the default value is "r0", the practice of adding it to a new recipe makes 7168 the default.
7169 it harder to forget to bump the variable when you make changes 7169 Even though the default value is "r0", the practice of
7170 to the recipe in future. 7170 adding it to a new recipe makes it harder to forget to bump
7171 the variable when you make changes to the recipe in future.
7171 </para> 7172 </para>
7172 7173
7173 <para> 7174 <para>
7174 If you are sharing a common <filename>.inc</filename> file with multiple recipes, 7175 If you are sharing a common <filename>.inc</filename> file
7175 you can also use the 7176 with multiple recipes, you can also use the
7176 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-INC_PR'>INC_PR</ulink></filename> 7177 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-INC_PR'>INC_PR</ulink></filename>
7177 variable to ensure that 7178 variable to ensure that the recipes sharing the
7178 the recipes sharing the <filename>.inc</filename> file are rebuilt when the 7179 <filename>.inc</filename> file are rebuilt when the
7179 <filename>.inc</filename> file itself is changed. 7180 <filename>.inc</filename> file itself is changed.
7180 The <filename>.inc</filename> file must set <filename>INC_PR</filename> 7181 The <filename>.inc</filename> file must set
7181 (initially to "r0"), and all recipes referring to it should set <filename>PR</filename> 7182 <filename>INC_PR</filename> (initially to "r0"), and all
7182 to "$(INC_PR).0" initially, incrementing the last number when the recipe is changed. 7183 recipes referring to it should set <filename>PR</filename>
7184 to "${INC_PR}.0" initially, incrementing the last number
7185 when the recipe is changed.
7183 If the <filename>.inc</filename> file is changed then its 7186 If the <filename>.inc</filename> file is changed then its
7184 <filename>INC_PR</filename> should be incremented. 7187 <filename>INC_PR</filename> should be incremented.
7185 </para> 7188 </para>
@@ -7188,14 +7191,14 @@
7188 When upgrading the version of a package, assuming the 7191 When upgrading the version of a package, assuming the
7189 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PV'>PV</ulink></filename> 7192 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PV'>PV</ulink></filename>
7190 changes, the <filename>PR</filename> variable should be 7193 changes, the <filename>PR</filename> variable should be
7191 reset to "r0" (or "$(INC_PR).0" if you are using 7194 reset to "r0" (or "${INC_PR}.0" if you are using
7192 <filename>INC_PR</filename>). 7195 <filename>INC_PR</filename>).
7193 </para> 7196 </para>
7194 7197
7195 <para> 7198 <para>
7196 Usually, version increases occur only to packages. 7199 Usually, version increases occur only to packages.
7197 However, if for some reason <filename>PV</filename> changes but does not 7200 However, if for some reason <filename>PV</filename> changes
7198 increase, you can increase the 7201 but does not increase, you can increase the
7199 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PE'>PE</ulink></filename> 7202 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PE'>PE</ulink></filename>
7200 variable (Package Epoch). 7203 variable (Package Epoch).
7201 The <filename>PE</filename> variable defaults to "0". 7204 The <filename>PE</filename> variable defaults to "0".
@@ -7205,7 +7208,8 @@
7205 Version numbering strives to follow the 7208 Version numbering strives to follow the
7206 <ulink url='http://www.debian.org/doc/debian-policy/ch-controlfields.html'> 7209 <ulink url='http://www.debian.org/doc/debian-policy/ch-controlfields.html'>
7207 Debian Version Field Policy Guidelines</ulink>. 7210 Debian Version Field Policy Guidelines</ulink>.
7208 These guidelines define how versions are compared and what "increasing" a version means. 7211 These guidelines define how versions are compared and what
7212 "increasing" a version means.
7209 </para> 7213 </para>
7210 </section> 7214 </section>
7211 </section> 7215 </section>