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.8.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.8.bbappend')
| -rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
| 5 | COMPATIBLE_MACHINE_fri2 = "fri2" | 5 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 6 | KMACHINE_fri2 = "fri2" | 6 | KMACHINE_fri2 = "fri2" |
| 7 | KBRANCH_fri2 = "standard/fri2" | 7 | KBRANCH_fri2 = "standard/fri2" |
| 8 | KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" | 8 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" |
| 9 | SRCREV_meta_fri2 = "8ef9136539464c145963ac2b8ee0196fea1c2337" | 9 | SRCREV_meta_fri2 = "8ef9136539464c145963ac2b8ee0196fea1c2337" |
| 10 | SRCREV_machine_fri2 = "f20047520a57322f05d95a18a5fbd082fb15cb87" | 10 | SRCREV_machine_fri2 = "f20047520a57322f05d95a18a5fbd082fb15cb87" |
| 11 | SRCREV_emgd_fri2 = "a18cbb7a2886206815dbf6c85caed3cb020801e0" | 11 | SRCREV_emgd_fri2 = "a18cbb7a2886206815dbf6c85caed3cb020801e0" |
| @@ -14,7 +14,7 @@ SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;noch | |||
| 14 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | 14 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" |
| 15 | KMACHINE_fri2-noemgd = "fri2" | 15 | KMACHINE_fri2-noemgd = "fri2" |
| 16 | KBRANCH_fri2-noemgd = "standard/fri2" | 16 | KBRANCH_fri2-noemgd = "standard/fri2" |
| 17 | KERNEL_FEATURES_fri2_append = " cfg/vesafb" | 17 | KERNEL_FEATURES_append_fri2 = " cfg/vesafb" |
| 18 | SRCREV_meta_fri2-noemgd = "8ef9136539464c145963ac2b8ee0196fea1c2337" | 18 | SRCREV_meta_fri2-noemgd = "8ef9136539464c145963ac2b8ee0196fea1c2337" |
| 19 | SRCREV_machine_fri2-noemgd = "f20047520a57322f05d95a18a5fbd082fb15cb87" | 19 | SRCREV_machine_fri2-noemgd = "f20047520a57322f05d95a18a5fbd082fb15cb87" |
| 20 | 20 | ||