linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 7 messages Oct 1, 2014

lore

Share & tools

lore

Bruce Ashfield

author

2014-10-01 04:43 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard (or whoever is picking these up for testing),

Here's the nearly final update for the kernel bits in the 1.7 release. These took far longer than I wanted to get out, but 3.17-rc6 was not the last, and I had to work through another round of tools and kernel build issues for both 3.14 and 3.17 (i.e. I spent another day or two working with perf and 3.17).

We had some feature breakage creep into 3.14 and 3.17 trees, but Paul Gortmaker helped me out, and we've now worked through the issues with 3.14 and 3.17.

I also have a small kern-tools fix for YOCTO #6753 as part of this series.

So the summary is:

- 3.14 feature fixes
- 3.17 updates to rc7
- kern tools bug fix
- perf fix 3.17 breakage

I've built and booted this series for all arches, using my kernel-dev image for extended build coverage, and we've had multiple eyes confirming the 3.14 fixes.

** My warning is that I'm on vacation for the next week, and will only have external access to email. So this needs to go through a build cycle before merging .. and if there are problems, I'll be back mid next week to fix them up for sure, or sooner if I see email on the external list.

Cheers,

Bruce

The following changes since commit abf9372358e5db70e7d707a5a732c4ec7d0f2efe:

build-appliance-image: Update to dizzy head revision (2014-09-30 21:48:12 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
kern-tools: fix overly greedy path relocations linux-yocto/3.14/3.17: menuconfig and cryptodev linux-yocto/3.14: revert BFP feature, and fix intel-common -rt linux-yocto/3.14/3.17: allmodconfig/allyesconfig build fixes linux-yocto/3.17: update to v3.17-rc7
perf: fix undefined pr_* routines

 .../recipes-kernel/kern-tools/kern-tools-native_git.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb       |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb     |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb     |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.14.bb          | 16 ++++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.17.bb          | 18 +++++++++---------
 meta/recipes-kernel/perf/perf.bb                       | 11 ++++++++---
 7 files changed, 34 insertions(+), 29 deletions(-)

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-01 04:43 UTC #1 lore raw

PATCH 1/6 kern-tools: fix overly greedy path relocations

During patch processing a consolidated set of configs, patches and directives is created under the kernel source tree being modified. During that processing, absolutely paths are converted to relative. It has been found that if directories are sufficiently similar, like so:

/path/to/my-linux
/path/to/my-linux-3.16

The processing will chop to much of some paths, resulting in invalid relative directories (like -3.16 in the above example).

Importing the following two kern tools fixes for the issue:

23345b8846fe kgit: retain trailing / in directory processing a8cf93a3bc94 kgit-s2q: move subject and diffstat mismatch to 'fuzzy' matching

[YOCTO: #6753]

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1

index bca1decf7bd2..ce872354f23c 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native"
 
-SRCREV = "83f468ab8ef748a8880cba7d26779c35abfcc0bf"
+SRCREV = "23345b8846fe4bd167efdf1bd8a1224b2ba9a5ff"
 PR = "r12"
 PV = "0.2+git${SRCPV}"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-01 04:43 UTC #2 lore raw

PATCH 2/6 linux-yocto/3.14/3.17: menuconfig and cryptodev

In reply to Bruce Ashfield

Two issues were reported with the 3.14 kernel, cryptodev was not properly building and working on all devices, and menuconfig was not working on some hosts.

To fix this, we pull in the latest cryptodev updates, and restore an old ncurses patch for menuconfig.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 14 +++++++-------
 meta/recipes-kernel/linux/linux-yocto_3.17.bb      | 16 ++++++++--------
 5 files changed, 20 insertions(+), 20 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +2 -2

index 7eecc7fe562b..1a756ecb3f2b 100644
@@ -3,8 +3,8 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "63e1f827790683d4ef01c71acfdf20b79f986d99"
-SRCREV_machine_qemuppc ?= "2c51fd8a6fcf79386e3418ff78d42390ad6b5aa2"
+SRCREV_machine ?= "1f000ea7a3aed269c78a8650672f05ff2447feb5"
+SRCREV_machine_qemuppc ?= "01a649de749d9e82291063bd23301a6e7530e100"
 SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +1 -1

index ff4a5748067e..7b6d0e0f649f 100644
@@ -8,7 +8,7 @@ LINUX_VERSION ?= "3.14.19"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "14fea2388e7b248c4e9442ac95fcbf1e4d265ee2"
+SRCREV_machine ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8"
 SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb +2 -2

index d1054c3abb73..c2bd4a1f6547 100644
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.17-rc6"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "6cd8a70a8c51c4167f96695fb74356de6bab1c50"
-SRCREV_meta ?= "eebdfd73e01f53a042d8b03b785db9f998d69b19"
+SRCREV_machine ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
+SRCREV_meta ?= "6050ee24b0b51ccaf35894afc5def0b59f434977"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.14.bb +7 -7

index efc193bb3c4f..7ef71f3e20b3 100644
@@ -10,13 +10,13 @@ KBRANCH_qemux86  ?= "standard/common-pc/base"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "1c7a46a46b2cbf68777713531647cd4b1cf22f12"
-SRCREV_machine_qemumips ?= "f3dea87bc7aaccae5c24240b378a4e09034d80af"
-SRCREV_machine_qemuppc ?= "195f2029d49fc2440cf236d5134eb2ab88b8d407"
-SRCREV_machine_qemux86 ?= "bdef75805ede16c13f4383cc53d66dad3e83da64"
-SRCREV_machine_qemux86-64 ?= "14fea2388e7b248c4e9442ac95fcbf1e4d265ee2"
-SRCREV_machine_qemumips64 ?= "b5c533e6ffba299b24d31cc2b8f32f6302f5d7e3"
-SRCREV_machine ?= "14fea2388e7b248c4e9442ac95fcbf1e4d265ee2"
+SRCREV_machine_qemuarm ?= "c21684fb4fad62bceafcc97ae592d1d1bd52cf36"
+SRCREV_machine_qemumips ?= "626a3a63414413e652daf3288903a58973d34520"
+SRCREV_machine_qemuppc ?= "a5e37ff008b4bf2c0cb573f54376cb8b48a79016"
+SRCREV_machine_qemux86 ?= "a39fd81fa54776b2ac8c288251846890c3124dee"
+SRCREV_machine_qemux86-64 ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8"
+SRCREV_machine_qemumips64 ?= "c14d3c68c725205a5724cffe9f6f688d1bc38b6e"
+SRCREV_machine ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8"
 SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

meta/recipes-kernel/linux/linux-yocto_3.17.bb +8 -8

index 6ce141d9188b..c424070da2d0 100644
@@ -10,14 +10,14 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "1d23a0b00164e5ba372988456090d95312f58083"
-SRCREV_machine_qemumips ?= "2f0e803b12728d7af5ab3967c50ef3342d946c65"
-SRCREV_machine_qemuppc ?= "ad01ce94ff8ebaedfa470ee16890255cf6887cc4"
-SRCREV_machine_qemux86 ?= "6cd8a70a8c51c4167f96695fb74356de6bab1c50"
-SRCREV_machine_qemux86-64 ?= "6cd8a70a8c51c4167f96695fb74356de6bab1c50"
-SRCREV_machine_qemumips64 ?= "823eecd78233f65582724ea1d9c8c6002518ecb0"
-SRCREV_machine ?= "6cd8a70a8c51c4167f96695fb74356de6bab1c50"
-SRCREV_meta ?= "eebdfd73e01f53a042d8b03b785db9f998d69b19"
+SRCREV_machine_qemuarm ?= "b3934b47d8a16fe323546d7dca3529bf75ef6245"
+SRCREV_machine_qemumips ?= "9b74a60868ec2e45ecaea70547331b1ef6776b14"
+SRCREV_machine_qemuppc ?= "d63220db68089d0604cadd2d0c3d345dfb0dfdb1"
+SRCREV_machine_qemux86 ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
+SRCREV_machine_qemux86-64 ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
+SRCREV_machine_qemumips64 ?= "9faa5776183318eb41c191bacd05913166d19eb5"
+SRCREV_machine ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
+SRCREV_meta ?= "6050ee24b0b51ccaf35894afc5def0b59f434977"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-01 04:43 UTC #3 lore raw

PATCH 3/6 linux-yocto/3.14: revert BFP feature, and fix intel-common -rt

In reply to Bruce Ashfield

The BPF feature is causing build failures, so we are reverting it for now.

In this update we also have the following fix for -rt:

fb6271a942b5 intel: Remove the standard ktype nesting

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +3 -3

index 1a756ecb3f2b..fba32450fc2b 100644
@@ -3,9 +3,9 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "1f000ea7a3aed269c78a8650672f05ff2447feb5"
-SRCREV_machine_qemuppc ?= "01a649de749d9e82291063bd23301a6e7530e100"
-SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a"
+SRCREV_machine ?= "546062dedb3339ef1932e01a5639f2448c04cc8a"
+SRCREV_machine_qemuppc ?= "93fc25319476f21750eb6c1e94978cad963c4bd7"
+SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +2 -2

index 7b6d0e0f649f..ca541c116148 100644
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14.19"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8"
-SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a"
+SRCREV_machine ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8"
+SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.14.bb +8 -8

index 7ef71f3e20b3..365a70fd9a9b 100644
@@ -10,14 +10,14 @@ KBRANCH_qemux86  ?= "standard/common-pc/base"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "c21684fb4fad62bceafcc97ae592d1d1bd52cf36"
-SRCREV_machine_qemumips ?= "626a3a63414413e652daf3288903a58973d34520"
-SRCREV_machine_qemuppc ?= "a5e37ff008b4bf2c0cb573f54376cb8b48a79016"
-SRCREV_machine_qemux86 ?= "a39fd81fa54776b2ac8c288251846890c3124dee"
-SRCREV_machine_qemux86-64 ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8"
-SRCREV_machine_qemumips64 ?= "c14d3c68c725205a5724cffe9f6f688d1bc38b6e"
-SRCREV_machine ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8"
-SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a"
+SRCREV_machine_qemuarm ?= "0ed31872de2c0e62e9843fa714cb0f8e5f53b70c"
+SRCREV_machine_qemumips ?= "c3537ecd101c8494a1da5534ad934f25d6fa256e"
+SRCREV_machine_qemuppc ?= "df6daa113d535fd46668ba3bb0970c959f103f76"
+SRCREV_machine_qemux86 ?= "1d678e0d4ecd53b973a70fb087dc1275b4de4e0c"
+SRCREV_machine_qemux86-64 ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8"
+SRCREV_machine_qemumips64 ?= "6aa17794bc6795847dae3b60f9d9be01dac874ec"
+SRCREV_machine ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8"
+SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-01 04:43 UTC #5 lore raw

PATCH 5/6 linux-yocto/3.17: update to v3.17-rc7

In reply to Bruce Ashfield

Updating the 3.17 tree to the rc7 release.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.17.bb      | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb +3 -3

index 9c33985fab98..eae08540e6e0 100644
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "3.17-rc6"
+LINUX_VERSION ?= "3.17-rc7"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
-SRCREV_meta ?= "6050ee24b0b51ccaf35894afc5def0b59f434977"
+SRCREV_machine ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36"
+SRCREV_meta ?= "84b57b01050dd9e5a004e265e70120e2a792f38a"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.17.bb +9 -9

index 68208ebeb909..02f10a3aaf0f 100644
@@ -10,18 +10,18 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "787dbffa74ebb7e0f3d8ade959623c69c9c066a0"
-SRCREV_machine_qemumips ?= "417faf05188f982bb1d47709f7c152a5cf116a0d"
-SRCREV_machine_qemuppc ?= "975512c7f6caa812869c4fa0ed1788072bf383f6"
-SRCREV_machine_qemux86 ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
-SRCREV_machine_qemux86-64 ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
-SRCREV_machine_qemumips64 ?= "39878abc7e56c23cd4bc87b2c5d812d489903dee"
-SRCREV_machine ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
-SRCREV_meta ?= "6050ee24b0b51ccaf35894afc5def0b59f434977"
+SRCREV_machine_qemuarm ?= "d156e4658a13349f7a30adafd436e32fb722d248"
+SRCREV_machine_qemumips ?= "5aa58a6ca9d4efe79ddf66c9d09695b42c84a3b6"
+SRCREV_machine_qemuppc ?= "cc4943bf3b93f9c424b63c357ab2c9f71384f3ac"
+SRCREV_machine_qemux86 ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36"
+SRCREV_machine_qemux86-64 ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36"
+SRCREV_machine_qemumips64 ?= "798c30525b1e0eacfa3ff97c4bb17c45b9b4b220"
+SRCREV_machine ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36"
+SRCREV_meta ?= "84b57b01050dd9e5a004e265e70120e2a792f38a"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.17-rc6"
+LINUX_VERSION ?= "3.17-rc7"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-01 04:43 UTC #4 lore raw

PATCH 4/6 linux-yocto/3.14/3.17: allmodconfig/allyesconfig build fixes

In reply to Bruce Ashfield

It was found that some of the recent feature merges for 3.14/3.17 are not allmodconfig and allyesconfig safe.

Since this is a basic test before kernel patches are submitted, we've fixed the features to meet this standard.

Integrating the following fixes from Paul Gortmaker:

b4213d81ea3f fat: don't use obsolete random32 call in namei_vfat 2cc7eba15c1f cryptodev: stomp dynamic version numbering for in tree builds 5d1dda7aae4b Target/dif: Introduce protection-passthough-only mode 3d9772d8facf vhost: fix compile fail due to reallocated acked_features field. efad59d3a174 virtio-scsi.h: Add virtio_scsi_cmd_req_pi + VIRTIO_SCSI_F_T10_PI bits 902f34d36102 aufs: apply aufs3-mmap.patch from 3.14 branch 30efc2e9484e aufs: import core files from aufs3.14 20140915 e42f87adef10 Revert "aufs: aufs3-mmap.patch"
a818774bd338 Revert "aufs: core aufs filesystem"

Signed-off-by Paul Gortmaker <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 14 +++++++-------
 meta/recipes-kernel/linux/linux-yocto_3.17.bb      | 14 +++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +2 -2

index fba32450fc2b..b2ad078bcad4 100644
@@ -3,8 +3,8 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "546062dedb3339ef1932e01a5639f2448c04cc8a"
-SRCREV_machine_qemuppc ?= "93fc25319476f21750eb6c1e94978cad963c4bd7"
+SRCREV_machine ?= "0a875ce52aa7a42ddabdb87038074381bb268e77"
+SRCREV_machine_qemuppc ?= "b993661d41f08846daa28b14f89c8ae3e94225bd"
 SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +1 -1

index ca541c116148..79bd6935a22c 100644
@@ -8,7 +8,7 @@ LINUX_VERSION ?= "3.14.19"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8"
+SRCREV_machine ?= "902f34d36102a4b2008b776ecae686f80d307e12"
 SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb +1 -1

index c2bd4a1f6547..9c33985fab98 100644
@@ -8,7 +8,7 @@ LINUX_VERSION ?= "3.17-rc6"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
+SRCREV_machine ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
 SRCREV_meta ?= "6050ee24b0b51ccaf35894afc5def0b59f434977"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.14.bb +7 -7

index 365a70fd9a9b..a2f4b4dccf0b 100644
@@ -10,13 +10,13 @@ KBRANCH_qemux86  ?= "standard/common-pc/base"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "0ed31872de2c0e62e9843fa714cb0f8e5f53b70c"
-SRCREV_machine_qemumips ?= "c3537ecd101c8494a1da5534ad934f25d6fa256e"
-SRCREV_machine_qemuppc ?= "df6daa113d535fd46668ba3bb0970c959f103f76"
-SRCREV_machine_qemux86 ?= "1d678e0d4ecd53b973a70fb087dc1275b4de4e0c"
-SRCREV_machine_qemux86-64 ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8"
-SRCREV_machine_qemumips64 ?= "6aa17794bc6795847dae3b60f9d9be01dac874ec"
-SRCREV_machine ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8"
+SRCREV_machine_qemuarm ?= "127b621f2a4d3b1111e24423c12fac001e047c1c"
+SRCREV_machine_qemumips ?= "c3b9f1b2397f0847ab4844d1cdb8e02574434d78"
+SRCREV_machine_qemuppc ?= "73e2411cdd91764d0601c0869857f53381c2a177"
+SRCREV_machine_qemux86 ?= "e19a1b40de44e756defdfb40349342d8037609bd"
+SRCREV_machine_qemux86-64 ?= "902f34d36102a4b2008b776ecae686f80d307e12"
+SRCREV_machine_qemumips64 ?= "1c4d70272dde4b695697dd8705a031420480f712"
+SRCREV_machine ?= "902f34d36102a4b2008b776ecae686f80d307e12"
 SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

meta/recipes-kernel/linux/linux-yocto_3.17.bb +7 -7

index c424070da2d0..68208ebeb909 100644
@@ -10,13 +10,13 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "b3934b47d8a16fe323546d7dca3529bf75ef6245"
-SRCREV_machine_qemumips ?= "9b74a60868ec2e45ecaea70547331b1ef6776b14"
-SRCREV_machine_qemuppc ?= "d63220db68089d0604cadd2d0c3d345dfb0dfdb1"
-SRCREV_machine_qemux86 ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
-SRCREV_machine_qemux86-64 ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
-SRCREV_machine_qemumips64 ?= "9faa5776183318eb41c191bacd05913166d19eb5"
-SRCREV_machine ?= "460fa8aefe8c4f695245ad3a21da96af2c341f21"
+SRCREV_machine_qemuarm ?= "787dbffa74ebb7e0f3d8ade959623c69c9c066a0"
+SRCREV_machine_qemumips ?= "417faf05188f982bb1d47709f7c152a5cf116a0d"
+SRCREV_machine_qemuppc ?= "975512c7f6caa812869c4fa0ed1788072bf383f6"
+SRCREV_machine_qemux86 ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
+SRCREV_machine_qemux86-64 ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
+SRCREV_machine_qemumips64 ?= "39878abc7e56c23cd4bc87b2c5d812d489903dee"
+SRCREV_machine ?= "8b5bc69a2e44100313cf2a5073a07f495a6ff08e"
 SRCREV_meta ?= "6050ee24b0b51ccaf35894afc5def0b59f434977"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-01 04:43 UTC #6 lore raw

PATCH 6/6 perf: fix undefined pr_* routines

In reply to Bruce Ashfield

When cross compiling libunwind support for ARM a missing debug include means that pr* macros are not expanded, and hence link failures on the undefined functions.

Since we must be compatible with many versions of the kernel and perf, we sed the proper include into the files, while the permanent fix goes upstream to the mainline kernel.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/perf/perf.bb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

meta/recipes-kernel/perf/perf.bb +8 -3

index ea7571aa8e29..3771cdb3e9dd 100644
@@ -145,9 +145,14 @@ do_configure_prepend () {
     if [ -e "${S}/tools/perf/config/feature-checks/Makefile" ]; then
         sed -i 's,CC := $(CROSS_COMPILE)gcc -MD,CC += -MD,' ${S}/tools/perf/config/feature-checks/Makefile
     fi
-    # 3.17-rc1+ has a include issue for powerpc. Temporarily sed in the appropriate include
-    if [ -e "${S}/tools/perf/arch/powerpc/util/skip-callchain-idx.c" ]; then
-        sed -i 's,#include "util/callchain.h",#include "util/callchain.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/powerpc/util/skip-callchain-idx.c
+
+    # 3.17-rc1+ has a include issue for arm/powerpc. Temporarily sed in the appropriate include
+    if [ -e "${S}/tools/perf/arch/$ARCH/util/skip-callchain-idx.c" ]; then
+        sed -i 's,#include "util/callchain.h",#include "util/callchain.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/$ARCH/util/skip-callchain-idx.c
+    fi
+    if [ -e "${S}/tools/perf/arch/arm/util/unwind-libunwind.c" ] && [ -e "${S}/tools/perf/arch/arm/tests/dwarf-unwind.c" ]; then
+        sed -i 's,#include "tests/tests.h",#include "tests/tests.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/arm/tests/dwarf-unwind.c
+        sed -i 's,#include "perf_regs.h",#include "perf_regs.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/arm/util/unwind-libunwind.c
     fi
 }

Signature · 1 line

1.8.1.2