summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-09-14 06:01:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 15:27:34 +0100
commit7d208c1c77dbf079b66a28076174a08951b27549 (patch)
tree658e17c34f36103aab86c192140f527b455bd8b9 /documentation/ref-manual
parentaba386b92cb1bd926a69f703587b133363374dee (diff)
downloadpoky-7d208c1c77dbf079b66a28076174a08951b27549.tar.gz
ref-manual: Applied review edits to auto added runtime deps
Fixes [YOCTO #10248] Applied some review changes. Minor wording tweaks and typo fixes. (From yocto-docs rev: a9e99c8b44c48c74448487187cebfe8df331e9e1) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual')
-rw-r--r--documentation/ref-manual/ref-variables.xml11
-rw-r--r--documentation/ref-manual/technical-details.xml20
2 files changed, 16 insertions, 15 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index a10a0dca75..a97369dfad 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -10493,10 +10493,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
10493 the 10493 the
10494 <link linkend='ref-tasks-package_write_deb'><filename>do_package_write_*</filename></link> 10494 <link linkend='ref-tasks-package_write_deb'><filename>do_package_write_*</filename></link>
10495 tasks. 10495 tasks.
10496 Exactly how this is done depends on the package format used 10496 Exactly how this is done depends on which package format
10497 as described in the 10497 is used, which is determined by
10498 <link linkend='var-PACKAGE_CLASSES'><filename>PACKAGE_CLASSES</filename></link> 10498 <link linkend='var-PACKAGE_CLASSES'><filename>PACKAGE_CLASSES</filename></link>.
10499 variable.
10500 When the corresponding package manager installs the 10499 When the corresponding package manager installs the
10501 package, it will know to also install the packages on 10500 package, it will know to also install the packages on
10502 which it depends. 10501 which it depends.
@@ -10509,9 +10508,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
10509 dependency to be added. 10508 dependency to be added.
10510 This dependency is from the recipe's 10509 This dependency is from the recipe's
10511 <link linkend='ref-tasks-build'><filename>do_build</filename></link> 10510 <link linkend='ref-tasks-build'><filename>do_build</filename></link>
10512 (not to be confused with the 10511 (not to be confused with
10513 <link linkend='ref-tasks-compile'><filename>do_compile</filename></link>) 10512 <link linkend='ref-tasks-compile'><filename>do_compile</filename></link>)
10514 task to the to the <filename>do_package_write_*</filename> 10513 task to the <filename>do_package_write_*</filename>
10515 task of the recipes that build <filename>bar</filename> and 10514 task of the recipes that build <filename>bar</filename> and
10516 <filename>baz</filename>. 10515 <filename>baz</filename>.
10517 </para> 10516 </para>
diff --git a/documentation/ref-manual/technical-details.xml b/documentation/ref-manual/technical-details.xml
index e5c8eb83b6..558af87d91 100644
--- a/documentation/ref-manual/technical-details.xml
+++ b/documentation/ref-manual/technical-details.xml
@@ -1022,15 +1022,17 @@
1022 the package that depends on the shared library to the package 1022 the package that depends on the shared library to the package
1023 that contains the library.</para> 1023 that contains the library.</para>
1024 1024
1025 <para>If the library being linked against is versioned 1025 <para>The automatically added runtime dependency also includes
1026 (i.e. includes a version number), then the automatically added 1026 a version restriction.
1027 runtime dependency will specify at least that version, as if 1027 This version restriction specifies that at least the current
1028 version of the package that provides the shared library must be
1029 used, as if
1028 "<replaceable>package</replaceable> (>= <replaceable>version</replaceable>)" 1030 "<replaceable>package</replaceable> (>= <replaceable>version</replaceable>)"
1029 had been added to 1031 had been added to
1030 <link linkend='var-RDEPENDS'><filename>RDEPENDS</filename></link>. 1032 <link linkend='var-RDEPENDS'><filename>RDEPENDS</filename></link>.
1031 This dependency forces an upgrade of the package that provides 1033 This forces an upgrade of the package containing the shared
1032 the shared library when installing the package that depends on 1034 library when installing the package that depends on the
1033 the library, if needed.</para> 1035 library, if needed.</para>
1034 1036
1035 <para>If you want to avoid a package being registered as 1037 <para>If you want to avoid a package being registered as
1036 providing a particular shared library (e.g. because the library 1038 providing a particular shared library (e.g. because the library
@@ -1054,8 +1056,8 @@
1054 task.</para> 1056 task.</para>
1055 1057
1056 <para>Simultaneously, all pkg-config modules installed by the 1058 <para>Simultaneously, all pkg-config modules installed by the
1057 recipe are inspected to see what other modules on which the 1059 recipe are inspected to see what other pkg-config modules they
1058 pkg-config modules depend. 1060 depend on.
1059 A module is seen as depending on another module if it contains 1061 A module is seen as depending on another module if it contains
1060 a "Requires:" line that specifies the other module. 1062 a "Requires:" line that specifies the other module.
1061 For each module dependency, 1063 For each module dependency,
@@ -1078,7 +1080,7 @@
1078 task of each recipe in 1080 task of each recipe in
1079 <link linkend='var-DEPENDS'><filename>DEPENDS</filename></link> 1081 <link linkend='var-DEPENDS'><filename>DEPENDS</filename></link>
1080 through use of a 1082 through use of a
1081 <ulink url='&YOCTO_DOCS_BB_URL;#variable-flags'><filename>[vardeps]</filename></ulink> 1083 <filename>[</filename><ulink url='&YOCTO_DOCS_BB_URL;#variable-flags'><filename>deptask</filename></ulink><filename>]</filename>
1082 declaration, which guarantees that the required 1084 declaration, which guarantees that the required
1083 shared-library/module-to-package mapping information will be available 1085 shared-library/module-to-package mapping information will be available
1084 when needed as long as <filename>DEPENDS</filename> has been 1086 when needed as long as <filename>DEPENDS</filename> has been