[meta-lsi] [PATCH 08/24] linux-yocto-3.14: fix yocto recipes

Daniel Dragomir daniel.dragomir at windriver.com
Thu Jan 28 04:43:06 PST 2016


From: Cristian Bercaru <cristian.bercaru at windriver.com>

This patch adjusts the SHAs and paths to the fragments.

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 recipes-kernel/linux/linux-yocto-rt_3.14.inc | 8 +++++---
 recipes-kernel/linux/linux-yocto_3.14.inc    | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.inc b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
index 915f6a9..c873bce 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
@@ -1,4 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/lsi-tip/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
 require linux-yocto.inc
 
@@ -9,8 +10,9 @@ KMETA = "meta"
 KREPO = "git://git.yoctoproject.org/linux-yocto-3.14.git"
 
 SRCREV_machine = "26e942373fbc26ec8a14492e4eff841221442b3e"
-SRCREV_meta = "4c54da246369a9da73f8b4571ea7c9e61faa4d69"
+SRCREV_meta = "288766d58bfdfd8b1cbfd4171a621fc44c1e1cf9"
 
 SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 SRC_URI += "file://fit"
-SRC_URI += "file://defconfig"
+
+require ${MACHINE}_${LINUX_KERNEL_TYPE}_${KV}.inc
diff --git a/recipes-kernel/linux/linux-yocto_3.14.inc b/recipes-kernel/linux/linux-yocto_3.14.inc
index 5ccc8fd..73a4edb 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto_3.14.inc
@@ -1,4 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/lsi-tip/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
 require linux-yocto.inc
 
@@ -9,8 +10,9 @@ KMETA = "meta"
 KREPO = "git://git.yoctoproject.org/linux-yocto-3.14"
 
 SRCREV_machine = "f490412acb655a4573f7612a7fcfa806674a46f6"
-SRCREV_meta = "4c54da246369a9da73f8b4571ea7c9e61faa4d69"
+SRCREV_meta = "288766d58bfdfd8b1cbfd4171a621fc44c1e1cf9"
 
 SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 SRC_URI += "file://fit"
-SRC_URI += "file://defconfig"
+
+require ${MACHINE}_${LINUX_KERNEL_TYPE}_${KV}.inc
-- 
1.9.1



More information about the meta-lsi mailing list