summaryrefslogtreecommitdiffstats
path: root/external/poky/documentation/ref-manual/ref-features.xml
diff options
context:
space:
mode:
Diffstat (limited to 'external/poky/documentation/ref-manual/ref-features.xml')
-rw-r--r--external/poky/documentation/ref-manual/ref-features.xml34
1 files changed, 6 insertions, 28 deletions
diff --git a/external/poky/documentation/ref-manual/ref-features.xml b/external/poky/documentation/ref-manual/ref-features.xml
index cb74df6d..294b297c 100644
--- a/external/poky/documentation/ref-manual/ref-features.xml
+++ b/external/poky/documentation/ref-manual/ref-features.xml
@@ -76,8 +76,6 @@
</para></listitem>
<listitem><para><emphasis>ext2:</emphasis> Hardware HDD or Microdrive
</para></listitem>
- <listitem><para><emphasis>irda:</emphasis> Hardware has IrDA support
- </para></listitem>
<listitem><para><emphasis>keyboard:</emphasis> Hardware has a keyboard
</para></listitem>
<listitem><para><emphasis>pcbios:</emphasis> Support for booting through BIOS
@@ -156,27 +154,6 @@
</para></listitem>
<listitem><para><emphasis>bluetooth:</emphasis> Include
bluetooth support (integrated BT only).</para></listitem>
- <listitem><para><emphasis>bluez5:</emphasis> Include
- BlueZ Version 5, which provides core Bluetooth layers and
- protocols support.
- <note>
- The default value for the
- <filename>DISTRO FEATURES</filename> variable includes
- "bluetooth", which causes bluez5 to be backfilled in
- for bluetooth support.
- If you do not want bluez5 backfilled and would rather
- use bluez4, you need to use the
- <link linkend='var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><filename>DISTRO_FEATURES_BACKFILL_CONSIDERED</filename></link>
- variable as follows:
- <literallayout class='monospaced'>
- DISTRO_FEATURES_BACKFILL_CONSIDERED = "bluez5"
- </literallayout>
- Setting this variable tells the OpenEmbedded build
- system that you have considered but ruled
- out using the bluez5 feature and that bluez4 will be
- used.
- </note>
- </para></listitem>
<listitem><para><emphasis>cramfs:</emphasis> Include CramFS
support.</para></listitem>
<listitem><para><emphasis>directfb:</emphasis>
@@ -190,8 +167,6 @@
support.</para></listitem>
<listitem><para><emphasis>ipv6:</emphasis> Include IPv6 support.
</para></listitem>
- <listitem><para><emphasis>irda:</emphasis> Include IrDA support.
- </para></listitem>
<listitem><para><emphasis>keyboard:</emphasis> Include keyboard
support (e.g. keymaps will be loaded during boot).
</para></listitem>
@@ -235,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>
@@ -342,9 +323,6 @@
class.
The current list of these valid features is as follows:
<itemizedlist>
- <listitem><para><emphasis>eclipse-debug:</emphasis> Provides
- Eclipse remote debugging support.
- </para></listitem>
<listitem><para><emphasis>hwcodecs:</emphasis> Installs
hardware acceleration codecs.
</para></listitem>