linux-yocto: consolidated pull request
cover linux-yocto: consolidated pull request
Hi all,
Here is the latest round of linux-yocto related changes.
The first three are integrations of BSP patches/fixes, and a -stable update for 4.1. I've built and booted them here.
The only trick with the axxia BSP integration is that there's a branch rename for standard/preempt-rt to standard/preempt-rt base, so when I push the rename, builds of -rt won't be happy until the related recipe change merges to the tree. But otherwise, it is pretty standard stuff.
Khem noticed that in my quest to speed up and simplify the way that layers patch and configure the tree, that I went too far and broke multiple layers patching the tree.
So the final fix is a tweak to the tools to address that, which both Khem and I have tested.
Cheers,
bruce
The following changes since commit f78f90240a3041be426c6ba9085849352164ee8b:
bitbake: prserv/serv.py: Better messaging when starting/stopping the server with port=0 (2015-09-28 12:00:33 +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-rt/4.1: integrate axxia BSP
linux-yocto/4.1: update to 4.1.8 -stable
linux-yocto/4.1: braswell bug fixes
kern-tools: fix multi-layer patch application
.../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 ++++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/4 linux-yocto-rt/4.1: integrate axxia BSP
As part of the axxia preempt-rt integration, the preempt-rt branch now becomes standard/preempt-rt/base, to allow proper branch inheritance as: standard/preempt-rt/axxia/base.
No functional changes happen to the base -rt, just the default KBRANCH changes.
--- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +1 -1
@@ -1,4 +1,4 @@ -KBRANCH ?= "standard/preempt-rt" +KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc
Signature · 1 line
2.1.0
PATCH 2/4 linux-yocto/4.1: update to 4.1.8 -stable
In reply to Bruce AshfieldThere are some important fixes and CVEs in 4.1.8, so we update the SRCREVs to integrate the -stable changes.
--- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +3 -3
@@ -2,13 +2,13 @@ KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "eefb205d7ff4afc66a95fd06d31d4e69c3deec39" -SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba" +SRCREV_machine ?= "8a50af5664351a10657275e8f3196ae0aad04623" +SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" 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}" -LINUX_VERSION ?= "4.1.6" +LINUX_VERSION ?= "4.1.8" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +3 -3
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.1.6" +LINUX_VERSION ?= "4.1.8" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" -SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba" +SRCREV_machine ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.1.bb +10 -10
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "4f5c95b0f19a1c1a24cc6aba4ce77a09fe740c42" -SRCREV_machine_qemuarm64 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" -SRCREV_machine_qemumips ?= "fc6166e3ea7bb81c7285d3cfd79440cf054022f7" -SRCREV_machine_qemuppc ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" -SRCREV_machine_qemux86 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" -SRCREV_machine_qemux86-64 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" -SRCREV_machine_qemumips64 ?= "049105492e5657dd735bad1aa3a32f4f752a9edd" -SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" -SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba" +SRCREV_machine_qemuarm ?= "bbd539ee6f9c8e7871e9c55607dc15807e4da492" +SRCREV_machine_qemuarm64 ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_machine_qemumips ?= "8027a8514b7c56334ab2414b36f3eed751f1977d" +SRCREV_machine_qemuppc ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_machine_qemux86 ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_machine_qemux86-64 ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_machine_qemumips64 ?= "808d3efb9d8f94c0c5d3d316938679a7583f52ef" +SRCREV_machine ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" 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}" -LINUX_VERSION ?= "4.1.6" +LINUX_VERSION ?= "4.1.8" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
PATCH 3/4 linux-yocto/4.1: braswell bug fixes
In reply to Bruce AshfieldUpdating the 4.1 SRCREVs to integrate the following DRM backports:
a8abc111a96d drm/i915: Only wait for required lanes in vlv_wait_port_ready() 81354180432b Revert "drm/i915: Hack to tie both common lanes together on chv" d660fc117731 drm/i915: Work around DISPLAY_PHY_CONTROL register corruption on CHV 0e797e9cb717 drm/i915: Implement chv display PHY lane stagger setup
--- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +1 -1
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "8a50af5664351a10657275e8f3196ae0aad04623" +SRCREV_machine ?= "29257e529f968d17a5238624f27ddc76f759dc9d" SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +1 -1
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.8" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_machine ?= "a8abc111a96dd07a2884ebbba668ef8dec15f264" SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.1.bb +8 -8
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "bbd539ee6f9c8e7871e9c55607dc15807e4da492" -SRCREV_machine_qemuarm64 ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" -SRCREV_machine_qemumips ?= "8027a8514b7c56334ab2414b36f3eed751f1977d" -SRCREV_machine_qemuppc ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" -SRCREV_machine_qemux86 ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" -SRCREV_machine_qemux86-64 ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" -SRCREV_machine_qemumips64 ?= "808d3efb9d8f94c0c5d3d316938679a7583f52ef" -SRCREV_machine ?= "cf940efcae03adea9f17be3a21406f7a2a385b72" +SRCREV_machine_qemuarm ?= "c92614c6b90f8ab1202b20cc843a9782c9f8f8d5" +SRCREV_machine_qemuarm64 ?= "a8abc111a96dd07a2884ebbba668ef8dec15f264" +SRCREV_machine_qemumips ?= "6b4b777e8467f01b00c4494ffedf1e9134bc52c5" +SRCREV_machine_qemuppc ?= "a8abc111a96dd07a2884ebbba668ef8dec15f264" +SRCREV_machine_qemux86 ?= "a8abc111a96dd07a2884ebbba668ef8dec15f264" +SRCREV_machine_qemux86-64 ?= "a8abc111a96dd07a2884ebbba668ef8dec15f264" +SRCREV_machine_qemumips64 ?= "90222ca39af5a3252fcba24baec341140e9e7c07" +SRCREV_machine ?= "a8abc111a96dd07a2884ebbba668ef8dec15f264" SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
Signature · 1 line
2.1.0
PATCH 4/4 kern-tools: fix multi-layer patch application
In reply to Bruce AshfieldUpdating the kern-tools SRCREV to import the following fix:
kgit-meta: resume after last applied patch
When the auto-resume (resume point detection) was removed from the processing of a meta-series, it ignored the fact that a single patch series may in fact be processed a number of times.
Two layers patching a kernel will generate two different runs on the same branch, which always start at patch one. This will obviously break with duplicate patches.
To avoid this, we simply track the last patch applied, and explicitly
tell the patch scripts where to start. This gets us resume functionality, without the overhead of resume point detection.
--- 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
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c DEPENDS = "git-native" -SRCREV = "b7642a7c3f685850ffbb961313e6a593adb05370" +SRCREV = "1fb91c2965193df894089fbcbcafe3bf775c21fd" PR = "r12" PV = "0.2+git${SRCPV}"
Signature · 1 line
2.1.0
Re: [PATCH 4/4] kern-tools: fix multi-layer patch application
Quoted 33 lines · Bruce Ashfield
Updating the kern-tools SRCREV to import the following fix:
kgit-meta: resume after last applied patch
When the auto-resume (resume point detection) was removed from the processing of a meta-series, it ignored the fact that a single patch series may in fact be processed a number of times.
Two layers patching a kernel will generate two different runs on the same branch, which always start at patch one. This will obviously break with duplicate patches.
To avoid this, we simply track the last patch applied, and explicitly
tell the patch scripts where to start. This gets us resume functionality, without the overhead of resume point detection.Signed-off-by Bruce Ashfield <[email protected]>---
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 +0
-0@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70cDEPENDS = "git-native"
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
Quoted 2 lines
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1
-1-SRCREV = "b7642a7c3f685850ffbb961313e6a593adb05370" +SRCREV = “1fb91c2965193df894089fbcbcafe3bf775c21fd"
this works well now.
Quoted 11 lines
PR = "r12"
PV = "0.2+git${SRCPV}"--
2.1.0--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core