diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2013-07-26 18:37:03 -0700 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-07-29 13:41:43 -0500 |
commit | 1759e70a22abfa34652d0ba08bd697dff7a89b3c (patch) | |
tree | ee2b7f8241c99863fd612c74bbfae3d5a61b2801 /meta-fri2/recipes-kernel | |
parent | 6d074cae27420c9148aab66fda535f89cb6b7ca0 (diff) | |
download | meta-intel-1759e70a22abfa34652d0ba08bd697dff7a89b3c.tar.gz |
fri2-noemgd: fix the KERNEL_FEATURE variable override
The variable specific to fri2-noemgd was mistakenly extended with -fri2
Instead using the correct extension -fri2-noemgd
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')
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend index 5ef4835b..4ba873ed 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -11,7 +11,7 @@ SRCREV_emgd_fri2 = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1" | |||
11 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | 11 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" |
12 | KMACHINE_fri2-noemgd = "fri2" | 12 | KMACHINE_fri2-noemgd = "fri2" |
13 | KBRANCH_fri2-noemgd = "standard/fri2" | 13 | KBRANCH_fri2-noemgd = "standard/fri2" |
14 | KERNEL_FEATURES_append_fri2 = " cfg/vesafb" | 14 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" |
15 | SRCREV_machine_fri2-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238" | 15 | SRCREV_machine_fri2-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238" |
16 | SRCREV_meta_fri2-noemgd = "fe20c99783387dab779472ff50a88666da1c6391" | 16 | SRCREV_meta_fri2-noemgd = "fe20c99783387dab779472ff50a88666da1c6391" |
17 | 17 | ||
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 52dbd7dd..5212cb69 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
@@ -10,7 +10,7 @@ SRCREV_meta_pn-linux-yocto_fri2 ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" | |||
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_append_fri2 = " cfg/vesafb" | 13 | KERNEL_FEATURES_append_fri2-noemgd = " 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 | ||
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 46e1f150..b216cff8 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend | |||
@@ -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_append_fri2 = " cfg/vesafb" | 17 | KERNEL_FEATURES_append_fri2-noemgd = " 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 | ||