From 84fdca145a19d4715e2d743dd7b45c20e8ed9691 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 26 Jul 2013 18:30:51 -0700 Subject: emenlow: 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-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend | 4 ++-- meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend | 4 ++-- meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend index 54c4abd2..00ab0fd7 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_emenlow = "emenlow" KMACHINE_emenlow = "emenlow" KBRANCH_emenlow = "standard/emenlow" -KERNEL_FEATURES_emenlow_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" +KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" KMACHINE_emenlow-noemgd = "emenlow" KBRANCH_emenlow-noemgd = "standard/emenlow" -KERNEL_FEATURES_emenlow-noemgd_append = " features/drm-gma500/drm-gma600" +KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma600" SRCREV_machine_emenlow = "60536206ad300ccf5b2be2c2d449f4ab27170238" SRCREV_meta_emenlow = "fe20c99783387dab779472ff50a88666da1c6391" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend index 0b55e493..34bdc7d8 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_emenlow = "emenlow" KMACHINE_emenlow = "emenlow" KBRANCH_emenlow = "standard/emenlow" -KERNEL_FEATURES_emenlow_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" +KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" KMACHINE_emenlow-noemgd = "emenlow" KBRANCH_emenlow-noemgd = "standard/emenlow" -KERNEL_FEATURES_emenlow-noemgd_append = " features/drm-gma500/drm-gma600" +KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma600" SRCREV_machine_pn-linux-yocto_emenlow ?= "0a1e7660733615106a2430e38bf6b835a8e5507d" SRCREV_meta_pn-linux-yocto_emenlow ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend index fb8d9567..394ed6e4 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_emenlow = "emenlow" KMACHINE_emenlow = "emenlow" KBRANCH_emenlow = "standard/emenlow" -KERNEL_FEATURES_emenlow_append = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" +KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" KMACHINE_emenlow-noemgd = "emenlow" KBRANCH_emenlow-noemgd = "standard/emenlow" -KERNEL_FEATURES_emenlow-noemgd_append = " features/drm-gma500/drm-gma600" +KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma600" LINUX_VERSION = "3.8.13" -- cgit v1.2.3-54-g00ecf