CaROS/meta-intel
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel synced 2026-01-04 16:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fri2: correct the KERNEL_FEATURE variable name

Browse Source 
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 <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
This commit is contained in:
Nitin A Kamble 2013-07-26 18:31:33 -07:00 committed by Tom Zanussi
parent 84fdca145a
commit 6d074cae27
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
View File

@ -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"

4
meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
View File

@ -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"

4
meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
View File

@ -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"