From 571259cc48b8d9b64e93a20851dfc59b0940ef4c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 8 Oct 2012 09:49:38 -0400 Subject: linux-yocto/3.4: perf: parallel build and tools fixes korg commit 42dcd1f4e [perf tools: Fix parallel build] fixes parallel build issues that are being seen in the autobuilder. We also have a fix from Tom: [ perf annotate: replace 'expand' with equivalent sed expression We don't have 'expand' in our userspace so we need to accomplish the same thing using 'sed', which we do have. ] So we apply it to all BSP branches and kernel types. (From OE-Core rev: f06e7d38db35c56c71a42264361ec45fb3777a14) Signed-off-by: Tom Zanussi Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index c8bf028f7e..91dc54fa02 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb @@ -8,9 +8,9 @@ LINUX_KERNEL_TYPE = "preempt-rt" KMETA = "meta" -SRCREV_machine ?= "6d7122966eaae849ba3f2e1ccb94cdab17a46fbd" -SRCREV_machine_qemuppc ?= "8b2acbc859c616dfcad79f786bacb856f370f4c2" -SRCREV_meta ?= "5bdc655034a58a7147176a8a882d81e2fd51e4b9" +SRCREV_machine ?= "5705c8037d2c47938034ead87c70ae3ebef552f7" +SRCREV_machine_qemuppc ?= "c8b651aab5d2d5c0839cdedc0c0ec5dc09cf47c0" +SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb index a0c8ffb596..60b877f7ea 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb @@ -12,7 +12,7 @@ LINUX_VERSION ?= "3.4.11" KMETA = "meta" -SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" +SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d" SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 6b1f0fd59e..3383147a9d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" -SRCREV_machine_qemuarm ?= "8f05f1d8adbf1551a80225049dd381ffbb64a6c5" -SRCREV_machine_qemumips ?= "fb23a2ed7b94548b1736fdb55efb26f88bc5c171" -SRCREV_machine_qemuppc ?= "cdecf5940d81330680ce1517a7bc101556792e71" -SRCREV_machine_qemux86 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" -SRCREV_machine_qemux86-64 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" -SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" +SRCREV_machine_qemuarm ?= "8ee53c3b82ada3cdfd7d25f07d3975834ac9a9b2" +SRCREV_machine_qemumips ?= "caf99a20e3c3ba036ed1bb46875059a0d24e4fbd" +SRCREV_machine_qemuppc ?= "7833f1549c3d44cce8aea38b65cd501229aad492" +SRCREV_machine_qemux86 ?= "449f7f520350700858f21a5554b81cc8ad23267d" +SRCREV_machine_qemux86-64 ?= "449f7f520350700858f21a5554b81cc8ad23267d" +SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d" SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" -- cgit v1.2.3-54-g00ecf