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:29 (GMT)
commit820b835e3cbfefb1ed11faca95a67ef6f5475fb1 (patch)
treea6a003f93dcedafa2388bf616d728f789306385f
parent6ffa1514040f98e6584c8040074e32ef73c528db (diff)
downloadpoky-820b835e3cbfefb1ed11faca95a67ef6f5475fb1.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: b29c0c44253c05b0853bfe4feabc210e67fc30c7) 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 eaf840d..a20518b 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -6734,26 +6734,29 @@
6734 </para> 6734 </para>
6735 6735
6736 <para> 6736 <para>
6737 If a committed change results in changing the package output, 6737 If a committed change results in changing the package
6738 then the value of the PR variable needs to be increased 6738 output, then the value of the PR variable needs to be
6739 (or "bumped") as part of that commit. 6739 increased (or "bumped") as part of that commit.
6740 For new recipes you should add the <filename>PR</filename> 6740 For new recipes you should add the <filename>PR</filename>
6741 variable and set its initial value equal to "r0", which is the default. 6741 variable and set its initial value equal to "r0", which is
6742 Even though the default value is "r0", the practice of adding it to a new recipe makes 6742 the default.
6743 it harder to forget to bump the variable when you make changes 6743 Even though the default value is "r0", the practice of
6744 to the recipe in future. 6744 adding it to a new recipe makes it harder to forget to bump
6745 the variable when you make changes to the recipe in future.
6745 </para> 6746 </para>
6746 6747
6747 <para> 6748 <para>
6748 If you are sharing a common <filename>.inc</filename> file with multiple recipes, 6749 If you are sharing a common <filename>.inc</filename> file
6749 you can also use the 6750 with multiple recipes, you can also use the
6750 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-INC_PR'>INC_PR</ulink></filename> 6751 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-INC_PR'>INC_PR</ulink></filename>
6751 variable to ensure that 6752 variable to ensure that the recipes sharing the
6752 the recipes sharing the <filename>.inc</filename> file are rebuilt when the 6753 <filename>.inc</filename> file are rebuilt when the
6753 <filename>.inc</filename> file itself is changed. 6754 <filename>.inc</filename> file itself is changed.
6754 The <filename>.inc</filename> file must set <filename>INC_PR</filename> 6755 The <filename>.inc</filename> file must set
6755 (initially to "r0"), and all recipes referring to it should set <filename>PR</filename> 6756 <filename>INC_PR</filename> (initially to "r0"), and all
6756 to "$(INC_PR).0" initially, incrementing the last number when the recipe is changed. 6757 recipes referring to it should set <filename>PR</filename>
6758 to "${INC_PR}.0" initially, incrementing the last number
6759 when the recipe is changed.
6757 If the <filename>.inc</filename> file is changed then its 6760 If the <filename>.inc</filename> file is changed then its
6758 <filename>INC_PR</filename> should be incremented. 6761 <filename>INC_PR</filename> should be incremented.
6759 </para> 6762 </para>
@@ -6762,14 +6765,14 @@
6762 When upgrading the version of a package, assuming the 6765 When upgrading the version of a package, assuming the
6763 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PV'>PV</ulink></filename> 6766 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PV'>PV</ulink></filename>
6764 changes, the <filename>PR</filename> variable should be 6767 changes, the <filename>PR</filename> variable should be
6765 reset to "r0" (or "$(INC_PR).0" if you are using 6768 reset to "r0" (or "${INC_PR}.0" if you are using
6766 <filename>INC_PR</filename>). 6769 <filename>INC_PR</filename>).
6767 </para> 6770 </para>
6768 6771
6769 <para> 6772 <para>
6770 Usually, version increases occur only to packages. 6773 Usually, version increases occur only to packages.
6771 However, if for some reason <filename>PV</filename> changes but does not 6774 However, if for some reason <filename>PV</filename> changes
6772 increase, you can increase the 6775 but does not increase, you can increase the
6773 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PE'>PE</ulink></filename> 6776 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PE'>PE</ulink></filename>
6774 variable (Package Epoch). 6777 variable (Package Epoch).
6775 The <filename>PE</filename> variable defaults to "0". 6778 The <filename>PE</filename> variable defaults to "0".
@@ -6779,7 +6782,8 @@
6779 Version numbering strives to follow the 6782 Version numbering strives to follow the
6780 <ulink url='http://www.debian.org/doc/debian-policy/ch-controlfields.html'> 6783 <ulink url='http://www.debian.org/doc/debian-policy/ch-controlfields.html'>
6781 Debian Version Field Policy Guidelines</ulink>. 6784 Debian Version Field Policy Guidelines</ulink>.
6782 These guidelines define how versions are compared and what "increasing" a version means. 6785 These guidelines define how versions are compared and what
6786 "increasing" a version means.
6783 </para> 6787 </para>
6784 </section> 6788 </section>
6785 </section> 6789 </section>