kernel: version updates
v2 cover kernel: version updates
Richard,
Here are the pending series of kernel updates. I've kept the commits to the granulatary that I did the version bumps, since they represent known good working points in time.
Nothing too exciting, these are standard kernel -stable updates (and the typical lttng build fix for a tracepoint changing).
The only item of note is that the 3.14 tree now has LTSI content merged into a dedicated branch and also into all BSPs.
I've built this everywhere that I can, and I still have more builds running, but there's no sense sitting on this longer .. so I'm sending it out now, and will monitor for any issues that pop up.
Changelog:
v1 -> v2: updated the pull request to have the contrib branch, and one
new commit on linux-yocto_3.14's meta branch (LTSI bug fix)
Cheers,
Bruce
The following changes since commit 88dfcbf149dda89277e58ae4ec3a87500624cfff:
kernel-yocto: make sure git tags get dereferenced properly in do_patch() (2014-12-10 08:12:56 -0500)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib HEAD
for you to fetch changes up to 4be985be419f06f18c735d72ac4a4d00fea71dd8:
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates (2014-12-10 08:38:49 -0500)
Bruce Ashfield (9):
linux-yocto/3.17: update to v3.17.1
linux-libc-headers: update to 3.17
linux-yocto/3.17: update to v3.17.2
linux-yocto/3.10: update to v3.10.59
linux-yocto/3.14: update to v3.14.24
lttng-modules: fix mm_compaction_isolate_template build linux-yocto/3.17: update to v3.17.6
linux-yocto/3.10: update to v3.10.62
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
meta/conf/distro/include/tcmode-default.inc | 2 +- .../linux-libc-headers/linux-libc-headers_3.16.bb | 7 ---- .../linux-libc-headers/linux-libc-headers_3.17.bb | 7 ++++ meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 8 ++--- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 8 ++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 18 +++++----- meta/recipes-kernel/linux/linux-yocto_3.14.bb | 18 +++++----- meta/recipes-kernel/linux/linux-yocto_3.17.bb | 18 +++++----- ...-fix-mm_compaction_isolate_template-build.patch | 41 ++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb | 1 + 13 files changed, 94 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.17.bb create mode 100644 meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch
Signature · 1 line
2.1.0
PATCH v2 1/9 linux-yocto/3.17: update to v3.17.1
Updating to the kver to the latest korg stable update. This fixes some important bugs (as well as the usual mix of more minor ones), in particular libata bugs and SSD corruption issues are fixed.
--- 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
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "3.17" +LINUX_VERSION ?= "3.17.1" KMETA = "meta" -SRCREV_machine ?= "1a6dd1205de5b7c6135a42fec00550738ff777b5" -SRCREV_meta ?= "9ba007f8d0abf3cc5499e8eee13065b7f0713e81" +SRCREV_machine ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" +SRCREV_meta ?= "229ce533868773f201f9ab36e2b4248b381309ec" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.17.bb +9 -9
@@ -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 ?= "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" +SRCREV_machine_qemuarm ?= "6b57ab98e37cda3b4a4cd50483a43e053ae73d1b" +SRCREV_machine_qemumips ?= "80b24085b50144088cdfca737b5925a15ae9e312" +SRCREV_machine_qemuppc ?= "12a5e6b10d6d34878f26592160ff64668b021ab4" +SRCREV_machine_qemux86 ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" +SRCREV_machine_qemux86-64 ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" +SRCREV_machine_qemumips64 ?= "3b77b2d556103b86f787913385a7655b92adcc03" +SRCREV_machine ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" +SRCREV_meta ?= "229ce533868773f201f9ab36e2b4248b381309ec" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.17" +LINUX_VERSION ?= "3.17.1" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
PATCH v2 2/9 linux-libc-headers: update to 3.17
In reply to Bruce Ashfield--- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb | 7 ------- meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.17.bb | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.17.bb
meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -27,7 +27,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.24" GLIBCVERSION ?= "2.20" UCLIBCVERSION ?= "0.9.33+git%" -LINUXLIBCVERSION ?= "3.16" +LINUXLIBCVERSION ?= "3.17" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb deleted +0 -7
@@ -1,7 +0,0 @@ -KORG_ARCHIVE_COMPRESSION = "xz" - -require linux-libc-headers.inc - -SRC_URI[md5sum] = "5c569ed649a0c9711879f333e90c5386" -SRC_URI[sha256sum] = "4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0" -
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.17.bb new file +7 -0
@@ -0,0 +1,7 @@ +KORG_ARCHIVE_COMPRESSION = "xz" + +require linux-libc-headers.inc + +SRC_URI[md5sum] = "fb30d0f29214d75cddd2faa94f73d5cf" +SRC_URI[sha256sum] = "f5153ec93c5fcd41b247950e6a9bcbc63fa87beafd112c133a622439a0f76251" +
Signature · 1 line
2.1.0
Re: [PATCH 2/9] linux-libc-headers: update to 3.17
meta/conf/distro/include/tcmode-default.inc SDKGCCVERSION ?= "${GCCVERSION}" · line 30
Quoted 4 lines · Bruce Ashfield
meta/conf/distro/include/tcmode-default.inc +1
-1-LINUXLIBCVERSION ?= "3.16" +LINUXLIBCVERSION ?= "3.17"
So this is causing (at least) socat to fail to build as the configure script does a test for a working <linux/errqueue.h> but that is now failing:
/data/poky-master/tmp/sysroots/nuc/usr/include/linux/errqueue.h:33:18:
error: array type has incomplete element type
Line 33 is this member in a struct:
struct timespec ts[3];
Presumably everything else that includes that header also includes something that defines struct timespec. Socat has a missing feature check so whilst the configure test says that linux/errqueue.h isn't present and continues, the build then fails. Presumably the user-space linux/errqueue.h needs another #include?
Ross
Re: [PATCH 2/9] linux-libc-headers: update to 3.17
Quoted 16 lines · Ross
On 10 December 2014 at 14:16, Bruce Ashfield <[email protected] <mailto:[email protected]>> wrote:
-LINUXLIBCVERSION ?= "3.16" +LINUXLIBCVERSION ?= "3.17"So this is causing (at least) socat to fail to build as the configure script does a test for a working <
linux/errqueue.h> but that is now failing:/data/poky-master/tmp/sysroots/nuc/usr/include/linux/errqueue.h:33:18:
error: array type has incomplete element typeLine 33 is this member in a struct:
Quoted 7 lines
struct timespec ts[3];Presumably everything else that includes that header also includes something that defines struct timespec. Socat has a missing feature check so whilst the configure test says that
linux/errqueue.hisn't present and continues, the build then fails. Presumably the user-spacelinux/errqueue.hneeds another #include?
This is unlikely to be fixed in the kernel header, but in the applications themselves.
In this case, I see no changes to errqueue.h itself since 2012, but the uapi did go through some changes in 3.17 .. but then no more changes for 3.18.
So if this is broken, socat should be breaking on every distro that uses 3.17+ kernel headers.
I see that our socat is still the latest.
.. and a quick search shows a fix:
Did you want me to try a build and stack up the fix ?
Bruce
Quoted 2 lines
Ross
Re: [PATCH 2/9] linux-libc-headers: update to 3.17
Quoted 39 lines · Bruce Ashfield
Quoted 19 lines · Ross
On 10 December 2014 at 14:16, Bruce Ashfield <[email protected] <mailto:[email protected]>> wrote:
-LINUXLIBCVERSION ?= "3.16" +LINUXLIBCVERSION ?= "3.17"So this is causing (at least) socat to fail to build as the configure script does a test for a working <
linux/errqueue.h> but that is now failing:/data/poky-master/tmp/sysroots/nuc/usr/include/linux/errqueue.h:33:18:
error: array type has incomplete element typeLine 33 is this member in a struct:
Quoted 7 lines
struct timespec ts[3];Presumably everything else that includes that header also includes something that defines struct timespec. Socat has a missing feature check so whilst the configure test says that
linux/errqueue.hisn't present and continues, the build then fails. Presumably the user-spacelinux/errqueue.hneeds another #include?This is unlikely to be fixed in the kernel header, but in the applications themselves.
In this case, I see no changes to
errqueue.hitself since 2012, but the uapi did go through some changes in 3.17 .. but then no more changes for 3.18.So if this is broken, socat should be breaking on every distro that uses 3.17+ kernel headers.
Quoted 7 lines
I see that our socat is still the latest.
.. and a quick search shows a fix:
Did you want me to try a build and stack up the fix ?
I can confirm that this fixes things here. I'll send the patch shortly (once I spruce up
the header).
Bruce
Quoted 16 lines
Bruce
Quoted 2 lines
Ross
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 2/9] linux-libc-headers: update to 3.17
In reply to Bruce AshfieldQuoted 8 lines · Bruce Ashfield
This is unlikely to be fixed in the kernel header, but in the applications themselves.
In this case, I see no changes to
errqueue.hitself since 2012, but the uapi did go through some changes in 3.17 .. but then no more changes for 3.18.
It seems odd that kernel headers can't be included without the caller having to include other headers.
I worry that this is just a workaround in one recipe for a test that is failing in other recipes with the 3.17 headers... doing a clean build to see if I'm being over-cautious or not. :)
Ross
Re: [PATCH 2/9] linux-libc-headers: update to 3.17
Quoted 5 lines · Ross
I worry that this is just a workaround in one recipe for a test that is failing in other recipes with the 3.17 headers... doing a clean build to see if I'm being over-cautious or not. :)
For what it's worth, socat appears to be the only recipe in oe-core that has a configure-time check for errqueue directly, according to grep errqueue tmp/work/*/*/*/temp/log.do_configure.
Ross
PATCH v2 3/9 linux-yocto/3.17: update to v3.17.2
In reply to Bruce AshfieldUpdating to the korg 3.17.2 -stable release.
--- 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
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "3.17.1" +LINUX_VERSION ?= "3.17.2" KMETA = "meta" -SRCREV_machine ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" -SRCREV_meta ?= "229ce533868773f201f9ab36e2b4248b381309ec" +SRCREV_machine ?= "cad8f6f70717e54604315db0c9b8889199871e50" +SRCREV_meta ?= "3283372105ee2f22c1d93ea63fa754179c203e98" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.17.bb +9 -9
@@ -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 ?= "6b57ab98e37cda3b4a4cd50483a43e053ae73d1b" -SRCREV_machine_qemumips ?= "80b24085b50144088cdfca737b5925a15ae9e312" -SRCREV_machine_qemuppc ?= "12a5e6b10d6d34878f26592160ff64668b021ab4" -SRCREV_machine_qemux86 ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" -SRCREV_machine_qemux86-64 ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" -SRCREV_machine_qemumips64 ?= "3b77b2d556103b86f787913385a7655b92adcc03" -SRCREV_machine ?= "0caf16d38536e3dec8a02ea657e1960f1216f174" -SRCREV_meta ?= "229ce533868773f201f9ab36e2b4248b381309ec" +SRCREV_machine_qemuarm ?= "6d85563640cf2377d702637150ea8314ae915350" +SRCREV_machine_qemumips ?= "bfc1ee46ed29b1bac18deef51620536c66fa83c5" +SRCREV_machine_qemuppc ?= "f4c541bbad8b2a119f86fdc86d3a9d4b8546218b" +SRCREV_machine_qemux86 ?= "cad8f6f70717e54604315db0c9b8889199871e50" +SRCREV_machine_qemux86-64 ?= "cad8f6f70717e54604315db0c9b8889199871e50" +SRCREV_machine_qemumips64 ?= "d6f80d8d30197a278cd386f987998a85e9754a40" +SRCREV_machine ?= "cad8f6f70717e54604315db0c9b8889199871e50" +SRCREV_meta ?= "3283372105ee2f22c1d93ea63fa754179c203e98" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.17.1" +LINUX_VERSION ?= "3.17.2" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
PATCH v2 4/9 linux-yocto/3.10: update to v3.10.59
In reply to Bruce AshfieldUpdating to the latest 3.10 -korg stable update. We also bring in a meta change for the valley island IO configuration.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +4 -4
@@ -3,13 +3,13 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "cbaa8c8b83a7da70b94cc6cc1a25090071af4c3f" -SRCREV_machine_qemuppc ?= "41338ab2a1c19435e24bbd162ff6b3f8b90d7afa" -SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" +SRCREV_machine ?= "38885f87b7240587194597c3658ba2c0ac5960e7" +SRCREV_machine_qemuppc ?= "535a7403beabe9c4aa394a1f9efa755eb33966c8" +SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" -LINUX_VERSION ?= "3.10.55" +LINUX_VERSION ?= "3.10.59" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +3 -3
@@ -5,12 +5,12 @@ require recipes-kernel/linux/linux-yocto.inc LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" -LINUX_VERSION ?= "3.10.55" +LINUX_VERSION ?= "3.10.59" KMETA = "meta" -SRCREV_machine ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9" -SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" +SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" +SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +9 -9
@@ -10,18 +10,18 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -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" +SRCREV_machine_qemuarm ?= "896f87d1003331d7a307c9f855cdbb78c9a2a033" +SRCREV_machine_qemumips ?= "9e616945464ab97a050da96a025d88c809d05144" +SRCREV_machine_qemuppc ?= "692b2de590668de2e15461879cf9301a0e6fedf6" +SRCREV_machine_qemux86 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" +SRCREV_machine_qemux86-64 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" +SRCREV_machine_qemumips64 ?= "d237cab9f483ea512ded4ea311902763c1a3ae68" +SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" +SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.10.55" +LINUX_VERSION ?= "3.10.59" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
PATCH v2 5/9 linux-yocto/3.14: update to v3.14.24
In reply to Bruce Ashfield--- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_3.14.bb | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +4 -4
@@ -3,13 +3,13 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "0a875ce52aa7a42ddabdb87038074381bb268e77" -SRCREV_machine_qemuppc ?= "b993661d41f08846daa28b14f89c8ae3e94225bd" -SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" +SRCREV_machine ?= "baad552ea168dc31db31f0be188edefaa28a4aec" +SRCREV_machine_qemuppc ?= "db4221ed2e1c6c617ad07d3374f630bbb59cf8b5" +SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" -LINUX_VERSION ?= "3.14.19" +LINUX_VERSION ?= "3.14.24" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +3 -3
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "3.14.19" +LINUX_VERSION ?= "3.14.24" KMETA = "meta" -SRCREV_machine ?= "902f34d36102a4b2008b776ecae686f80d307e12" -SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" +SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" +SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.14.bb +9 -9
@@ -10,18 +10,18 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "127b621f2a4d3b1111e24423c12fac001e047c1c" -SRCREV_machine_qemumips ?= "c3b9f1b2397f0847ab4844d1cdb8e02574434d78" -SRCREV_machine_qemuppc ?= "73e2411cdd91764d0601c0869857f53381c2a177" -SRCREV_machine_qemux86 ?= "e19a1b40de44e756defdfb40349342d8037609bd" -SRCREV_machine_qemux86-64 ?= "902f34d36102a4b2008b776ecae686f80d307e12" -SRCREV_machine_qemumips64 ?= "1c4d70272dde4b695697dd8705a031420480f712" -SRCREV_machine ?= "902f34d36102a4b2008b776ecae686f80d307e12" -SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" +SRCREV_machine_qemuarm ?= "b768ebfe28a20b65aba734b9f6646a3fa0adc89b" +SRCREV_machine_qemumips ?= "c76146e6c8a015c1225141fc55d867a3e47453c6" +SRCREV_machine_qemuppc ?= "e54ab8451c482b695ff7a0c580ef2fb1be605299" +SRCREV_machine_qemux86 ?= "146fcb1dd7b3c5547d67f04d50b082f0723741e9" +SRCREV_machine_qemux86-64 ?= "c100e8665052051487a17169748c457829d3f88c" +SRCREV_machine_qemumips64 ?= "71621ee758600abd3cf7187d7a8e7d51f4052c53" +SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" +SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.14.19" +LINUX_VERSION ?= "3.14.24" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
PATCH v2 6/9 lttng-modules: fix mm_compaction_isolate_template build
In reply to Bruce Ashfieldlinux-stable integrated the 3.16 commit f8c9301fa5a2a [mm/compaction: do not count migratepages when unnecessary] with the 3.14.25 update.
So we have to update the lttng-module linux version codes to use the new definition in builds greater than 3.14.24 or 3.16.
--- ...-fix-mm_compaction_isolate_template-build.patch | 41 ++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch
meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch new file +41 -0
@@ -0,0 +1,41 @@ +From af48c7b08de4b811d3d974e65e362b86ce8c4a34 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <[email protected]> +Date: Wed, 10 Dec 2014 03:19:28 -0500 +Subject: [PATCH] compaction: fix mm_compaction_isolate_template build + +linux-stable integrated the 3.16 commit f8c9301fa5a2a [mm/compaction: do +not count migratepages when unnecessary] with the 3.14.25 update. + +So we have to update the lttng-module linux version codes to use the +new definition in builds greater than 3.14.24 or 3.16. + +Signed-off-by: Bruce Ashfield <[email protected]> +--- + instrumentation/events/lttng-module/compaction.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h +index 22024e9ee582..07afbe06f1a6 100644 +--- a/instrumentation/events/lttng-module/compaction.h ++++ b/instrumentation/events/lttng-module/compaction.h +@@ -46,7 +46,7 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages, + TP_ARGS(nr_scanned, nr_taken) + ) + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) + TRACE_EVENT(mm_compaction_migratepages, + + TP_PROTO(unsigned long nr_all, +@@ -87,7 +87,7 @@ TRACE_EVENT(mm_compaction_migratepages, + __entry->nr_migrated, + __entry->nr_failed) + ) +-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) */ + TRACE_EVENT(mm_compaction_migratepages, + + TP_PROTO(unsigned long nr_migrated, +-- +2.1.0 +
meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb +1 -0
@@ -23,6 +23,7 @@ SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \ file://Update-statedump-to-3.17-nsproxy-locking.patch \ file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \ file://fix_build_with_v3.17_kernel.patch \ + file://compaction-fix-mm_compaction_isolate_template-build.patch \ " export INSTALL_MOD_DIR="kernel/lttng-modules"
Signature · 1 line
2.1.0
PATCH v2 7/9 linux-yocto/3.17: update to v3.17.6
In reply to Bruce AshfieldIntegrating the latest korg -stable update for v3.17
--- 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
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "3.17.2" +LINUX_VERSION ?= "3.17.6" KMETA = "meta" -SRCREV_machine ?= "cad8f6f70717e54604315db0c9b8889199871e50" -SRCREV_meta ?= "3283372105ee2f22c1d93ea63fa754179c203e98" +SRCREV_machine ?= "5ff54d8fbf74278e9e5074cbba516a14f0915ff7" +SRCREV_meta ?= "b81030f9ec2de3dc6c048e142dcbff62e305cc40" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.17.bb +9 -9
@@ -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 ?= "6d85563640cf2377d702637150ea8314ae915350" -SRCREV_machine_qemumips ?= "bfc1ee46ed29b1bac18deef51620536c66fa83c5" -SRCREV_machine_qemuppc ?= "f4c541bbad8b2a119f86fdc86d3a9d4b8546218b" -SRCREV_machine_qemux86 ?= "cad8f6f70717e54604315db0c9b8889199871e50" -SRCREV_machine_qemux86-64 ?= "cad8f6f70717e54604315db0c9b8889199871e50" -SRCREV_machine_qemumips64 ?= "d6f80d8d30197a278cd386f987998a85e9754a40" -SRCREV_machine ?= "cad8f6f70717e54604315db0c9b8889199871e50" -SRCREV_meta ?= "3283372105ee2f22c1d93ea63fa754179c203e98" +SRCREV_machine_qemuarm ?= "a1183153c56ace9f9140c73ce730ec181f78dc0f" +SRCREV_machine_qemumips ?= "18c8db2009f25524a29a5258d041e0442c10817d" +SRCREV_machine_qemuppc ?= "6d2bbdac0e6560542fa2252d91eee9ae0f17f9c7" +SRCREV_machine_qemux86 ?= "5ff54d8fbf74278e9e5074cbba516a14f0915ff7" +SRCREV_machine_qemux86-64 ?= "5ff54d8fbf74278e9e5074cbba516a14f0915ff7" +SRCREV_machine_qemumips64 ?= "2306cb2dd019c8b731879331ba314035a7271e7b" +SRCREV_machine ?= "5ff54d8fbf74278e9e5074cbba516a14f0915ff7" +SRCREV_meta ?= "b81030f9ec2de3dc6c048e142dcbff62e305cc40" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.17.2" +LINUX_VERSION ?= "3.17.6" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
PATCH v2 8/9 linux-yocto/3.10: update to v3.10.62
In reply to Bruce AshfieldUpdating to the latest korg -stable update for the 3.10 series. Minor merge conflict resolution was done with the standard/ltsi and standard/preempt-rt branches.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +4 -4
@@ -3,13 +3,13 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "38885f87b7240587194597c3658ba2c0ac5960e7" -SRCREV_machine_qemuppc ?= "535a7403beabe9c4aa394a1f9efa755eb33966c8" -SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" +SRCREV_machine ?= "94a79d98e40b51466600fb3375ad2908c38dd192" +SRCREV_machine_qemuppc ?= "c1dcbac7751652784f180fdb91f87bc37fba8c52" +SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" -LINUX_VERSION ?= "3.10.59" +LINUX_VERSION ?= "3.10.62" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +3 -3
@@ -5,12 +5,12 @@ require recipes-kernel/linux/linux-yocto.inc LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" -LINUX_VERSION ?= "3.10.59" +LINUX_VERSION ?= "3.10.62" KMETA = "meta" -SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" +SRCREV_machine ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +9 -9
@@ -10,18 +10,18 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "896f87d1003331d7a307c9f855cdbb78c9a2a033" -SRCREV_machine_qemumips ?= "9e616945464ab97a050da96a025d88c809d05144" -SRCREV_machine_qemuppc ?= "692b2de590668de2e15461879cf9301a0e6fedf6" -SRCREV_machine_qemux86 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_machine_qemux86-64 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_machine_qemumips64 ?= "d237cab9f483ea512ded4ea311902763c1a3ae68" -SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" +SRCREV_machine_qemuarm ?= "f6b075991c91b7c2bb641b389757863e2fd34b8c" +SRCREV_machine_qemumips ?= "48afdc632312b6cc26fe7bca151cfb66b2ebc308" +SRCREV_machine_qemuppc ?= "cf35ea9ac92153858dadd2f4ab71cccd3a1fa26b" +SRCREV_machine_qemux86 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_machine_qemux86-64 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_machine_qemumips64 ?= "ebdb374ca5130ef456d0baf75b6fe7a242932d0d" +SRCREV_machine ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.10.59" +LINUX_VERSION ?= "3.10.62" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
PATCH v2 9/9 linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
In reply to Bruce AshfieldUpdating the 3.14 tree to the latest korg 3.14.26, as well as integrating 3.14 LTSI content, and refreshing preempt-rt. Minor conflict resolutions were performed between ltsi, stable and -rt
--- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.14.bb | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +3 -3
@@ -3,9 +3,9 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "baad552ea168dc31db31f0be188edefaa28a4aec" -SRCREV_machine_qemuppc ?= "db4221ed2e1c6c617ad07d3374f630bbb59cf8b5" -SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" +SRCREV_machine ?= "7f0712d10247ffca8e48e944f49707bcf9117ead" +SRCREV_machine_qemuppc ?= "8bed2a975d491c963cff56496f7e35f5bcff926f" +SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +2 -2
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14.24" KMETA = "meta" -SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" -SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" +SRCREV_machine ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c" +SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.14.bb +8 -8
@@ -10,14 +10,14 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b768ebfe28a20b65aba734b9f6646a3fa0adc89b" -SRCREV_machine_qemumips ?= "c76146e6c8a015c1225141fc55d867a3e47453c6" -SRCREV_machine_qemuppc ?= "e54ab8451c482b695ff7a0c580ef2fb1be605299" -SRCREV_machine_qemux86 ?= "146fcb1dd7b3c5547d67f04d50b082f0723741e9" -SRCREV_machine_qemux86-64 ?= "c100e8665052051487a17169748c457829d3f88c" -SRCREV_machine_qemumips64 ?= "71621ee758600abd3cf7187d7a8e7d51f4052c53" -SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" -SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" +SRCREV_machine_qemuarm ?= "6166316d47b859aa38bfecc61f4808828af03937" +SRCREV_machine_qemumips ?= "4ececcc09c6550a0896728163907e729d817c2fd" +SRCREV_machine_qemuppc ?= "1cc5b09f8bb7f40b289d149d370c62dcc8109501" +SRCREV_machine_qemux86 ?= "38cd560d5022ed2dbd1ab0dca9642e47c98a0aa1" +SRCREV_machine_qemux86-64 ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c" +SRCREV_machine_qemumips64 ?= "737272b1dfd361d9ea19812a9717e2798e3c4576" +SRCREV_machine ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c" +SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
2.1.0
Quoted 10 lines · Bruce Ashfield
The following changes since commit
88dfcbf149dda89277e58ae4ec3a87500624cfff:kernel-yocto: make sure git tags get dereferenced properly in
do_patch()
(2014-12-10 08:12:56 -0500)are available in the git repository at:
git://git.pokylinux.org/poky-contribHEAD
I wonder what happened here!
Quoted 5 lines
for you to fetch changes up to
4be985be419f06f18c735d72ac4a4d00fea71dd8:linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
(2014-12-10 08:38:49 -0500)
That's zedd/kernel-updates, right?
Ross
Quoted 10 lines · Ross
Quoted 7 lines · Bruce Ashfield
The following changes since commit
88dfcbf149dda89277e58ae4ec3a87500624cfff:kernel-yocto: make sure git tags get dereferenced properly in
do_patch()
(2014-12-10 08:12:56 -0500)
Quoted 6 lines
Quoted 3 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribHEADI wonder what happened here!
@#!$#@$ the script is insane.
Quoted 10 lines
Quoted 6 lines
for you to fetch changes up to
4be985be419f06f18c735d72ac4a4d00fea71dd8:linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
(2014-12-10 08:38:49 -0500)That's zedd/kernel-updates, right?
Yah. Sorry about the confusion,
Bruce
Quoted 8 lines
Ross
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Quoted 24 lines · Bruce Ashfield
Quoted 10 lines · Ross
Quoted 7 lines · Bruce Ashfield
The following changes since commit
88dfcbf149dda89277e58ae4ec3a87500624cfff:kernel-yocto: make sure git tags get dereferenced properly in
do_patch()
(2014-12-10 08:12:56 -0500)Quoted 6 lines
Quoted 3 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribHEADI wonder what happened here!
@#!$#@$ the script is insane.Quoted 4 lines
Quoted 4 lines
for you to fetch changes up to
4be985be419f06f18c735d72ac4a4d00fea71dd8:
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
(2014-12-10 08:38:49 -0500)That's zedd/kernel-updates, right?
Yah. Sorry about the confusion,
I've been experimenting, the upgrades look good but we have a problem with the new kernel class changes.
The issue is that if you have an existing TMPDIR, the build will do "bad things".
Basically, there is usually an existing sstate manifest file which covers the kernel source in the sysroot. do_configure will trigger cleaning of that manifest, a large chunk of the source disappears and then the build understandably fails.
Whilst I can say what is happening, I can't say how we fix it at this point :/.
I would like people to test these patches, we'd better hold off merging until we can get this issue figured out. Its part of a wider problem with "stale" data in the sysroot which we really need to figure out but its not been solved yet as its a very hard problem for which we don't have a solution :(.
Cheers,
Richard
Quoted 45 lines · Richard Purdie
Quoted 24 lines · Bruce Ashfield
Quoted 10 lines · Ross
Quoted 7 lines · Bruce Ashfield
The following changes since commit
88dfcbf149dda89277e58ae4ec3a87500624cfff:kernel-yocto: make sure git tags get dereferenced properly in
do_patch()
(2014-12-10 08:12:56 -0500)Quoted 6 lines
Quoted 3 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribHEADI wonder what happened here!
@#!$#@$ the script is insane.Quoted 4 lines
Quoted 4 lines
for you to fetch changes up to
4be985be419f06f18c735d72ac4a4d00fea71dd8:Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
(2014-12-10 08:38:49 -0500)That's zedd/kernel-updates, right?
Yah. Sorry about the confusion,
I've been experimenting, the upgrades look good but we have a problem with the new kernel class changes.
The issue is that if you have an existing TMPDIR, the build will do "bad things".
Basically, there is usually an existing sstate manifest file which covers the kernel source in the sysroot.
do_configurewill trigger cleaning of that manifest, a large chunk of the source disappears and then the build understandably fails.
Quoted 8 lines
Whilst I can say what is happening, I can't say how we fix it at this point :/.
I would like people to test these patches, we'd better hold off merging until we can get this issue figured out. Its part of a wider problem with "stale" data in the sysroot which we really need to figure out but its not been solved yet as its a very hard problem for which we don't have a solution :(.
After quite some thinking, I've come up with the patch below which should at least allow us to get this patch series merged. Obviously I need to split this up and send it out properly with a decent commit log but I thought I'd share it sooner than later.
Cheers,
Richard
From 2495650e76bdee971645b3049b6e65307e506e09 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Thu, 11 Dec 2014 14:36:05 +0000
Subject: sanity: TMPDIR ABI change for kernel process
meta-yocto/conf/distro/poky.conf +1 -1
@@ -94,7 +94,7 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "8" +OELAYOUT_ABI = "10" # add poky sanity bbclass INHERIT += "poky-sanity"
meta/classes/sanity.bbclass +10 -0
@@ -519,6 +519,16 @@ def sanity_handle_abichanges(status, d): status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n") elif (abi != current_abi and current_abi == "9"): status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n") + elif (abi != current_abi and current_abi == "10" and (abi == "8" or abi == "9")): + bb.note("Converting staging layout from version 8/9 to layout version 10") + cmd = d.expand("grep -l sysroot-providers/virtual_kernel ${SSTATE_MANIFESTS}/*") + ret, result = oe.utils.getstatusoutput(cmd) + result = result.split() + for f in result: + bb.note("Uninstalling manifest file %s" % f) + sstate_clean_manifest(f, d) + with open(abifile, "w") as f: + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi))
meta/conf/abi_version.conf +1 -1
@@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "9" +OELAYOUT_ABI = "10"
Quoted 55 lines · Richard Purdie
Quoted 45 lines · Richard Purdie
Quoted 24 lines · Bruce Ashfield
Quoted 10 lines · Ross
Quoted 7 lines · Bruce Ashfield
The following changes since commit
88dfcbf149dda89277e58ae4ec3a87500624cfff:kernel-yocto: make sure git tags get dereferenced properly in
do_patch()
(2014-12-10 08:12:56 -0500)Quoted 6 lines
Quoted 3 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribHEADI wonder what happened here!
@#!$#@$ the script is insane.Quoted 4 lines
Quoted 4 lines
for you to fetch changes up to
4be985be419f06f18c735d72ac4a4d00fea71dd8:Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
(2014-12-10 08:38:49 -0500)That's zedd/kernel-updates, right?
Yah. Sorry about the confusion,
I've been experimenting, the upgrades look good but we have a problem with the new kernel class changes.
The issue is that if you have an existing TMPDIR, the build will do "bad things".
Basically, there is usually an existing sstate manifest file which covers the kernel source in the sysroot.
do_configurewill trigger cleaning of that manifest, a large chunk of the source disappears and then the build understandably fails.Quoted 8 lines
Whilst I can say what is happening, I can't say how we fix it at this point :/.
I would like people to test these patches, we'd better hold off merging until we can get this issue figured out. Its part of a wider problem with "stale" data in the sysroot which we really need to figure out but its not been solved yet as its a very hard problem for which we don't have a solution :(.
Quoted 4 lines
After quite some thinking, I've come up with the patch below which should at least allow us to get this patch series merged. Obviously I need to split this up and send it out properly with a decent commit log but I thought I'd share it sooner than later.
Nice. I'll stack it on here and let it sit through my kernel builds and jumping between versions .. that tends to break what can be broken.
On a related note, I have a one line update to a patch that fixes the qemuppc build (missing directory).
Do we want to leave the series as is, and I can send it as an incremental patch, or would you rather it squashed and the branches updated ?
Bruce
Quoted 59 lines
Cheers,
Richard
From
2495650e76bdee971645b3049b6e65307e506e09Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Thu, 11 Dec 2014 14:36:05 +0000
Subject: sanity: TMPDIR ABI change for kernel processSigned-off-by Richard Purdie <[email protected]>meta-yocto/conf/distro/poky.conf +1
-1@@ -94,7 +94,7 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "8" +OELAYOUT_ABI = "10" # add poky sanity bbclass INHERIT += "poky-sanity"meta/classes/sanity.bbclass +10
-0@@ -519,6 +519,16 @@ def sanity_handle_abichanges(status, d): status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n") elif (abi != current_abi and current_abi == "9"): status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n") + elif (abi != current_abi and current_abi == "10" and (abi == "8" or abi == "9")): + bb.note("Converting staging layout from version 8/9 to layout version 10") + cmd = d.expand("grep -l sysroot-providers/virtual_kernel ${SSTATE_MANIFESTS}/*") + ret, result = oe.utils.getstatusoutput(cmd) + result = result.split() + for f in result: + bb.note("Uninstalling manifest file %s" % f) + sstate_clean_manifest(f, d) + with open(abifile, "w") as f: + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi))meta/conf/abi_version.conf +1
-1@@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "9" +OELAYOUT_ABI = "10"
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Quoted 3 lines · Bruce Ashfield
Do we want to leave the series as is, and I can send it as an incremental patch, or would you rather it squashed and the branches updated ?
Squash and re-push would be best.
Cheers,
Ross
Quoted 9 lines · Ross
Quoted 3 lines · Bruce Ashfield
Do we want to leave the series as is, and I can send it as an incremental patch, or would you rather it squashed and the branches updated ?
Squash and re-push would be best.
Done. Both the zedd/kernel and zedd/kernel-updates are repushed with the patches merged.
Bruce
Quoted 3 lines
Cheers,
Ross
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Quoted 55 lines · Richard Purdie
Quoted 45 lines · Richard Purdie
Quoted 24 lines · Bruce Ashfield
Quoted 10 lines · Ross
Quoted 7 lines · Bruce Ashfield
The following changes since commit
88dfcbf149dda89277e58ae4ec3a87500624cfff:kernel-yocto: make sure git tags get dereferenced properly in
do_patch()
(2014-12-10 08:12:56 -0500)Quoted 6 lines
Quoted 3 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribHEADI wonder what happened here!
@#!$#@$ the script is insane.Quoted 4 lines
Quoted 4 lines
for you to fetch changes up to
4be985be419f06f18c735d72ac4a4d00fea71dd8:Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
(2014-12-10 08:38:49 -0500)That's zedd/kernel-updates, right?
Yah. Sorry about the confusion,
I've been experimenting, the upgrades look good but we have a problem with the new kernel class changes.
The issue is that if you have an existing TMPDIR, the build will do "bad things".
Basically, there is usually an existing sstate manifest file which covers the kernel source in the sysroot.
do_configurewill trigger cleaning of that manifest, a large chunk of the source disappears and then the build understandably fails.Quoted 8 lines
Whilst I can say what is happening, I can't say how we fix it at this point :/.
I would like people to test these patches, we'd better hold off merging until we can get this issue figured out. Its part of a wider problem with "stale" data in the sysroot which we really need to figure out but its not been solved yet as its a very hard problem for which we don't have a solution :(.
Quoted 5 lines
After quite some thinking, I've come up with the patch below which should at least allow us to get this patch series merged. Obviously I need to split this up and send it out properly with a decent commit log but I thought I'd share it sooner than later.
I tried this on an old romley build and got this:
I then switched to nuc using the same tmpdir and that kernel built fine.
Note that the romley build uses the 3.10 kernel and the nuc build uses the 3.17 kernel - I don't know if that could account for the difference, or if it was more due to the fact that I did the romley build first and then the nuc, and if I'd done it in the reverse order it would have been the nuc failing instead. Or something else...
Tom
Quoted 58 lines
Cheers,
Richard
From
2495650e76bdee971645b3049b6e65307e506e09Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Thu, 11 Dec 2014 14:36:05 +0000
Subject: sanity: TMPDIR ABI change for kernel processSigned-off-by Richard Purdie <[email protected]>meta-yocto/conf/distro/poky.conf +1
-1@@ -94,7 +94,7 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "8" +OELAYOUT_ABI = "10" # add poky sanity bbclass INHERIT += "poky-sanity"meta/classes/sanity.bbclass +10
-0@@ -519,6 +519,16 @@ def sanity_handle_abichanges(status, d): status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n") elif (abi != current_abi and current_abi == "9"): status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n") + elif (abi != current_abi and current_abi == "10" and (abi == "8" or abi == "9")): + bb.note("Converting staging layout from version 8/9 to layout version 10") + cmd = d.expand("grep -l sysroot-providers/virtual_kernel ${SSTATE_MANIFESTS}/*") + ret, result = oe.utils.getstatusoutput(cmd) + result = result.split() + for f in result: + bb.note("Uninstalling manifest file %s" % f) + sstate_clean_manifest(f, d) + with open(abifile, "w") as f: + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi))meta/conf/abi_version.conf +1
-1@@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "9" +OELAYOUT_ABI = "10"
Quoted 66 lines · Tom Zanussi
Quoted 55 lines · Richard Purdie
Quoted 45 lines · Richard Purdie
Quoted 24 lines · Bruce Ashfield
Quoted 10 lines · Ross
Quoted 7 lines · Bruce Ashfield
The following changes since commit
88dfcbf149dda89277e58ae4ec3a87500624cfff:kernel-yocto: make sure git tags get dereferenced properly in
do_patch()
(2014-12-10 08:12:56 -0500)Quoted 6 lines
Quoted 3 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribHEADI wonder what happened here!
@#!$#@$ the script is insane.Quoted 4 lines
Quoted 4 lines
for you to fetch changes up to
4be985be419f06f18c735d72ac4a4d00fea71dd8:Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
(2014-12-10 08:38:49 -0500)That's zedd/kernel-updates, right?
Yah. Sorry about the confusion,
I've been experimenting, the upgrades look good but we have a problem with the new kernel class changes.
The issue is that if you have an existing TMPDIR, the build will do "bad things".
Basically, there is usually an existing sstate manifest file which covers the kernel source in the sysroot.
do_configurewill trigger cleaning of that manifest, a large chunk of the source disappears and then the build understandably fails.Quoted 8 lines
Whilst I can say what is happening, I can't say how we fix it at this point :/.
I would like people to test these patches, we'd better hold off merging until we can get this issue figured out. Its part of a wider problem with "stale" data in the sysroot which we really need to figure out but its not been solved yet as its a very hard problem for which we don't have a solution :(.
Quoted 5 lines
After quite some thinking, I've come up with the patch below which should at least allow us to get this patch series merged. Obviously I need to split this up and send it out properly with a decent commit log but I thought I'd share it sooner than later.
I tried this on an old romley build and got this:
Quoted 8 lines
I then switched to nuc using the same tmpdir and that kernel built fine.
Note that the romley build uses the 3.10 kernel and the nuc build uses the 3.17 kernel - I don't know if that could account for the difference, or if it was more due to the fact that I did the romley build first and then the nuc, and if I'd done it in the reverse order it would have been the nuc failing instead. Or something else...
So, when I switched back to the romley machine and tried again, the kernel built without error. But..
I went back and reproduced the starting point, which I'll post here to make it easy for anyone to reproduce, using the following commits:
poky: f19b4e995ea47f9243f152b39337330307453c9f
meta-intel: a72da6350e7a77256ad597e8e8c40909590a2a40
And verified the romley case again, and also saw the same thing with nuc, which uses the 3.17 kernel. In both cases the build failed and the kernel source directory was empty e.g.:
/usr/local/dev/yocto/isg-test/build/tmp/sysroots/romley/usr/src/kernel
Switching to romley built fine, and switching back after that the nuc kernel built fine again, and the kernel source dirs were populated in both cases.
Below is the output from the nuc build:
[trz@medianoche build]$ bitbake virtual/kernel
NOTE: Converting staging layout from version 8/9 to layout version 10
NOTE: Uninstalling manifest
file /usr/local/dev/yocto/isg-test/build/tmp/sstate-control/manifest-nuc-linux-yocto.populate_sysroot Parsing recipes: 100% | ##############################################################| Time:
00:00:19
Parsing of 916 .bb files complete (0 cached, 916 parsed). 1314 targets,
46 skipped, 0 masked, 0 errors.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "1.25.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "Fedora-20" TARGET_SYS = "x86_64-poky-linux" MACHINE = "nuc" DISTRO = "poky" DISTRO_VERSION = "1.7" TUNE_FEATURES = "m64 corei7" TARGET_FPU = ""
meta
meta-yocto
meta-yocto-bsp =
"zedd-kernel-updates0:3554105e81a2084f23cae9fef8db8c7a1c4f7c04" meta-intel
meta-crownbay
meta-nuc
meta-romley = "master20:a72da6350e7a77256ad597e8e8c40909590a2a40"
NOTE: Preparing RunQueue
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
ERROR: Function failed: do_kernel_checkout (log file is located
at /usr/local/dev/yocto/isg-test/build/tmp/work/corei7-64-intel-common-poky-linux/linux-yocto/3.17.1+gitAUTOINC+b86dd5c6f4_0caf16d385-r0/temp/log.do_kernel_checkout.9225)
ERROR: Logfile of failure stored
in: /usr/local/dev/yocto/isg-test/build/tmp/work/corei7-64-intel-common-poky-linux/linux-yocto/3.17.1+gitAUTOINC+b86dd5c6f4_0caf16d385-r0/temp/log.do_kernel_checkout.9225 Log data follows:
| DEBUG: Executing shell function do_kernel_checkout | ERROR: S is not set to the linux source directory. Check | ERROR: the recipe and set S to the proper extracted subdirectory |
WARNING: /usr/local/dev/yocto/isg-test/build/tmp/work/corei7-64-intel-common-poky-linux/linux-yocto/3.17.1+gitAUTOINC+b86dd5c6f4_0caf16d385-r0/temp/run.do_kernel_checkout.9225:1 exit 1 from
| exit 1
| ERROR: Function failed: do_kernel_checkout (log file is located
at /usr/local/dev/yocto/isg-test/build/tmp/work/corei7-64-intel-common-poky-linux/linux-yocto/3.17.1+gitAUTOINC+b86dd5c6f4_0caf16d385-r0/temp/log.do_kernel_checkout.9225)
ERROR: Task 1
(/usr/local/dev/yocto/isg-test/meta/recipes-kernel/linux/linux-yocto_3.17.bb, do_kernel_checkout) failed with exit code '1'
NOTE: Tasks Summary: Attempted 69 tasks of which 58 didn't need to be
rerun and 1 failed.
Waiting for 0 running tasks to finish:
Summary: 1 task failed:
/usr/local/dev/yocto/isg-test/meta/recipes-kernel/linux/linux-yocto_3.17.bb, do_kernel_checkout
Summary: There was 1 ERROR message shown, returning a non-zero exit
code.
Quoted 61 lines
Tom
Quoted 58 lines
Cheers,
Richard
From
2495650e76bdee971645b3049b6e65307e506e09Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Thu, 11 Dec 2014 14:36:05 +0000
Subject: sanity: TMPDIR ABI change for kernel processSigned-off-by Richard Purdie <[email protected]>meta-yocto/conf/distro/poky.conf +1
-1@@ -94,7 +94,7 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "8" +OELAYOUT_ABI = "10" # add poky sanity bbclass INHERIT += "poky-sanity"meta/classes/sanity.bbclass +10
-0@@ -519,6 +519,16 @@ def sanity_handle_abichanges(status, d): status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n") elif (abi != current_abi and current_abi == "9"): status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n") + elif (abi != current_abi and current_abi == "10" and (abi == "8" or abi == "9")): + bb.note("Converting staging layout from version 8/9 to layout version 10") + cmd = d.expand("grep -l sysroot-providers/virtual_kernel ${SSTATE_MANIFESTS}/*") + ret, result = oe.utils.getstatusoutput(cmd) + result = result.split() + for f in result: + bb.note("Uninstalling manifest file %s" % f) + sstate_clean_manifest(f, d) + with open(abifile, "w") as f: + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi))meta/conf/abi_version.conf +1
-1@@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "9" +OELAYOUT_ABI = "10"