[meta-lsi] [PATCH 17/24] linux-yocto_3.14: Reset LSI_SRC if lsi-public is set

[Daniel Dragomir]

3.14 Github Kernel didn't have public version. Even if kernel version
is set to 3.10, bitbake will check also the 3.14 recipe and will test
if "require ${LSI_SRC}-rt_3.14.inc" can be be satisfied.
If lsi-public is set for 3.10 kernel, we'll get this error:
ERROR: Could not include required file lsi-public_3.14.inc

Reset LSI_SRC to "linux-yocto" in 3.14 recipe in case if LSI_SRC
is set to "lsi-public".

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | 5 ++++-
 recipes-kernel/linux/linux-yocto-rt_3.14.inc      | 4 ++--
 recipes-kernel/linux/linux-yocto_3.14.bbappend    | 5 ++++-
 recipes-kernel/linux/linux-yocto_3.14.inc         | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index a9698a6..bcdb003 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
@@ -14,4 +14,7 @@ TESTING ?= "no"
 KV = "3.14"
 KERNEL_EXTRA_FEATURES = ""
 
-require ${LSI_SRC}-rt_3.14.inc
+# 3.14 Github Kernel didn't have public version. Reset LSI_SRC to "linux-yocto" in this case
+LSI_SRC_RESET = "${@base_conditional('LSI_SRC', 'lsi-public', 'linux-yocto', '${LSI_SRC}',  d)}"
+
+require ${LSI_SRC_RESET}-rt_3.14.inc
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.inc b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
index 572b719..0a12a20 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
-${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
 require dt-${KARCH}.inc
 
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 5eca0b5..8962197 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -14,4 +14,7 @@ TESTING ?= "no"
 KV = "3.14"
 KERNEL_EXTRA_FEATURES = ""
 
-require ${LSI_SRC}_3.14.inc
+# 3.14 Github Kernel didn't have public version. Reset LSI_SRC to "linux-yocto" in this case
+LSI_SRC_RESET = "${@base_conditional('LSI_SRC', 'lsi-public', 'linux-yocto', '${LSI_SRC}',  d)}"
+
+require ${LSI_SRC_RESET}_3.14.inc
diff --git a/recipes-kernel/linux/linux-yocto_3.14.inc b/recipes-kernel/linux/linux-yocto_3.14.inc
index e22293a..61b8300 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto_3.14.inc
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
-${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC_RESET}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
 require dt-${KARCH}.inc
 
-- 
1.9.1