summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-09-24 18:17:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:27 +0100
commit677a4631e45a394c5cadc768c0afff536886bcd7 (patch)
treee5ca6e4864e9c2230d756de935f7ba39f42dee38 /meta/recipes-kernel
parentcdd9c4c927f6c870c4de07d2b7d12a1879b0f9f5 (diff)
downloadpoky-677a4631e45a394c5cadc768c0afff536886bcd7.tar.gz
linux-yocto/4.1: rt update to 4.1.x-rt8
The -rt build suffered the same breakage in master as the standard kernel builds: due to a bad git history merge, existing patches were dropped from branches. This meant that we were missing the -rt changes, which re-introduced some failures with linux-yocto-rt. With these SRCREV updates, we have the latest 4.1.x-rt and all architectures build. (From OE-Core rev: 96db930d8add6623168ec5e638769d5c0f348265) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.1.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 0d9ecf50cc..352ac3ddfa 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt"
2 2
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" 5SRCREV_machine ?= "eefb205d7ff4afc66a95fd06d31d4e69c3deec39"
6SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" 6SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba"
7 7
8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" 9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 69aac25e74..833b11b010 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" 12SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
13SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" 13SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 0d8d281367..0645134b02 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
19SRCREV_machine_qemux86-64 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" 19SRCREV_machine_qemux86-64 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
20SRCREV_machine_qemumips64 ?= "049105492e5657dd735bad1aa3a32f4f752a9edd" 20SRCREV_machine_qemumips64 ?= "049105492e5657dd735bad1aa3a32f4f752a9edd"
21SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" 21SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
22SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" 22SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"