meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/poky/documentation/ref-manual/ref-terms.xml b/poky/documentation/ref-manual/ref-terms.xml
index f985468..722fa7e 100644
--- a/poky/documentation/ref-manual/ref-terms.xml
+++ b/poky/documentation/ref-manual/ref-terms.xml
@@ -41,11 +41,13 @@
That append file would match any
<filename>busybox_1.21.</filename><replaceable>x</replaceable><filename>.bb</filename>
version of the recipe.
- So, the append file would match the following recipe names:
+ So, the append file would match any of the following recipe names:
<literallayout class='monospaced'>
busybox_1.21.1.bb
busybox_1.21.2.bb
busybox_1.21.3.bb
+ busybox_1.21.10.bb
+ busybox_1.21.25.bb
</literallayout>
<note><title>Important</title>
The use of the "<filename>%</filename>" character
@@ -115,7 +117,7 @@
in your home directory within the existing
directory <filename>mybuilds</filename>:
<literallayout class='monospaced'>
- $cd $HOME
+ $ cd $HOME
$ source $HOME/poky/&OE_INIT_FILE; $HOME/mybuilds/YP-&POKYVERSION;
</literallayout>
</para></listitem>
@@ -141,7 +143,7 @@
The system used to build images in a Yocto Project
Development environment.
The build system is sometimes referred to as the
- development host.
+ <firstterm>development host</firstterm>.
</para></listitem>
<listitem><para>
<emphasis>Classes:</emphasis>
@@ -393,7 +395,7 @@
Poky is not a product level distro.
Rather, it is a good starting point for customization.
<note>
- Poky began an open-source
+ Poky began as an open-source
project initially developed by OpenedHand.
OpenedHand developed Poky from the existing
OpenEmbedded build system to create a commercially