From 1759e70a22abfa34652d0ba08bd697dff7a89b3c Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 26 Jul 2013 18:37:03 -0700 Subject: 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 Signed-off-by: Tom Zanussi --- meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +- meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 2 +- meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 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 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" COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" -KERNEL_FEATURES_append_fri2 = " cfg/vesafb" +KERNEL_FEATURES_append_fri2-noemgd = " 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 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" COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" -KERNEL_FEATURES_append_fri2 = " cfg/vesafb" +KERNEL_FEATURES_append_fri2-noemgd = " 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 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 COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" -KERNEL_FEATURES_append_fri2 = " cfg/vesafb" +KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" SRCREV_meta_fri2-noemgd = "8ef9136539464c145963ac2b8ee0196fea1c2337" SRCREV_machine_fri2-noemgd = "f20047520a57322f05d95a18a5fbd082fb15cb87" -- cgit v1.2.3-54-g00ecf