From b89a7c533df4fa17d8c239e674b0af83253a65b6 Mon Sep 17 00:00:00 2001 From: Josep Puigdemont Date: Thu, 17 Jul 2014 18:36:31 +0200 Subject: linux-yocto: Use _append when overrides are used Some modules in the KERNEL_MODULE_AUTOLOAD list were removed when including the meta-intel layer. It turns out the problem happens due to using the += operator together with machine overrides. Using _append_machine fixes this. Signed-off-by: Josep Puigdemont Acked-By: Nitin A Kamble Signed-off-by: Tom Zanussi --- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 4 ++-- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-fri2/recipes-kernel/linux') diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend index e57449f9..25361e88 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend @@ -12,5 +12,5 @@ KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2" SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "b669af08737562ef86e7cba328966d05222d3e64" #SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX" -KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi" -KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index a4732f21..bfbb7540 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -18,5 +18,5 @@ LINUX_VERSION_fri2-noemgd = "3.10.38" SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" -KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi" -KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi" -- cgit v1.2.3-54-g00ecf