From 75ac6a2a98fe76653dfb55da5c5afd592ec18acb Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 26 Jul 2013 18:30:04 -0700 Subject: crownbay: 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-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend | 4 ++-- meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend | 4 ++-- meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-crownbay') diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend index 10bced84..8bc18e45 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_crownbay = "crownbay" KMACHINE_crownbay = "crownbay" KBRANCH_crownbay = "standard/crownbay" -KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" +KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" KMACHINE_crownbay-noemgd = "crownbay" KBRANCH_crownbay-noemgd = "standard/crownbay" -KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" +KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" SRCREV_meta_crownbay = "fe20c99783387dab779472ff50a88666da1c6391" SRCREV_machine_crownbay = "60536206ad300ccf5b2be2c2d449f4ab27170238" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend index 8367a0e2..1f264b84 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_crownbay = "crownbay" KMACHINE_crownbay = "crownbay" KBRANCH_crownbay = "standard/crownbay" -KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" +KERNEL_FEATURES_append_crownbay= " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" KMACHINE_crownbay-noemgd = "crownbay" KBRANCH_crownbay-noemgd = "standard/crownbay" -KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" +KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" SRCREV_machine_pn-linux-yocto_crownbay ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868" SRCREV_meta_pn-linux-yocto_crownbay ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend index a11c89d9..469b2e8c 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_crownbay = "crownbay" KMACHINE_crownbay = "crownbay" KBRANCH_crownbay = "standard/crownbay" -KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" +KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" KMACHINE_crownbay-noemgd = "crownbay" KBRANCH_crownbay-noemgd = "standard/crownbay" -KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" +KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" LINUX_VERSION = "3.8.13" -- cgit v1.2.3-54-g00ecf