summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-10-08 17:04:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:23 +0100
commitaeb7909cc4d9fb9443b22a31e6d72ae32424695c (patch)
tree91449b175b529159877eae2f4d33332974fd4337 /meta
parent73513f94efc1eebc24597316e0ddb2517e1054fe (diff)
downloadpoky-aeb7909cc4d9fb9443b22a31e6d72ae32424695c.tar.gz
linux-yocto/3.10: integrate lxc kernel feature and 32 bit x86 config
Updating the meta branch SRCREV to incorporate the two following configuration changes: 452f067 lxc: Add lxc kernel config a249eba x86_32: Enable X86_32 and disable 64BIT explicitly (From OE-Core rev: 64d4c508652bc5d8a0b4c01f0d0813e58d6b39a6) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index 9ca87f3182..1a8599544d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
5 5
6SRCREV_machine ?= "f1e003e9441f0366d7b9a2209ef3108438745ea3" 6SRCREV_machine ?= "f1e003e9441f0366d7b9a2209ef3108438745ea3"
7SRCREV_machine_qemuppc ?= "12be459359d5b20dbf856aa3649304c6f618d420" 7SRCREV_machine_qemuppc ?= "12be459359d5b20dbf856aa3649304c6f618d420"
8SRCREV_meta ?= "d671e0ec09b330d68f70f13a7813cc9ecfceaa8d" 8SRCREV_meta ?= "452f0679ea93a6cb4433bebd7177629228a5cf68"
9 9
10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" 10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
11 11
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index 6bd7ab266d..1405e4115f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -10,7 +10,7 @@ LINUX_VERSION ?= "3.10.11"
10KMETA = "meta" 10KMETA = "meta"
11 11
12SRCREV_machine ?= "e1aa804148370cda6f85640281af156ffa007d52" 12SRCREV_machine ?= "e1aa804148370cda6f85640281af156ffa007d52"
13SRCREV_meta ?= "d671e0ec09b330d68f70f13a7813cc9ecfceaa8d" 13SRCREV_meta ?= "452f0679ea93a6cb4433bebd7177629228a5cf68"
14 14
15 15
16PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index d49fdacfcb..fa37e8a054 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -10,7 +10,7 @@ SRCREV_machine_qemux86 ?= "e1aa804148370cda6f85640281af156ffa007d52"
10SRCREV_machine_qemux86-64 ?= "e1aa804148370cda6f85640281af156ffa007d52" 10SRCREV_machine_qemux86-64 ?= "e1aa804148370cda6f85640281af156ffa007d52"
11SRCREV_machine_qemumips64 ?= "6973844d304411893420a7e57545edc4dc854bd7" 11SRCREV_machine_qemumips64 ?= "6973844d304411893420a7e57545edc4dc854bd7"
12SRCREV_machine ?= "e1aa804148370cda6f85640281af156ffa007d52" 12SRCREV_machine ?= "e1aa804148370cda6f85640281af156ffa007d52"
13SRCREV_meta ?= "d671e0ec09b330d68f70f13a7813cc9ecfceaa8d" 13SRCREV_meta ?= "452f0679ea93a6cb4433bebd7177629228a5cf68"
14 14
15SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 15SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
16 16