Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 3 messages Sep 18, 2015

lore
Share & tools
lore
#0 lore raw

cover linux-yocto: consolidated pull request

Hi all,

It's a rather small 'consolidated' pull request, but there are some other fixes I'm working on that I just couldn't get done in time for this request .. so I'm not going to sit on these two any longer.

The changes to 4.1 are patches we've received to fix the build of some filsystems (yaffs2, aufs) for the updated kernel, as well as some bluetooth and driver support changes.

Note: the kern-tools update is required for the linux-4.1 update to work

The changes to the tools address YOCTO #7282, as well as speeding up the overall patch process. The change is simple, the tools no longer audit the series to ensure that you are building every patch that is referenced in the series. They now only consider patches that are in addition to the changes that are part of the tree's meta data .. i.e. patches that are in the SRC_URI. That removes significant looping and validation, as well unexpected resume points and 'skipped' patches.

Cheers,

Bruce

The following changes since commit 5b4e380b9b4335f4607d78d97345bbbda4c66e0e:

bitbake: data_smart: Ensure OVERRIDES dependencies account for contains() (2015-09-18 15:14:04 +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 (2):
linux-yocto/4.1: aufs, yaffs2 and driver fixes
kern-tools: optimize patching peformance

 .../recipes-kernel/kern-tools/kern-tools-native_git.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb        |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb      |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.1.bb           | 18 +++++++++---------
 4 files changed, 14 insertions(+), 14 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/2 linux-yocto/4.1: aufs, yaffs2 and driver fixes

Updating the 4.1 SRCREVs to integrate the following changes:

f830ab33799d aufs: call mutex.owner only when DEBUG_MUTEXES or MUTEX_SPIN_ON_OWNER is defined 87df2e93ed65 Bluetooth: Delay check for conn->smp in smp_conn_security() b09c3eab3e50 cc2520: set the default fifo pin value from platform data 62b01c325d42 fs/yaffs2: Fix a judgement logic for ACL operations
1d19c4e95cfc yaffs2: remove read and write methods
2c822dbc43b9 yaffs2: replace f_dentry to f_path.dentry

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +2 -2
index 06483c3ee8b9..7265cde3fa83 100644
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
-SRCREV_meta ?= "429f9e2ff0649b8c9341345622545d874d5e303a"
+SRCREV_machine ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_meta ?= "ef417dc3dbac098e2273b9157bf7ea8b1ade0ec5"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +2 -2
index 061205e92088..b0619702f7a1 100644
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.6"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
-SRCREV_meta ?= "429f9e2ff0649b8c9341345622545d874d5e303a"
+SRCREV_machine ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_meta ?= "ef417dc3dbac098e2273b9157bf7ea8b1ade0ec5"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_4.1.bb +9 -9
index 46d46165b359..d974842810e9 100644
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "3c1245d162ccb55de1af42bcf3dbf690457bf9e4"
-SRCREV_machine_qemuarm64 ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
-SRCREV_machine_qemumips ?= "4132a691d0908d10b8f07ce7ece02e6dc94e17bc"
-SRCREV_machine_qemuppc ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
-SRCREV_machine_qemux86 ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
-SRCREV_machine_qemux86-64 ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
-SRCREV_machine_qemumips64 ?= "033e1aa633465449edf544eb81adda0caf16ec60"
-SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
-SRCREV_meta ?= "429f9e2ff0649b8c9341345622545d874d5e303a"
+SRCREV_machine_qemuarm ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_machine_qemuarm64 ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_machine_qemumips ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_machine_qemuppc ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_machine_qemux86 ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_machine_qemux86-64 ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_machine_qemumips64 ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_machine ?= "f830ab33799d6e0b5433c18c5c6c3c68dce17815"
+SRCREV_meta ?= "ef417dc3dbac098e2273b9157bf7ea8b1ade0ec5"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
Signature · 1 line
2.1.0
#2 lore raw

PATCH 2/2 kern-tools: optimize patching peformance

In reply to Bruce Ashfield

Updating the kern-tools SRCREV to integrat the following commit:

patching: only validate user supplied patches by default

Previously the patching tools would consider both system and user supplied patches in the same manner .. they are simply a series of patches to be applied to a branch, and that the scripts should determine where in the series to start (based on what is already on the branch).

This detection was causing a few problems:

- time consuming
- starting in the middle of a series when intermediate patches were merged to a branch.

To solve both the performance and start detection, we instead simply note the transition from system (i.e. already defined features and series) and user/recipe supplied patches. When the transition is noted, the system will start pushing ALL patches without doing autoresume detection.

Control in keeping the series up to date is passed to the user, and consistent behaviour/performance is achieved.

---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1
index 4753094aa40c..27df02ab7a44 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native"
 
-SRCREV = "bd144d43ca5b1eaf9e727bced4ce3b61b642297c"
+SRCREV = "b7642a7c3f685850ffbb961313e6a593adb05370"
 PR = "r12"
 PV = "0.2+git${SRCPV}"
 
Signature · 1 line
2.1.0