From a79cdb51b879988aa56a2b3fc419ac110425e8a4 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Wed, 4 Mar 2015 06:39:06 -0800
Subject: bsp-guide, kernel-dev, ref-manual: KERNEL_FEATURES should refer to
 .scc files.

Tweak a number of doc lines so that the KERNEL_FEATURES variable
refers directory to .scc files, and does not take advantage of
potentially confusing shortcuts.

(From yocto-docs rev: 6236fb098fc2d518f6f4f63e16b19a06a775d2d6)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/bsp-guide/bsp.xml                  | 2 +-
 documentation/kernel-dev/kernel-dev-advanced.xml | 4 ++--
 documentation/ref-manual/ref-variables.xml       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'documentation')

diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index abab3f4..06b6f22 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -589,7 +589,7 @@
      COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
      KMACHINE_emenlow-noemgd = "emenlow"
      KBRANCH_emenlow-noemgd = "standard/base"
-     KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
+     KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500.scc"
 
      LINUX_VERSION_emenlow-noemgd = "3.14.19"
      SRCREV_machine_emenlow-noemgd = "902f34d36102a4b2008b776ecae686f80d307e12"
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml
index 3707fce..dc5d9ba 100644
--- a/documentation/kernel-dev/kernel-dev-advanced.xml
+++ b/documentation/kernel-dev/kernel-dev-advanced.xml
@@ -136,12 +136,12 @@
         For example, to include a feature specified as "features/netfilter.scc",
         specify:
         <literallayout class='monospaced'>
-     KERNEL_FEATURES += "features/netfilter.scc"
+     KERNEL_FEATURES += "features/netfilter/netfilter.scc"
         </literallayout>
         To include a feature called "cfg/sound.scc" just for the
         <filename>qemux86</filename> machine, specify:
         <literallayout class='monospaced'>
-     KERNEL_FEATURES_append_qemux86 = "cfg/sound.scc"
+     KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc"
         </literallayout>
         The value of the entries in <filename>KERNEL_FEATURES</filename>
         are dependent on their location within the kernel Metadata itself.
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 7122b47..1135728 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -5792,7 +5792,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
      KMACHINE_emenlow-noemgd = "emenlow"
      KBRANCH_emenlow-noemgd = "standard/base"
-     KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
+     KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500.scc"
                     </literallayout>
                         The <filename>KBRANCH</filename> statement identifies
                         the kernel branch to use when building for the Emenlow
@@ -5846,10 +5846,10 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     machine:
                     <literallayout class='monospaced'>
      # Add netfilter to all linux-yocto kernels
-     KERNEL_FEATURES="features/netfilter"
+     KERNEL_FEATURES="features/netfilter/netfilter.scc"
 
      # Add sound support to the qemux86 machine
-     KERNEL_FEATURES_append_qemux86=" cfg/sound"
+     KERNEL_FEATURES_append_qemux86=" cfg/sound.scc"
                     </literallayout></para>
             </glossdef>
         </glossentry>
-- 
cgit v1.1