Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 5 messages Feb 27, 2014

lore
Share & tools
lore
#0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

While I put the finishing touches on the 3.14 -dev kernel (and versioned linux-yocto recipe), here are pending updates to the other supported kernel versions, and a minor change to create consistency in branch validation process.

I've kept all the incremental version (And LTSI) updates intact in this series, since they represent build and validation points that I used during the merges, and should be maintained in the history.

Sanity has passed across all the qemu* platforms, as well as builds for the hardware references.

Cheers,

Bruce

The following changes since commit 5ab9d7e28f987fba8bab03bb7851c263f746c208:

security-flags: Avoid lttng-tools issue on arm (2014-02-26 13:48:21 +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 (4):
kernel-yocto: always checkout machine branch when existing
validate_branches
linux-yocto/3.10: update to v3.10.32 linux-yocto/3.4: update to v3.4.82 and latest LTSI linux-yocto/3.10: integrate latest LTSI changes

 meta/classes/kernel-yocto.bbclass                  | 37 ++++++++++------------
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  8 ++---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb    |  8 ++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  6 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb  |  6 ++--
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb       | 16 +++++-----
 7 files changed, 47 insertions(+), 52 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/4 kernel-yocto: always checkout machine branch when existing validate_branches

The validate_branches routine is responsible for ensuring that the specified SRCREV exists, and that the tree has been prepared for eventual patching starting directly from that SRCREV.

On exit, the routine checks out the specified machine branch and the preparation is complete .. except if a KMETA branch isn't used, we exit early since the branch can't be validated.

To make the exit condition consistent for all cases, we can move the KMETA validation inside a conditional and allow the same exit path for both cases.

---
 meta/classes/kernel-yocto.bbclass | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)
meta/classes/kernel-yocto.bbclass +16 -21
index fab5d4c57055..fb8e04e704fb 100644
@@ -358,31 +358,26 @@ do_validate_branches() {
 		fi
 	done
 
-	## KMETA branch validation
+	## KMETA branch validation.
+	## We do validation if the meta branch exists, and AUTOREV hasn't been set
  	meta_head=`git show-ref -s --heads ${KMETA}`
  	target_meta_head="${SRCREV_meta}"
 	git show-ref --quiet --verify -- "refs/heads/${KMETA}"
-	if [ $? -eq 1 ]; then
-		return
-	fi
-
-	if [ "${target_meta_head}" = "AUTOINC" ]; then
-		return
-	fi
-
-	if [ "$meta_head" != "$target_meta_head" ]; then
-		ref=`git show ${target_meta_head} 2>&1 | head -n1 || true`
-		if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
-			echo "ERROR ${target_meta_head} is not a valid commit ID"
-			echo "The kernel source tree may be out of sync"
-			exit 1
-		else
-			echo "[INFO] Setting branch ${KMETA} to ${target_meta_head}"
-			git branch -m ${KMETA} ${KMETA}-orig
-			git checkout -q -b ${KMETA} ${target_meta_head}
-			if [ $? -ne 0 ];then
-				echo "ERROR: could not checkout ${KMETA} branch from known hash ${target_meta_head}"
+	if [ $? -eq 0 ] && [ "${target_meta_head}" != "AUTOINC" ]; then
+		if [ "$meta_head" != "$target_meta_head" ]; then
+			ref=`git show ${target_meta_head} 2>&1 | head -n1 || true`
+			if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
+				echo "ERROR ${target_meta_head} is not a valid commit ID"
+				echo "The kernel source tree may be out of sync"
 				exit 1
+			else
+				echo "[INFO] Setting branch ${KMETA} to ${target_meta_head}"
+				git branch -m ${KMETA} ${KMETA}-orig
+				git checkout -q -b ${KMETA} ${target_meta_head}
+				if [ $? -ne 0 ];then
+					echo "ERROR: could not checkout ${KMETA} branch from known hash ${target_meta_head}"
+					exit 1
+				fi
 			fi
 		fi
 	fi
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/4 linux-yocto/3.10: update to v3.10.32

In reply to Bruce Ashfield

Integrating the latest korg -stable update for the 3.10 series of kernels.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +4 -4
index 5e56b4c16121..31ff0361c3c4 100644
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "f17f18f928d3af8b18b69fdf224b3e4ed86dbfbf"
-SRCREV_machine_qemuppc ?= "82c9f3bfe1c97ba8b653bff8d4e030cf54bc1de7"
-SRCREV_meta ?= "8f8af5a3b1cd4ea4ec76e0db763efeb3807ad76c"
+SRCREV_machine ?= "a2475c1d9dc32b7171de28d196ace4a9df06edbd"
+SRCREV_machine_qemuppc ?= "84ab418469d7da9b710ce9e3cbc49e6fb9bd4e05"
+SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.10.28"
+LINUX_VERSION ?= "3.10.32"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +3 -3
index a987022ddce0..34bb276527f1 100644
@@ -5,12 +5,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.10.28"
+LINUX_VERSION ?= "3.10.32"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
-SRCREV_meta ?= "8f8af5a3b1cd4ea4ec76e0db763efeb3807ad76c"
+SRCREV_machine ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
+SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_3.10.bb +9 -9
index efbf24d3b3aa..55d46fa993d9 100644
@@ -11,18 +11,18 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "51f493f9716a76fbfe911bfdefca7e9a42a5ca13"
-SRCREV_machine_qemumips ?= "633b2257f21082fd3a784a4417b421e9cd008045"
-SRCREV_machine_qemuppc ?= "37465d34ea1aba381082d22a880774b3b3b31af3"
-SRCREV_machine_qemux86 ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
-SRCREV_machine_qemux86-64 ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
-SRCREV_machine_qemumips64 ?= "fe1fab7061b8369deca03b2ec59f186bdbe2b8d9"
-SRCREV_machine ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
-SRCREV_meta ?= "8f8af5a3b1cd4ea4ec76e0db763efeb3807ad76c"
+SRCREV_machine_qemuarm ?= "df5844fa448e31927884d1850cfcc9bea981165c"
+SRCREV_machine_qemumips ?= "4ffaa6116722ced25c4f775990f445c353d5b8e9"
+SRCREV_machine_qemuppc ?= "db7c6be000d0a07d8b31561753c83ccbb4ae41ab"
+SRCREV_machine_qemux86 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
+SRCREV_machine_qemux86-64 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
+SRCREV_machine_qemumips64 ?= "fe0da5cbc516f7686af316cdeafaf7b7e8d34d7d"
+SRCREV_machine ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
+SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.10.28"
+LINUX_VERSION ?= "3.10.32"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/4 linux-yocto/3.4: update to v3.4.82 and latest LTSI

In reply to Bruce Ashfield

Updating the 3.4 tree to the 3.4.82 -stable update, and integrating the latest LTSI changes.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +4 -4
index 73fd3a930e91..ef380adafe8d 100644
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-LINUX_VERSION ?= "3.4.69"
+LINUX_VERSION ?= "3.4.82"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "f59ffc4762503e4d6eaa8d934dbf1464d966f51e"
-SRCREV_machine_qemuppc ?= "60a0fa3cf1a08778b70bf64e19f8733019e9abd7"
-SRCREV_meta ?= "f36797c2df3fbe9491c8ac5977fb691f4a75e9b7"
+SRCREV_machine ?= "74369c14c79dbb546ce1e387b1363e808ea4f5b1"
+SRCREV_machine_qemuppc ?= "71694a302cda24cc8a7c5f772e8306111ffcfb6c"
+SRCREV_meta ?= "8e88bf72b72afb3b638e751ea2a5c89394cc196b"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +3 -3
index 0b43dabd1c66..6ed19500e367 100644
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.4.69"
+LINUX_VERSION ?= "3.4.82"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "7f4d818b0450a5dc79f81b51dc7d13d0682b1287"
-SRCREV_meta ?= "f36797c2df3fbe9491c8ac5977fb691f4a75e9b7"
+SRCREV_machine ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb"
+SRCREV_meta ?= "8e88bf72b72afb3b638e751ea2a5c89394cc196b"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.4.bb +8 -8
index 765d4deec7ae..1a3ccdd7bd1f 100644
@@ -11,17 +11,17 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "38fe75106c5faa3ea49d0a285769de3d08478f90"
-SRCREV_machine_qemumips  ?= "67c8918ce3cfd66f19f23b46381993ff488b3fe0"
-SRCREV_machine_qemuppc ?= "0e81c96b36e05746ae978a830fe3dbdac8a51e58"
-SRCREV_machine_qemux86 ?= "7f4d818b0450a5dc79f81b51dc7d13d0682b1287"
-SRCREV_machine_qemux86-64 ?= "7f4d818b0450a5dc79f81b51dc7d13d0682b1287"
-SRCREV_machine ?= "7f4d818b0450a5dc79f81b51dc7d13d0682b1287"
-SRCREV_meta ?= "f36797c2df3fbe9491c8ac5977fb691f4a75e9b7"
+SRCREV_machine_qemuarm ?= "6c34763a9e4e05e1fcaa32d915bd05cccd0abc1d"
+SRCREV_machine_qemumips  ?= "fa9377eda8d2dceccb218f229551424c64ef0c28"
+SRCREV_machine_qemuppc ?= "85868d48f06911b7dddaf0180af96c8f2e874922"
+SRCREV_machine_qemux86 ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb"
+SRCREV_machine_qemux86-64 ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb"
+SRCREV_machine ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb"
+SRCREV_meta ?= "8e88bf72b72afb3b638e751ea2a5c89394cc196b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.4.69"
+LINUX_VERSION ?= "3.4.82"
 
 PR = "${INC_PR}.5"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.8.1.2
#4 lore raw

PATCH 4/4 linux-yocto/3.10: integrate latest LTSI changes

In reply to Bruce Ashfield

Integrating the latest 3.10 LTSI changes into the yocto tree.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 31ff0361c3c4..f0c732b4e7c6 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "a2475c1d9dc32b7171de28d196ace4a9df06edbd"
-SRCREV_machine_qemuppc ?= "84ab418469d7da9b710ce9e3cbc49e6fb9bd4e05"
+SRCREV_machine ?= "5f466af88f885705efe0f018c027b2631f6724e4"
+SRCREV_machine_qemuppc ?= "e497cba7496e4ae6fc4d018bce57695a61766d22"
 SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 34bb276527f1..2ceb946160b1 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.32"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
+SRCREV_machine ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
 SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +7 -7
index 55d46fa993d9..9bc873570ca0 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "df5844fa448e31927884d1850cfcc9bea981165c"
-SRCREV_machine_qemumips ?= "4ffaa6116722ced25c4f775990f445c353d5b8e9"
-SRCREV_machine_qemuppc ?= "db7c6be000d0a07d8b31561753c83ccbb4ae41ab"
-SRCREV_machine_qemux86 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
-SRCREV_machine_qemux86-64 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
-SRCREV_machine_qemumips64 ?= "fe0da5cbc516f7686af316cdeafaf7b7e8d34d7d"
-SRCREV_machine ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
+SRCREV_machine_qemuarm ?= "c295c53987007a5d0c87cc9b23125e9ff85900bd"
+SRCREV_machine_qemumips ?= "2833be8c96671b24a203a5dc45a21c38d5d841c3"
+SRCREV_machine_qemuppc ?= "cf413ddca8b974a473b72635e1499223a02d7949"
+SRCREV_machine_qemux86 ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
+SRCREV_machine_qemux86-64 ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
+SRCREV_machine_qemumips64 ?= "3e1899546c014808fed8d336b777bf8d81f50d7b"
+SRCREV_machine ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
 SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.8.1.2