summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-06-27 13:33:51 -0700
committerTom Zanussi <tom.zanussi@linux.intel.com>2013-07-29 13:40:59 -0500
commit2173e8f778a381012028ee79d5dc3351606a9bdb (patch)
treecd5d65d125d02c45897d799c1da51c5d2ffe73c6
parentbd34513dc12c412f40328001c09fa5407041e912 (diff)
downloadmeta-intel-2173e8f778a381012028ee79d5dc3351606a9bdb.tar.gz
sugarbay: correct the KERNEL_FEATURE variable name
The var KERNEL_FEATURES_sugarbay_append overrides the previous value defined in the oecore layer, and the var KERNEL_FEATURES_append_sugarbay preserves the old value and extends it. This change avoids unintentional disabling of some KERNEL_FEATURES such as netfilter. Fixes bug: [YOCTO #4741] Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r--meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 3889456b..f1336fa9 100644
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -4,7 +4,7 @@ COMPATIBLE_MACHINE_sugarbay = "sugarbay"
4 4
5KMACHINE_sugarbay = "sugarbay" 5KMACHINE_sugarbay = "sugarbay"
6KBRANCH_sugarbay = "standard/common-pc-64/sugarbay" 6KBRANCH_sugarbay = "standard/common-pc-64/sugarbay"
7KERNEL_FEATURES_sugarbay_append = " features/usb/usb-uvcvideo features/media/v4l2" 7KERNEL_FEATURES_append_sugarbay = " features/usb/usb-uvcvideo features/media/v4l2"
8 8
9LINUX_VERSION = "3.8.13" 9LINUX_VERSION = "3.8.13"
10 10