linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 5 messages Jun 26, 2013

lore

Share & tools

lore

Bruce Ashfield

author

2013-06-26 13:40 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Here's a collection of four patches that I've queued in the past few days. My normal smoke testing passed here.

These are a collection of version refreshes, and configuration changes. Nothing major. Once these are merged, the stage is set for more 1.5 development items.

Everything is pretty self explanitory, or was discussed on the mailing list, so I'll keep it to a summary here. Let me know if there are any concerns.

[PATCH 1/4] linux-yocto/3.4: allow kernel feature _appends to be overriden [PATCH 2/4] linux-yocto/3.8: add USB screen configuration and net sched options [PATCH 3/4] linux-yocto/3.4: ltsi: sync to LTSI commit 5f05247ed [PATCH 4/4] linux-yocto-dev: bump version to 3.10+

Cheers,

Bruce

The following changes since commit 8e9501ffa8726d69412d669580d787ffedb88d34:

populate_sdk_base, adt_installer: abort install if path contains spaces (2013-06-25 17:59: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 (4):
linux-yocto/3.4: allow kernel feature _appends to be overriden linux-yocto/3.8: add USB screen configuration and net sched options linux-yocto/3.4: ltsi: sync to LTSI commit 5f05247ed
linux-yocto-dev: bump version to 3.10+

 meta/recipes-kernel/linux/linux-yocto-dev.bb      |    2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    4 ++--
 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |   17 +++++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.8.bb      |    2 +-
 7 files changed, 16 insertions(+), 15 deletions(-)

Signature · 1 line

1.7.10.4

Bruce Ashfield

author

2013-06-26 13:40 UTC #1 lore raw

PATCH 1/4 linux-yocto/3.4: allow kernel feature _appends to be overriden

Updating the linux-yocto 3.4 recipe's feature flags to match the 3.8 recipe, which has the following change:

It was pointed out that the current way the KERNEL_FEATURES variable is appended in the base linux-yocto recipe doesn't allow the appended features to be prevented in a layer without using python code and a recipe finalize hook.

To allow easier overriding of 'extra' or 'optional' features that are defined in the linux-yocto recipe, we create a KERNEL_EXTRA_FEATURES variable. This variable can be set in a layer to define extra features or cleared to prevent the recipe's extra features from being appended to the core functionality.

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

---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

meta/recipes-kernel/linux/linux-yocto_3.4.bb +3 -2

index 9d6d8c7..ade96be 100644
@@ -23,7 +23,8 @@ KMETA = "meta"
 COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
 
 # Functionality flags
-KERNEL_FEATURES_append = " features/netfilter/netfilter.scc"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc"
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
+KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
 KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
 KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"

Signature · 1 line

1.7.10.4

Bruce Ashfield

author

2013-06-26 13:40 UTC #2 lore raw

PATCH 2/4 linux-yocto/3.8: add USB screen configuration and net sched options

In reply to Bruce Ashfield

Bumping the meta branch SRCREV for the followiong commits:

meta: enable additional NET_SCHED options

This change turns on NET_ACT_MIRRED (packet redirecting and mirroring) and NET_CLS_U32 (universal 32bit comparisons w/ hashing classification).

Signed-off-by Michael Barabanov <[email protected]>

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

meta: add BSP-specific touchscreen support

Add touchscreen-composite support to machines based on common-pc and common-pc-64, along with several other Atom boards that don't inherit from those, thus providing those machines with the out-of-the-box ability to make use of the set of USB touchscreen devices supported by the composite USB driver.

Signed-off-by Tom Zanussi <[email protected]>

meta: add usb/touchscreen-composite feature

Add support for the 'composite' USB touchscreen driver.

Signed-off-by Tom Zanussi <[email protected]>

meta: add features/input/touchscreen

Add a feature enabling basic support for touchscreen input devices.

Signed-off-by Tom Zanussi <[email protected]>

Signed-off-by Michael Barabanov <[email protected]>

Signed-off-by Tom Zanussi <[email protected]>

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

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

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +1 -1

index a3001ac..c4f187f 100644
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56"
 SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337"
-SRCREV_meta ?= "c0851dfb8535635e1e31d4a5146d3f021e30506c"
+SRCREV_meta ?= "f121c06ae8e2c517399c145f68ad7f2ee754f1cc"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index d9cc82a..5c8447f 100644
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.8.13"
 KMETA = "meta"
 
 SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "c0851dfb8535635e1e31d4a5146d3f021e30506c"
+SRCREV_meta ?= "f121c06ae8e2c517399c145f68ad7f2ee754f1cc"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index cf5b96d..a7107e8 100644
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "698eada61d9385b42dd117858b943655b565084b"
 SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
 SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
 SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "c0851dfb8535635e1e31d4a5146d3f021e30506c"
+SRCREV_meta ?= "f121c06ae8e2c517399c145f68ad7f2ee754f1cc"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.7.10.4

Bruce Ashfield

author

2013-06-26 13:40 UTC #3 lore raw

PATCH 3/4 linux-yocto/3.4: ltsi: sync to LTSI commit 5f05247ed

In reply to Bruce Ashfield

Updating the 3.4 branches to the latest LTSI baseline.

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

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

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

index d9a894a..1655da8 100644
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "a4a8406d906163dcdab2d29420a9bc46668fc8d9"
-SRCREV_machine_qemuppc ?= "0c20eafa8b950b1180f1701ba45026ea5e713482"
+SRCREV_machine ?= "2a1d3b50a2889587d0fed92ccb09051a9e300735"
+SRCREV_machine_qemuppc ?= "0168221d2c818898b69890624e1aacbb8ec1aea9"
 SRCREV_meta ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac"
 
 PR = "${INC_PR}.1"

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

index 0955846..b69d9d5 100644
@@ -12,7 +12,7 @@ LINUX_VERSION ?= "3.4.46"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868"
+SRCREV_machine ?= "778950f1e0b5c5af7e92c43220c3c4f4e3324cb5"
 SRCREV_meta ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac"
 
 PR = "${INC_PR}.1"

meta/recipes-kernel/linux/linux-yocto_3.4.bb +6 -6

index ade96be..ae10448 100644
@@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "7054a5db2c1869e0e0b294459fc4770113a8df52"
-SRCREV_machine_qemumips  ?= "46b3cf22c01e40ef035b78f0542a9007aa0cf507"
-SRCREV_machine_qemuppc ?= "1f2475ab9eefbb479c8a481475ddb3043d47b74a"
-SRCREV_machine_qemux86 ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868"
-SRCREV_machine_qemux86-64 ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868"
-SRCREV_machine ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868"
+SRCREV_machine_qemuarm ?= "ccc8f93d42a56511b8867ff3eeba76290309bc2c"
+SRCREV_machine_qemumips  ?= "23607b7f3ca690d62a43c58b8358fa5b75c55b2a"
+SRCREV_machine_qemuppc ?= "d48004092883cfdee8a5092b375ac635742c39cb"
+SRCREV_machine_qemux86 ?= "778950f1e0b5c5af7e92c43220c3c4f4e3324cb5"
+SRCREV_machine_qemux86-64 ?= "778950f1e0b5c5af7e92c43220c3c4f4e3324cb5"
+SRCREV_machine ?= "778950f1e0b5c5af7e92c43220c3c4f4e3324cb5"
 SRCREV_meta ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.7.10.4

Bruce Ashfield

author

2013-06-26 13:40 UTC #4 lore raw

PATCH 4/4 linux-yocto-dev: bump version to 3.10+

In reply to Bruce Ashfield

The linux-yocto-dev kernel is at 3.10-rcX, so we should bump the version to reflect reality.

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

---
 meta/recipes-kernel/linux/linux-yocto-dev.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-kernel/linux/linux-yocto-dev.bb +1 -1

index 598c82c..c2ce3f6 100644
@@ -33,7 +33,7 @@ python () {
         d.setVar("SRCREV_meta", "${AUTOREV}")
 }
 
-LINUX_VERSION ?= "3.8+"
+LINUX_VERSION ?= "3.10+"
 LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.10.4