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 ++-- meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 4 ++-- meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-fri2') 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" 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" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend index 6560d29e..46e1f150 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -5,7 +5,7 @@ LINUX_VERSION = "3.8.13" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" KBRANCH_fri2 = "standard/fri2" -KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" +KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" SRCREV_meta_fri2 = "8ef9136539464c145963ac2b8ee0196fea1c2337" SRCREV_machine_fri2 = "f20047520a57322f05d95a18a5fbd082fb15cb87" SRCREV_emgd_fri2 = "a18cbb7a2886206815dbf6c85caed3cb020801e0" @@ -14,7 +14,7 @@ SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;noch 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_meta_fri2-noemgd = "8ef9136539464c145963ac2b8ee0196fea1c2337" SRCREV_machine_fri2-noemgd = "f20047520a57322f05d95a18a5fbd082fb15cb87" -- cgit v1.2.3-54-g00ecf