diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2013-07-26 18:31:33 -0700 |
|---|---|---|
| committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-07-29 13:41:34 -0500 |
| commit | 6d074cae27420c9148aab66fda535f89cb6b7ca0 (patch) | |
| tree | 9752cc6f819093632220ffefb21c73c550b2e85e /meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | |
| parent | 84fdca145a19d4715e2d743dd7b45c20e8ed9691 (diff) | |
| download | meta-intel-6d074cae27420c9148aab66fda535f89cb6b7ca0.tar.gz | |
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 <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend')
| -rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
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}:" | |||
| 3 | COMPATIBLE_MACHINE_fri2 = "fri2" | 3 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 4 | KMACHINE_fri2 = "fri2" | 4 | KMACHINE_fri2 = "fri2" |
| 5 | KBRANCH_fri2 = "standard/fri2" | 5 | KBRANCH_fri2 = "standard/fri2" |
| 6 | KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" | 6 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" |
| 7 | SRCREV_machine_pn-linux-yocto_fri2 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" | 7 | SRCREV_machine_pn-linux-yocto_fri2 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" |
| 8 | SRCREV_meta_pn-linux-yocto_fri2 ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" | 8 | SRCREV_meta_pn-linux-yocto_fri2 ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" |
| 9 | 9 | ||
| 10 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | 10 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" |
| 11 | KMACHINE_fri2-noemgd = "fri2" | 11 | KMACHINE_fri2-noemgd = "fri2" |
| 12 | KBRANCH_fri2-noemgd = "standard/fri2" | 12 | KBRANCH_fri2-noemgd = "standard/fri2" |
| 13 | KERNEL_FEATURES_fri2_append = " cfg/vesafb" | 13 | KERNEL_FEATURES_append_fri2 = " cfg/vesafb" |
| 14 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" | 14 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" |
| 15 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" | 15 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" |
| 16 | 16 | ||