On Fri, Aug 29, 2014 at 04:05:04PM +, Kamble, Nitin A wrote:
-Original Message-
From: meta-intel-boun...@yoctoproject.org [mailto:meta-intel-
boun...@yoctoproject.org] On Behalf Of Josep Puigdemont
Sent: Friday, August 29, 2014 1:53 AM
To: Zanussi, Tom; meta-intel@yoctoproject.org
Subject: [meta-intel] [PATCH] linux-yocto: Use _append when overrides are
used
Some modules in the KERNEL_MODULE_AUTOLOAD list where 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.
Addresses bug:
[YOCTO #6668]
The commit looks fine, although it may it hard to remove entries from
KERNEL_MODULE_AUTOLOAD. The issue can also be fixed by making similar changes
in the meta-virtualization layer
(http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-kernel/linux/linux-yocto_3.14.bbappend).
But there is no ideal solution here, so I am ok with the commit, few typos
need to be corrected from the commit message though.
Thank you Nitin!
I've attached the same patch changing where for were in the comment, good
catch. If there are any other changes you need to make, I am fine with it.
Just to clarify, the issue with the current semantics is that they tell bitbake
to ignore anything in KERNEL_MODULE_AUTOLOAD in favor of
KERNEL_MODULE_AUTOLOAD_intel-target, which is likely not what most users
might expect. Also since the yocto documentation tells us to modify
KERNEL_MODULE_AUTOLOAD, the proposed solution is probably how all layers should
behave (adding a variant of the variable per each machine in every layer won't
scale).
Thanks again!
/Josep
Thanks,
Nitin
Signed-off-by: Josep Puigdemont josep.puigdem...@enea.com
---
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 bfb5f62..554bd62 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 a142e5b..19af367 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 a0ca5fc..b367adb 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
