summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-10-08 13:49:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-08 15:22:32 (GMT)
commitdf9800cf087af6bae832dc60a51051bff31bce87 (patch)
treeae2694af1c62a01ba9c03c93d1f4aab082273e90
parent04232f5908d4a3116589193fa5f1ff526bdedacc (diff)
downloadpoky-df9800cf087af6bae832dc60a51051bff31bce87.tar.gz
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 <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.4.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb12
3 files changed, 10 insertions, 10 deletions
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 c8bf028..91dc54f 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"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "6d7122966eaae849ba3f2e1ccb94cdab17a46fbd" 11SRCREV_machine ?= "5705c8037d2c47938034ead87c70ae3ebef552f7"
12SRCREV_machine_qemuppc ?= "8b2acbc859c616dfcad79f786bacb856f370f4c2" 12SRCREV_machine_qemuppc ?= "c8b651aab5d2d5c0839cdedc0c0ec5dc09cf47c0"
13SRCREV_meta ?= "5bdc655034a58a7147176a8a882d81e2fd51e4b9" 13SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"
16PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${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 a0c8ffb..60b877f 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"
12 12
13KMETA = "meta" 13KMETA = "meta"
14 14
15SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" 15SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d"
16SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" 16SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386"
17 17
18 18
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 6b1f0fd..3383147 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
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6SRCREV_machine_qemuarm ?= "8f05f1d8adbf1551a80225049dd381ffbb64a6c5" 6SRCREV_machine_qemuarm ?= "8ee53c3b82ada3cdfd7d25f07d3975834ac9a9b2"
7SRCREV_machine_qemumips ?= "fb23a2ed7b94548b1736fdb55efb26f88bc5c171" 7SRCREV_machine_qemumips ?= "caf99a20e3c3ba036ed1bb46875059a0d24e4fbd"
8SRCREV_machine_qemuppc ?= "cdecf5940d81330680ce1517a7bc101556792e71" 8SRCREV_machine_qemuppc ?= "7833f1549c3d44cce8aea38b65cd501229aad492"
9SRCREV_machine_qemux86 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" 9SRCREV_machine_qemux86 ?= "449f7f520350700858f21a5554b81cc8ad23267d"
10SRCREV_machine_qemux86-64 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" 10SRCREV_machine_qemux86-64 ?= "449f7f520350700858f21a5554b81cc8ad23267d"
11SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f" 11SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d"
12SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" 12SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"