Skip to contentSkip to conversation

linux-yocto/3.10: consolidated pull update

PATCH New Bruce Ashfield 1 participant 4 messages Sep 3, 2013

lore
Share & tools
lore
#0 lore raw

cover linux-yocto/3.10: consolidated pull update

Richard/Saul,

Now that 3.10 is getting some more eyes on it, we are getting a few bug reports. I've collected up this series of fixes and bumped to 3.10.10 to pick up more upstream fixes.

Of note, there's a 3.11 fix for the ssh problem, so once it makes 3.10 stable, I'll do more updates.

Cheers,

Bruce

The following changes since commit 755f7d9afaab4e7424f5f57587aa45df3807acf0:

pulseaudio: disable GTK+ by default (2013-09-02 18:04:59 +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 (3):
kernel-yocto: improve error checking on non-git repos linux-yocto/3.10: fix YAFFS2 build issues linux-yocto/3.10: update to v3.10.10

 meta/classes/kernel-yocto.bbclass                  |   13 ++++++++++++-
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |    6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      |   16 ++++++++--------
 4 files changed, 25 insertions(+), 14 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/3 kernel-yocto: improve error checking on non-git repos

While non-git kernel repos are not the preferred format for a kernel upstream, they are supported. Depending on the creator of the archive the expanded source directory name varies. If the recipe for the kernel doesn't properly set S to the right value, a cryptic git error message is produced. We can detect the situation and offer some advice on how to fix the issue.

A second check is also added in this commit for archive based kernel repos which won't have a SRCREV to validate. If we have no SRCREV or SRCREV is INVALID, we can exit the branch validation step immediately. This saves yet another cryptic git error message and simplifies a custom tgz based recipe.

---
 meta/classes/kernel-yocto.bbclass |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
meta/classes/kernel-yocto.bbclass +12 -1
index 26d449a..97a5fa7 100644
@@ -176,7 +176,17 @@ do_kernel_checkout() {
 		# case 3: we have no git repository at all. 
 		# To support low bandwidth options for building the kernel, we'll just 
 		# convert the tree to a git repo and let the rest of the process work unchanged
+		
+		# if ${S} hasn't been set to the proper subdirectory a default of "linux" is 
+		# used, but we can't initialize that empty directory. So check it and throw a
+		# clear error
+
 	        cd ${S}
+		if [ ! -f "Makefile" ]; then
+			echo "[ERROR]: S is not set to the linux source directory. Check "
+			echo "         the recipe and set S to the proper extracted subdirectory"
+			exit 1
+		fi
 		git init
 		git add .
 		git commit -q -m "baseline commit: creating repo for ${PN}-${PV}"
@@ -288,7 +298,8 @@ do_validate_branches() {
 	set +e
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
 	# check and we can exit early
-	if [ "${SRCREV_machine}" = "AUTOINC" ]; then
+	if [ "${SRCREV_machine}" = "AUTOINC" ] || "${SRCREV_machine}" = "INVALID" ] ||
+	   [ "${SRCREV_machine}" = "" ]; then
 		return
 	fi
 
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/3 linux-yocto/3.10: fix YAFFS2 build issues

In reply to Bruce Ashfield

The 3.10 yaffs2 refresh caused several build errors. One due the single kernel version support being incomplete, and two others due to core kernel changes creating incompatbilies with the yaffs2 code.

The following three commits fix the issues.

b76f445 yaffs2: disable procfs support
ecfe5ed yaffs2: convert to kuid_t and kgid_t fa8efc9 yaffs2: restore multi-kernel version functionality

bumping the SRCREVs for all BSPs to import the fix.

---
 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 cfcb711..797cad7 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 ?= "8a9b4902683f586f7d656c2e6747e314a5e1ed0e"
-SRCREV_machine_qemuppc ?= "655d20d4f64dc053b40ac8d8fe44b82dec5e130a"
+SRCREV_machine ?= "94e63f0640ef3680a605e82ee19f3de688f0ec59"
+SRCREV_machine_qemuppc ?= "2c0455935f1964ce69c70d0f7980a656040e50ea"
 SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
 
 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 5b84620..2d85537 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.9"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "7144bcc4b8091675bfcf1941479067857b6242da"
+SRCREV_machine ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
 SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +7 -7
index 7121881..b6d9eae 100644
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "24d53cd6ca4c3ae8f5dd2ff840f9275327d955ee"
-SRCREV_machine_qemumips  ?= "0480771238bb87031b79ecb1ee6bce7bfe6ffb1c"
-SRCREV_machine_qemuppc ?= "a9c383957f69e70fd2cb27d885160303a305cf57"
-SRCREV_machine_qemux86 ?= "7144bcc4b8091675bfcf1941479067857b6242da"
-SRCREV_machine_qemux86-64 ?= "7144bcc4b8091675bfcf1941479067857b6242da"
-SRCREV_machine_qemumips64 ?= "10a8db0603d7186633a6bf90e2308710763e718e"
-SRCREV_machine ?= "7144bcc4b8091675bfcf1941479067857b6242da"
+SRCREV_machine_qemuarm ?= "d8c48090a1272c69e009c4ef5fa675fc8db178cc"
+SRCREV_machine_qemumips  ?= "181188440e96896fbc69fa2c5ea5d2ee43304da0"
+SRCREV_machine_qemuppc ?= "c0a23bc4b4d6be3d2f09a81dfeb3456f51b8d439"
+SRCREV_machine_qemux86 ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
+SRCREV_machine_qemux86-64 ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
+SRCREV_machine_qemumips64 ?= "3a0d015e9908b69666c7f7780502aed4d115de1d"
+SRCREV_machine ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
 SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/3 linux-yocto/3.10: update to v3.10.10

In reply to Bruce Ashfield

Updating the BSP SRCREVs for the 3.10.10 korg -stable release.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |    6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      |   16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +3 -3
index 797cad7..a2e0310 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 ?= "94e63f0640ef3680a605e82ee19f3de688f0ec59"
-SRCREV_machine_qemuppc ?= "2c0455935f1964ce69c70d0f7980a656040e50ea"
+SRCREV_machine ?= "38793e629654f6b3e3f371a6b1f1745df26450f4"
+SRCREV_machine_qemuppc ?= "d4c836c55fce6f1a7f299bba2104f457b201c63d"
 SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.10.9"
+LINUX_VERSION ?= "3.10.10"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +2 -2
index 2d85537..8b3dbe0 100644
@@ -5,11 +5,11 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.10.9"
+LINUX_VERSION ?= "3.10.10"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
+SRCREV_machine ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
 SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +8 -8
index b6d9eae..1d29f6b 100644
@@ -3,18 +3,18 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "d8c48090a1272c69e009c4ef5fa675fc8db178cc"
-SRCREV_machine_qemumips  ?= "181188440e96896fbc69fa2c5ea5d2ee43304da0"
-SRCREV_machine_qemuppc ?= "c0a23bc4b4d6be3d2f09a81dfeb3456f51b8d439"
-SRCREV_machine_qemux86 ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
-SRCREV_machine_qemux86-64 ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
-SRCREV_machine_qemumips64 ?= "3a0d015e9908b69666c7f7780502aed4d115de1d"
-SRCREV_machine ?= "b76f4452b72080a538406abc9b290a5d811d61f8"
+SRCREV_machine_qemuarm ?= "6a38a13d2aa6058d7e7d88c3dc44b0bdfc4fe551"
+SRCREV_machine_qemumips  ?= "ad273773bee951fc63ab54f9fda672263bf919b4"
+SRCREV_machine_qemuppc ?= "677afd6cdbfb5c23a9e5479acafb7ba484789837"
+SRCREV_machine_qemux86 ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
+SRCREV_machine_qemux86-64 ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
+SRCREV_machine_qemumips64 ?= "6fdcd396b40373a63f57aeaf4fd59b4b4da05f8a"
+SRCREV_machine ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
 SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.10.9"
+LINUX_VERSION ?= "3.10.10"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
Signature · 1 line
1.7.10.4