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 --- common/recipes-kernel/linux/linux-yocto-dev.bbappend | 8 ++++---- common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 8 ++++---- common/recipes-kernel/linux/linux-yocto_3.14.bbappend | 8 ++++---- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 4 ++-- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index bfb5f62a..554bd624 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -19,9 +19,9 @@ KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} # default SRCREV is set and linux-yocto-dev is the preferred provider. # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" -KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" # For FRI2, NUC -KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" -KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index a142e5be..19af3671 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -21,9 +21,9 @@ KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" -KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" # For FRI2, NUC -KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" -KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend index a0ca5fcd..b367adb4 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -20,9 +20,9 @@ KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" -KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" # For FRI2, NUC -KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" -KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" 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" diff --git a/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend index c691a424..7e7f05f9 100644 --- a/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -32,5 +32,5 @@ SRCREV_valleyisland-io_valleyisland-64 = "8ea4fb625f2654bbdd5dfcb9db67328d21ebe5 SRC_URI_valleyisland-64 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},valleyisland-io-1.0;name=machine,meta,valleyisland-io" -KERNEL_MODULE_AUTOLOAD_valleyisland-32 += "i2c-dev" -KERNEL_MODULE_AUTOLOAD_valleyisland-64 += "i2c-dev" +KERNEL_MODULE_AUTOLOAD_append_valleyisland-32 = " i2c-dev" +KERNEL_MODULE_AUTOLOAD_append_valleyisland-64 = " i2c-dev" -- cgit v1.2.3-54-g00ecf