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-dev.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend') diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend index 228a69ba..5ef4835b 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -3,7 +3,7 @@ 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_fri2 = "60536206ad300ccf5b2be2c2d449f4ab27170238" SRCREV_meta_fri2 = "fe20c99783387dab779472ff50a88666da1c6391" SRCREV_emgd_fri2 = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1" @@ -11,7 +11,7 @@ SRCREV_emgd_fri2 = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1" 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_fri2-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238" SRCREV_meta_fri2-noemgd = "fe20c99783387dab779472ff50a88666da1c6391" -- cgit v1.2.3-54-g00ecf