From 6d074cae27420c9148aab66fda535f89cb6b7ca0 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 26 Jul 2013 18:31:33 -0700 Subject: fri2: 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. Signed-off-by: Nitin A Kamble Signed-off-by: Tom Zanussi --- meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend') diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend index 05f4e8da..52dbd7dd 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -3,14 +3,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" KBRANCH_fri2 = "standard/fri2" -KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" +KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" SRCREV_machine_pn-linux-yocto_fri2 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" SRCREV_meta_pn-linux-yocto_fri2 ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" -KERNEL_FEATURES_fri2_append = " cfg/vesafb" +KERNEL_FEATURES_append_fri2 = " cfg/vesafb" SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" -- cgit v1.2.3-54-g00ecf