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 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'common') 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" -- cgit v1.2.3-54-g00ecf