From bf97ece14e1444e3898798599a4299ad1c7556c6 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 17 Jun 2014 17:47:44 -0700 Subject: linux-yocto recipes: fix use of module_autoload_* vars oecore/poky layer changed, needing replacement of all the module_autoload_* recipe variables by the KERNEL_MODULE_AUTOLOAD variable. This fixes these kind of buildtime errors coming from the meta-intel layer: ERROR: KERNEL_MODULE_AUTOLOAD has replaced module_autoload_iwlwifi, please replace it! Addresses bug: [YOCTO #6460] Signed-off-by: Nitin A Kamble Signed-off-by: Tom Zanussi --- common/recipes-kernel/linux/linux-yocto-dev.bbappend | 4 ++-- common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- common/recipes-kernel/linux/linux-yocto_3.14.bbappend | 4 ++-- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 2 +- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 3 +-- .../meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index b8c06df0..71e40957 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -19,7 +19,7 @@ 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 -module_autoload_uio = "uio" +KERNEL_MODULE_AUTOLOAD += "uio" # For FRI2 -module_autoload_iwlwifi = "iwlwifi" +KERNEL_MODULE_AUTOLOAD += "iwlwifi" diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 3bb53432..bbce8f4a 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -21,7 +21,7 @@ KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley -module_autoload_uio = "uio" +KERNEL_MODULE_AUTOLOAD += "uio" # For FRI2, NUC -module_autoload_iwlwifi = "iwlwifi" +KERNEL_MODULE_AUTOLOAD += "iwlwifi" diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend index 3c34f095..139c1f0a 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -20,7 +20,7 @@ KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley -module_autoload_uio = "uio" +KERNEL_MODULE_AUTOLOAD += "uio" # For FRI2, NUC -module_autoload_iwlwifi = "iwlwifi" +KERNEL_MODULE_AUTOLOAD += "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 557cba13..7aaf53af 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,4 +12,4 @@ 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" -module_autoload_iwlwifi = "iwlwifi" +KERNEL_MODULE_AUTOLOAD += "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 36907a51..14bb81a0 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,4 @@ LINUX_VERSION_fri2-noemgd = "3.10.38" SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" -module_autoload_iwlwifi = "iwlwifi" - +KERNEL_MODULE_AUTOLOAD += "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 34e28c1e..e329712f 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,4 +32,4 @@ 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" -module_autoload_i2c-dev = "i2c-dev" +KERNEL_MODULE_AUTOLOAD += "i2c-dev" -- cgit v1.2.3-54-g00ecf