summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-09-06 13:09:29 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-07 14:56:28 +0100
commit168b89a7cd62e5017a2fa2a09a117b275da1c590 (patch)
tree5c61aa5b5f96a89f4ebc4a3b7a28604459d0282c
parent244ebdc5951f57add68f5048262e54014843f7d1 (diff)
downloadpoky-168b89a7cd62e5017a2fa2a09a117b275da1c590.tar.gz
linux-yocto: re-enable utrace
Upating the meta data and machine branch contents with the up to date merge of utrace. (From OE-Core rev: cb8efc0e1ec00892b46325aabfb1b4020a46c078) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb14
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 2bd69c0e2f..b296ef46f9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
16 16
17SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3" 17SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
18SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af" 18SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
19SRCREV_meta ?= "82140b960a7cc13d116be61a85d4fe7f7d38680f" 19SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
20 20
21PR = "r0" 21PR = "r0"
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 974d384b07..f504b74dbd 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -12,13 +12,13 @@ KBRANCH = ${KMACHINE}
12 12
13LINUX_VERSION ?= "3.0.4" 13LINUX_VERSION ?= "3.0.4"
14 14
15SRCREV_machine_qemuarm ?= "b18f5c601ccc90b4c94d1d29282cf7c53fcb6e22" 15SRCREV_machine_qemuarm ?= "7908f38ac44359d58c40b166dbb45e48fc58295c"
16SRCREV_machine_qemumips ?= "0696ab4056ddc1b4504e8636e47a918bdff5b257" 16SRCREV_machine_qemumips ?= "7ea75f58d69293e6b1c2f904f8f5790521a7ccee"
17SRCREV_machine_qemuppc ?= "af58047d79790a06e5ac5ba09837c6e65220d7aa" 17SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
18SRCREV_machine_qemux86 ?= "515e039eeb316494955e46d38c164e56999511ae" 18SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
19SRCREV_machine_qemux86-64 ?= "d19118d19d5f95e83d6fbe1268fe6b84f67de6d3" 19SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
20SRCREV_machine ?= "6fcf6f1bca9323fa2e9a5ea15fa84153cccbc28b" 20SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
21SRCREV_meta ?= "82140b960a7cc13d116be61a85d4fe7f7d38680f" 21SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
22 22
23PR = "r1" 23PR = "r1"
24PV = "${LINUX_VERSION}+git${SRCPV}" 24PV = "${LINUX_VERSION}+git${SRCPV}"