linux-yocto: 1.7 updates

PATCH New Bruce Ashfield 1 participant 4 messages Oct 13, 2014

lore

Share & tools

lore

Bruce Ashfield

author

2014-10-13 03:54 UTC #0 lore raw

cover linux-yocto: 1.7 updates

Richard (and patch collecting folks),

Here is what may be the final tweaks that are appropriate for the 1.7 release. I'm holding other changes until after the release (like setting the qemu default kernel to be v3.17 again, and korg -stable updates), since time is short.

What we have here are:

- The update to the full v3.17 release
- A fix for compilation issues in v3.10
- A branch validation fix which was breaking the yocto BSP AUTOREV builds

I've built and booted my kernel-dev image, as well as build and booting sato for the qemu* machines.

Grab what you like from the series.

Cheers,

Bruce

The following changes since commit ccf5a4d2342c4fd40e4e0b332ea7e34e0bf175d4:

build-appliance-image: Update to dizzy head revision (2014-10-11 08:11:17 +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):
linux-yocto/3.10: 8250/8250_dw: fix compile failure due to
stable/Yocto conflict
linux-yocto/3.17: v3.17 release and config
kernel-yocto: fix branch validation for AUTOREV, non machine_meta
kernels

 meta/classes/kernel-yocto.bbclass                  | 14 ++++++++------
 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-tiny_3.17.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
 meta/recipes-kernel/linux/linux-yocto_3.17.bb      | 18 +++++++++---------
 6 files changed, 30 insertions(+), 28 deletions(-)

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-13 03:54 UTC #1 lore raw

PATCH 1/3 linux-yocto/3.10: 8250/8250_dw: fix compile failure due to stable/Yocto conflict

Updating the SRCREVs for the following fix:

8250/8250_dw: fix compile failure due to stable/Yocto conflict

As of merge 60a9d9fc565e4503dbb8705803e83d906afc4ad2, "Merge tag 'v3.10.48' into standard/base" the 8250_dw.c fails to compile due to an undeclared variable.

This happens because stable brought in:

-------------------------
commit 6d5e79331417886196cb3a733bdb6645ba85bc42
Author: Tim Kryger <[email protected]>
Date: Tue Oct 1 10:18:08 2013 -0700

serial: 8250_dw: Improve unwritable LCR workaround

commit c49436b657d0a56a6ad90d14a7c3041add7cf64d upstream.

[...]

[wangnan: backport to 3.10.43:
- adjust context
- remove unneeded local var]

Signed-off-by Wang Nan <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

------------------------

...which deletes the p->private_data declaration since it became unused at that point, however in Yocto, we also have this:

-----------------------
commit 0e02b050c3cafbcbf9952125089a27e02d6ecea9
Author: David Daney <[email protected]>
Date: Wed Jun 19 20:37:27 2013 +0000

tty/8250_dw: Add support for OCTEON UARTS.

[...]

Signed-off-by Ralf Baechle <[email protected]>

(cherry picked from commit d5f1af7ece96cf52e0b110c72210ac15c2f65438)

Signed-off-by Darren Hart <[email protected]>

-----------------------

...which _adds_ another user of the p->private_data.

Here we restore the declaration in order that 8250_dw compiles.

Signed-off-by Ong Boon Leong <[email protected]>

[PG: add root cause info to commit log.]

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

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

---
 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 10759720580c..ad55a2ed8082 100644
@@ -3,8 +3,8 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "0abce5181274dbf37788ab8d2c62e135defd9956"
-SRCREV_machine_qemuppc ?= "c31f38edf5dec2c295632199dbfe3f5a221f7c16"
+SRCREV_machine ?= "cbaa8c8b83a7da70b94cc6cc1a25090071af4c3f"
+SRCREV_machine_qemuppc ?= "41338ab2a1c19435e24bbd162ff6b3f8b90d7afa"
 SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e"
 
 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 a53ce544a39b..9e33aa692b63 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.55"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "8e055f3b669c65e83ba7128c248c632eedafad72"
+SRCREV_machine ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
 SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index ea6985659598..e612d36e28d0 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 ?= "a4195791d27ef50feb454765149ea34621ef8ed7"
-SRCREV_machine_qemumips ?= "ff747b3dff7dfa643b3447a348b901cacc5b6a16"
-SRCREV_machine_qemuppc ?= "46e30d608f4268b0ea77362398aae91f1d410ee3"
-SRCREV_machine_qemux86 ?= "8e055f3b669c65e83ba7128c248c632eedafad72"
-SRCREV_machine_qemux86-64 ?= "8e055f3b669c65e83ba7128c248c632eedafad72"
-SRCREV_machine_qemumips64 ?= "42457c568170cb11a9011382ebca4677f22b35c1"
-SRCREV_machine ?= "8e055f3b669c65e83ba7128c248c632eedafad72"
+SRCREV_machine_qemuarm ?= "9c8da40f662806406940decf972841c1b86895a5"
+SRCREV_machine_qemumips ?= "96adff9ce54c009ba90c3ddcaa6d16beb7a9c2b3"
+SRCREV_machine_qemuppc ?= "cf3a9a021e2abb3b19807b2ba3c29c1d0918730b"
+SRCREV_machine_qemux86 ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
+SRCREV_machine_qemux86-64 ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
+SRCREV_machine_qemumips64 ?= "89ab3082e01c4d98f9d14630aa904dba641c5373"
+SRCREV_machine ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
 SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e"
 
 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

Bruce Ashfield

author

2014-10-13 03:54 UTC #2 lore raw

PATCH 2/3 linux-yocto/3.17: v3.17 release and config

In reply to Bruce Ashfield

Updating the SRCREVs to incoroprate the full 3.17 release, and also updating the meta data to match the v3.17 content:

9ba007f8d0ab meta: bump kver to v3.17-final
5c6c5fe9b0bf config: remove CONFIG_HOTPLUG
0ceecad5f15a qemu: explicitly include usb configuration fragments f6c78ada8655 gfx: convert CONFIG_TABLET_USB_WACOM to CONFIG_HID_USB_WACOM cd1dbedfa3c9 x86: Support 32 bit binaries

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 eae08540e6e0..77855d956e9d 100644
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "3.17-rc7"
+LINUX_VERSION ?= "3.17"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36"
-SRCREV_meta ?= "84b57b01050dd9e5a004e265e70120e2a792f38a"
+SRCREV_machine ?= "1a6dd1205de5b7c6135a42fec00550738ff777b5"
+SRCREV_meta ?= "9ba007f8d0abf3cc5499e8eee13065b7f0713e81"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index 02f10a3aaf0f..3838dbfa57a5 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 ?= "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"
+SRCREV_machine_qemuarm ?= "e86f70699655d1f5bf2518c8dcdb949a39161c86"
+SRCREV_machine_qemumips ?= "0acaa5991a61fbab0d897157049ac2e638e9c7bf"
+SRCREV_machine_qemuppc ?= "50e33fec112527de12c2833cd8a283dd4a75ae33"
+SRCREV_machine_qemux86 ?= "1a6dd1205de5b7c6135a42fec00550738ff777b5"
+SRCREV_machine_qemux86-64 ?= "1a6dd1205de5b7c6135a42fec00550738ff777b5"
+SRCREV_machine_qemumips64 ?= "c0558aaa8251a022447a4ac782d4e707401c52d3"
+SRCREV_machine ?= "1a6dd1205de5b7c6135a42fec00550738ff777b5"
+SRCREV_meta ?= "9ba007f8d0abf3cc5499e8eee13065b7f0713e81"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.17-rc7"
+LINUX_VERSION ?= "3.17"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-10-13 03:54 UTC #3 lore raw

PATCH 3/3 kernel-yocto: fix branch validation for AUTOREV, non machine_meta kernels

In reply to Bruce Ashfield

The simplication of do_validate_branches missed a case where a custom kernel can supply SRCREV="${AUTOREV}", and not use SRCREV_machine at all.

In this case, we will incorrectly try and test the tree for a non-existent commit, and break the build.

By simplying the condition of the check to look for an empty SRCREV_machine, we can skip manipulating the tree and testing for a SRCREV.

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

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

meta/classes/kernel-yocto.bbclass +8 -6

index 7718f9ab1b58..e672a0e3a5aa 100644
@@ -288,12 +288,14 @@ do_validate_branches() {
 	# check and we can exit early
 	if [ "${machine_srcrev}" = "AUTOINC" ]; then
 		bbnote "SRCREV validation is not required for AUTOREV"
-	elif [ "${machine_srcrev}" = "" ] && [ "${SRCREV}" != "AUTOINC" ]; then
-		# SRCREV_machine_<MACHINE> was not set. This means that a custom recipe
-		# that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In
-		# this case, we need to reset to the give SRCREV before heading to patching
-		bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}"
-		force_srcrev="${SRCREV}"
+	elif [ "${machine_srcrev}" = "" ]; then
+		if [ "${SRCREV}" != "AUTOINC" ]; then
+		       # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe
+		       # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In
+		       # this case, we need to reset to the give SRCREV before heading to patching
+		       bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}"
+		       force_srcrev="${SRCREV}"
+		fi
 	else
 		git cat-file -t ${machine_srcrev} > /dev/null
 		if [ $? -ne 0 ]; then

Signature · 1 line

1.8.1.2