summaryrefslogtreecommitdiffstats
path: root/meta-fri2/recipes-kernel/linux
diff options
context:
space:
mode:
authorJosep Puigdemont <josep.puigdemont@enea.com>2014-07-17 18:36:31 +0200
committerTom Zanussi <tom.zanussi@linux.intel.com>2014-09-02 16:05:02 -0500
commitb89a7c533df4fa17d8c239e674b0af83253a65b6 (patch)
treedd59fdf2647ea60a5571a650d501104ebc5f65cb /meta-fri2/recipes-kernel/linux
parent00de64dbe0563dfaf21679e2902a56f62a039df4 (diff)
downloadmeta-intel-b89a7c533df4fa17d8c239e674b0af83253a65b6.tar.gz
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 <josep.puigdemont@enea.com> Acked-By: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-fri2/recipes-kernel/linux')
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend4
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend4
2 files changed, 4 insertions, 4 deletions
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"
12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "b669af08737562ef86e7cba328966d05222d3e64" 12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "b669af08737562ef86e7cba328966d05222d3e64"
13#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX" 13#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX"
14 14
15KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi" 15KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi"
16KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi" 16KERNEL_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"
18SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" 18SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
19SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" 19SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
20 20
21KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi" 21KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi"
22KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi" 22KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi"