diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/documentation/ref-manual/ref-features.xml | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
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>
Diffstat (limited to 'poky/documentation/ref-manual/ref-features.xml')
-rw-r--r-- | poky/documentation/ref-manual/ref-features.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/poky/documentation/ref-manual/ref-features.xml b/poky/documentation/ref-manual/ref-features.xml index 44ba67cf50..294b297c20 100644 --- a/poky/documentation/ref-manual/ref-features.xml +++ b/poky/documentation/ref-manual/ref-features.xml @@ -210,6 +210,12 @@ <listitem><para><emphasis>usbhost:</emphasis> Include USB Host support (allows to connect external keyboard, mouse, storage, network etc).</para></listitem> + <listitem><para><emphasis>usrmerge:</emphasis> Merges the + <filename>/bin</filename>, <filename>/sbin</filename>, + <filename>/lib</filename>, and <filename>/lib64</filename> + directories into their respective counterparts in the + <filename>/usr</filename> directory to provide better package + and application compatibility.</para></listitem> <listitem><para><emphasis>wayland:</emphasis> Include the Wayland display server protocol and the library that supports it.</para></listitem> |