linux-yocto: mips, -rt update and yocto-custom fix

Richard,

Here are three small fixes that I've gathered up since pushing out the last update to 3.8.x.

[PATCH 1/3] linux-yocto/3.8: update mips SA_RESTORER fix

During the 3.8.4 integration there was a build issue on MIPS due to SA_RESTORER changes. A solution was put in place for mips, but it didn't cover other impacted architectures.

This is a backport of the proposed fix for the next 3.8-stable, since the full -stable might not be available in the right timeframe.

[PATCH 2/3] kernel-yocto: use KBRANCH as default build branch

commit 61001aa [kernel-yocto: respect SRC_URI modified branch selection] changed branch processing such that a branch specified in the SRC_URI would set the branch forced as the build branch.

This change broke compatibility with the yocto-bsp, linux-yocto-custom based recipes. These recipes specify the branch to be built via KBRANCH, but allow the fetcher to use master for keeping the repository up to date. This means that no explicit branch is set in the SRC_URI and the routines return the default branch of 'master', which is not what is set in KBRANCH.

To support this case, we simply pass a default branch into the routine returning the branch to build, and ensure that the default is KBRANCH so if no branch is passed in the SRC_URI, KBRANCH is always built.

[YOCTO #4145]

[PATCH 3/3] linux-yocto-rt: integrate 3.8.4-rt2

Updating to 3.8.4-rt2 to fix the minor issues found with -rt1.

From the upstream commit log:

changes since v3.8.4-rt1:
- build fix for i915 (reported by "Luis Claudio R. Goncalves")
- build fix for fscache (reported by tglx)
- build fix for !RT (kernel/softirq.c did not compile)
- per-cpu rwsem fixed for RT (required only by uprobes so far)
- slub: delay the execution of the ->ctor() hook for newly created objects. This lowers the worst case latencies.

* This also fixes a build issue reported by Tom Zanussi

Cheers,

Bruce

The following changes since commit 92aeb31341b28b193d616ab5cf38af1b9673e37d:

qemuimage-testlib: Fix quoting issue (2013-03-30 17:26:56 +0000)

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 (3):
linux-yocto/3.8: update mips SA_RESTORER fix
kernel-yocto: use KBRANCH as default build branch
linux-yocto-rt: integrate 3.8.4-rt2

 meta/classes/kernel-yocto.bbclass               |   11 ++++++-----
 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.8.bb    |   12 ++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

1.7.10.4

During the 3.8.4 integration there was a build issue on MIPS due to SA_RESTORER changes. A solution was put in place for mips, but it didn't cover other impacted architectures.

This is a backport of the proposed fix for the next 3.8-stable, since the full -stable might not be available in the right timeframe.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.8.bb    |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

index 255e2e3..7b9a4f8 100644
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "f35992f80c81dc5fa1a97165dfd5cbb84661f7cb"
-SRCREV_machine_qemuppc ?= "5789e3f33c1d5df35ced60d0153cafca7cd0e319"
+SRCREV_machine ?= "c122468c96f47f281eb3ab51f96507d66dcc60d7"
+SRCREV_machine_qemuppc ?= "dc0440c8bbf12676a54c7aa29879155d925a7565"
 SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f"
 
 PR = "${INC_PR}.0"

index 95a4906..10fc693 100644
@@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "3a73643770a32ea6c86724e92e1e5abecb5dc822"
-SRCREV_machine_qemumips  ?= "1aefa19417793412ef87217a4cb5d1074dc549ba"
-SRCREV_machine_qemuppc ?= "8844013c81e9ad80246aabca6573eed9dbaac646"
-SRCREV_machine_qemux86 ?= "15a0766b3d007e5fafce3503375694dff2b0603e"
-SRCREV_machine_qemux86-64 ?= "15a0766b3d007e5fafce3503375694dff2b0603e"
-SRCREV_machine ?= "15a0766b3d007e5fafce3503375694dff2b0603e"
+SRCREV_machine_qemuarm ?= "bf458ca0e48f4f57cbb02b52070a000f361eec84"
+SRCREV_machine_qemumips  ?= "c7297b41016919c95a2c779cafc0aad736f6a400"
+SRCREV_machine_qemuppc ?= "f8848d222d1fcd1ebc517d28f289735621708449"
+SRCREV_machine_qemux86 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42"
+SRCREV_machine_qemux86-64 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42"
+SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42"
 SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

1.7.10.4

commit 61001aa [kernel-yocto: respect SRC_URI modified branch selection] changed branch processing such that a branch specified in the SRC_URI would set the branch forced as the build branch.

This change broke compatibility with the yocto-bsp, linux-yocto-custom based recipes. These recipes specify the branch to be built via KBRANCH, but allow the fetcher to use master for keeping the repository up to date. This means that no explicit branch is set in the SRC_URI and the routines return the default branch of 'master', which is not what is set in KBRANCH.

To support this case, we simply pass a default branch into the routine returning the branch to build, and ensure that the default is KBRANCH so if no branch is passed in the SRC_URI, KBRANCH is always built.

[YOCTO #4145]

---
 meta/classes/kernel-yocto.bbclass |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

index 7b8e607..d1b4f10 100644
@@ -46,7 +46,7 @@ def find_kernel_feature_dirs(d):
 
 # find the master/machine source branch. In the same way that the fetcher proceses
 # git repositories in the SRC_URI we take the first repo found, first branch.
-def get_machine_branch(d):
+def get_machine_branch(d, default):
     fetch = bb.fetch2.Fetch([], d)
     for url in fetch.urls:
         urldata = fetch.ud[url]

@@ -55,7 +55,7 @@ def get_machine_branch(d):
             branches = urldata.parm.get("branch").split(',')
             return branches[0]
 	    
-    return "master"
+    return default
 
 do_patch() {
 	cd ${S}

@@ -70,7 +70,7 @@ do_patch() {
 		fi
 	fi
 
-	machine_branch="${@ get_machine_branch(d)}"
+	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
 	# if we have a defined/set meta branch we should not be generating
 	# any meta data. The passed branch has what we need.

@@ -195,7 +195,8 @@ do_kernel_checkout() {
 		fi
 	fi
 	
-	machine_branch="${@ get_machine_branch(d)}"
+	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
+
 	if [ "${KBRANCH}" != "${machine_branch}" ]; then
 		echo "WARNING: The SRC_URI machine branch and KBRANCH are not the same."
 		echo "	       KBRANCH will be adjusted to match, but this typically is a"

@@ -280,7 +281,7 @@ do_validate_branches() {
 	cd ${S}
 	export KMETA=${KMETA}
 
-	machine_branch="${@ get_machine_branch(d)}"
+	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
 	set +e
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to

1.7.10.4

Updating to 3.8.4-rt2 to fix the minor issues found with -rt1.

From the upstream commit log:

changes since v3.8.4-rt1:
- build fix for i915 (reported by "Luis Claudio R. Goncalves")
- build fix for fscache (reported by tglx)
- build fix for !RT (kernel/softirq.c did not compile)
- per-cpu rwsem fixed for RT (required only by uprobes so far)
- slub: delay the execution of the ->ctor() hook for newly created objects. This lowers the worst case latencies.

Known issues:

- SLxB is broken on PowerPC.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 7b9a4f8..903fcb5 100644
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "c122468c96f47f281eb3ab51f96507d66dcc60d7"
-SRCREV_machine_qemuppc ?= "dc0440c8bbf12676a54c7aa29879155d925a7565"
+SRCREV_machine ?= "abd0728b164f651292374e96251ee197b50e3c02"
+SRCREV_machine_qemuppc ?= "1619988b773840ec546292a9cd65dda99d55b96c"
 SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f"
 
 PR = "${INC_PR}.0"

1.7.10.4

Does this fix systemd/ crash and/or mips64 boot on qemu I wonder

It may .. since the fix is broader than the one that I did before. Now that this it out, I'm gearing up to do systemd boots with mips/mips64.

Bruce