kernel-yocto: consolidated pull request
cover kernel-yocto: consolidated pull request
Richard/Saul,
While I continue to battle with gcc 4.8, I've got a collection of other fixes that don't need to wait. Here's part of those pending changes.
- Remove the yocto 3.2 kernel, early in the Yocto 1.5 cycle as promised
- Fix the reported issues with linux-yocto-custom recipes by restricting NFSD kernel feature requirements to full linux-yocto kernels
- Refresh the 3.4 and 3.8 kernels with stable updates
- Fix a kernel feature processing bug reported with some of the Intel BSPs
Cheers,
Bruce
The following changes since commit 647db80298da0a8da212449fdd80d318773eacef:
hicolor-icon-theme: keep inherited dependencies and switch to gnomebase (2013-05-30 22:31:37 +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: remove 3.2 kernel recipes
qemu*: restrict NFSD to linux-yocto only
linux-yocto: v3.8.13 and v3.4.46
kern-tools: expand kernel features that point to a directory name
meta/conf/machine/include/qemu.inc | 2 +- .../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 29 ----------------- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 8 ++--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 8 ++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb | 26 --------------- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 33 -------------------- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 16 +++++----- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 17 +++++----- 11 files changed, 32 insertions(+), 121 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.2.bb
Signature · 1 line
1.7.10.4
PATCH 1/4 linux-yocto: remove 3.2 kernel recipes
Moving forward we plan to support two kernels plus the development kernel. That leaves 3.2 as the next kernel to be dropped. Support for this version will be carried in the sustained/old releases.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 29 ------------------ meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb | 26 ---------------- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 33 --------------------- 3 files changed, 88 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.2.bb
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb deleted +0 -29
@@ -1,29 +0,0 @@ -require recipes-kernel/linux/linux-yocto.inc - -KBRANCH = "standard/preempt-rt/base" -KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32" - -LINUX_VERSION ?= "3.2.32" -LINUX_KERNEL_TYPE = "preempt-rt" - -KMETA = "meta" - -SRCREV_machine ?= "d8f7347b67d909a999391c4b6f64447b0ccdc86a" -SRCREV_machine_qemuppc ?= "65c57e1a8656830260aa56a25bc8512dcb68258a" -SRCREV_meta ?= "e7f2fdc48f8808887175f0328274a2668084738c" - -PR = "${INC_PR}.0" -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" - -# Omit broken machines from COMPATIBLE_MACHINE -# qemuppc hangs at boot -# qemumips panics at boot -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" - -# Functionality flags -KERNEL_FEATURES_append = "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " features/taskstats/taskstats.scc" -KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc" -KERNEL_FEATURES_append_qemux86-64 = " cfg/sound.scc"
meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb deleted +0 -26
@@ -1,26 +0,0 @@ -require recipes-kernel/linux/linux-yocto.inc - -# We need lzma (as CONFIG_KERNEL_LZMA=y) -DEPENDS += "xz-native" - -KBRANCH_DEFAULT = "standard/tiny" -KBRANCH = "${KBRANCH_DEFAULT}" -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -LINUX_VERSION ?= "3.2.32" - -KMETA = "meta" - -SRCREV_machine ?= "c07ec7159c3ede723953b0d603a7bb55d8614b44" -SRCREV_meta ?= "e7f2fdc48f8808887175f0328274a2668084738c" - -PR = "${INC_PR}.0" -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" - -COMPATIBLE_MACHINE = "(qemux86)" - -# Functionality flags -KERNEL_FEATURES = ""
meta/recipes-kernel/linux/linux-yocto_3.2.bb deleted +0 -33
@@ -1,33 +0,0 @@ -require recipes-kernel/linux/linux-yocto.inc - -KBRANCH = "standard/default/base" -KBRANCH_qemux86 = "standard/default/common-pc/base" -KBRANCH_qemux86-64 = "standard/default/common-pc-64/base" -KBRANCH_qemuppc = "standard/default/qemu-ppc32" -KBRANCH_qemumips = "standard/default/mti-malta32-be" -KBRANCH_qemuarm = "standard/default/arm-versatile-926ejs" - -LINUX_VERSION ?= "3.2.32" - -SRCREV_machine_qemuarm ?= "ec68698f59bed87be4e13954d5d2b9dc1f314b45" -SRCREV_machine_qemumips ?= "ce21a2ab86277e410fd2229a10c45be6c9d0aa17" -SRCREV_machine_qemuppc ?= "edd27681039f2077d83eb02d7c1c44afb7b6224f" -SRCREV_machine_qemux86 ?= "2223d2fb00365c168ec380bdcbef05ef89751c85" -SRCREV_machine_qemux86-64 ?= "2d7956d7e3d15f69c923315c175847813f353d39" -SRCREV_machine ?= "6970a8f4f7caa2633aa1ae0b51732b246eb581ef" -SRCREV_meta ?= "e7f2fdc48f8808887175f0328274a2668084738c" - -PR = "${INC_PR}.1" -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "meta" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" - -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" - -# Functionality flags -KERNEL_FEATURES_append=" features/netfilter/netfilter.scc" -KERNEL_FEATURES_append=" features/taskstats/taskstats.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
Signature · 1 line
1.7.10.4
PATCH 2/4 qemu*: restrict NFSD to linux-yocto only
In reply to Bruce AshfieldIn the current releases, not all linux-yocto derived kernels have NFS support, or NFS support fragments availble. To ensure that derived kernels like linux-yocto-cutom continue to work against poky-lsb, we can make the KERNEL_FEATURE append more specific to the linux-yocto recipe.
--- meta/conf/machine/include/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/machine/include/qemu.inc +1 -1
@@ -25,4 +25,4 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" # Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES_append = " features/nfsd/nfsd-enable.scc" +KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
Signature · 1 line
1.7.10.4
PATCH 3/4 linux-yocto: v3.8.13 and v3.4.46
In reply to Bruce AshfieldUpdating the -stable linux-yocto trees to the latest korg -stable releases.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 16 ++++++++-------- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 17 ++++++++--------- 6 files changed, 30 insertions(+), 31 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +4 -4
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH = "standard/preempt-rt/base" KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" -LINUX_VERSION ?= "3.4.43" +LINUX_VERSION ?= "3.4.46" LINUX_KERNEL_TYPE = "preempt-rt" KMETA = "meta" -SRCREV_machine ?= "cd1372eb10dc0b20815916205fa91d84c1c012fc" -SRCREV_machine_qemuppc ?= "5e5ef5cca422434085b4e158674dc642b79dedda" -SRCREV_meta ?= "1bab5bd090948b4cc4c4ed57c834603a3cf9f235" +SRCREV_machine ?= "a4a8406d906163dcdab2d29420a9bc46668fc8d9" +SRCREV_machine_qemuppc ?= "0c20eafa8b950b1180f1701ba45026ea5e713482" +SRCREV_meta ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac" PR = "${INC_PR}.1" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +4 -4
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH = "standard/preempt-rt/base" KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" -LINUX_VERSION ?= "3.8.11" +LINUX_VERSION ?= "3.8.13" LINUX_KERNEL_TYPE = "preempt-rt" KMETA = "meta" -SRCREV_machine ?= "eeadef5c3a0a40aa4e01b20362e40009927f3ad6" -SRCREV_machine_qemuppc ?= "c7d4373996ddeb82ab7b8b5ea391227c8d10c6e9" -SRCREV_meta ?= "8482dcdf68f9f7501118f4c01fdcb8f851882997" +SRCREV_machine ?= "e0ac9992f1bf4830de49df884a3d2f273d02637b" +SRCREV_machine_qemuppc ?= "ea4de76a916dd3620e74e565ff42fafb5bb40843" +SRCREV_meta ?= "edd6461602f6c2fc27bc72997e4437f422a9dccd" PR = "${INC_PR}.1" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +3 -3
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" -LINUX_VERSION ?= "3.4.43" +LINUX_VERSION ?= "3.4.46" KMETA = "meta" -SRCREV_machine ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" -SRCREV_meta ?= "1bab5bd090948b4cc4c4ed57c834603a3cf9f235" +SRCREV_machine ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868" +SRCREV_meta ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac" PR = "${INC_PR}.1" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb +3 -3
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" -LINUX_VERSION ?= "3.8.11" +LINUX_VERSION ?= "3.8.13" KMETA = "meta" -SRCREV_machine ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" -SRCREV_meta ?= "8482dcdf68f9f7501118f4c01fdcb8f851882997" +SRCREV_machine ?= "1f973c0fc8eea9a8f9758f47cf689ba89dbe9a25" +SRCREV_meta ?= "edd6461602f6c2fc27bc72997e4437f422a9dccd" PR = "${INC_PR}.1" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.4.bb +8 -8
@@ -3,17 +3,17 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" -SRCREV_machine_qemuarm ?= "a4026fce19f8b2d28f37ea264693bd70126a7ade" -SRCREV_machine_qemumips ?= "372aba9e80c5f86a1f6795a7b2292a05159ef108" -SRCREV_machine_qemuppc ?= "c456ec65de4d2ac099312b0ed8e4098b29447929" -SRCREV_machine_qemux86 ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" -SRCREV_machine_qemux86-64 ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" -SRCREV_machine ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" -SRCREV_meta ?= "1bab5bd090948b4cc4c4ed57c834603a3cf9f235" +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_meta ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.4.43" +LINUX_VERSION ?= "3.4.46" PR = "${INC_PR}.4" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +8 -9
@@ -3,18 +3,17 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" -SRCREV_machine_qemuarm ?= "8fb1a478c9a05362e2e4e62fc30f5ef5d6c21f49" -SRCREV_machine_qemumips ?= "b8870f2b11f4c948ae90a19886335fa8b7fca487" -SRCREV_machine_qemumips64 ?= "49041e56a3c4ff552bf9f8195809b8040e2e2723" -SRCREV_machine_qemuppc ?= "e4c12f12e61a29b6605c4fcbcfd6dbe18bd7b4e4" -SRCREV_machine_qemux86 ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" -SRCREV_machine_qemux86-64 ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" -SRCREV_machine ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" -SRCREV_meta ?= "8482dcdf68f9f7501118f4c01fdcb8f851882997" +SRCREV_machine_qemuarm ?= "e267fe88798892416828d89bde7f778380b87a90" +SRCREV_machine_qemumips ?= "813bae2e17db9310f220935e87d168c8e52fafaf" +SRCREV_machine_qemuppc ?= "f90923775f9bcec3ce23246e8fb59d8f9551e566" +SRCREV_machine_qemux86 ?= "1f973c0fc8eea9a8f9758f47cf689ba89dbe9a25" +SRCREV_machine_qemux86-64 ?= "1f973c0fc8eea9a8f9758f47cf689ba89dbe9a25" +SRCREV_machine ?= "1f973c0fc8eea9a8f9758f47cf689ba89dbe9a25" +SRCREV_meta ?= "edd6461602f6c2fc27bc72997e4437f422a9dccd" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.8.11" +LINUX_VERSION ?= "3.8.13" PR = "${INC_PR}.1" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.10.4
PATCH 4/4 kern-tools: expand kernel features that point to a directory name
In reply to Bruce AshfieldUpdating the kern-tools SRCREV to pick up the following fix:
When a feature is passed to the kernel configuration scripts, and that feature is a directory name, it is a shortcut for:
$DIR/$DIR.scc
This expansion is not commonly used, and should be avoided. But for the purposes of backwards compatibility, updateme can expand the feature into a .scc file before passing it to the next set of configuration scripts.
--- 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 guilt-native" -SRCREV = "1a3c59526d6abe95662820b9493c8a62dab52d79" +SRCREV = "fbcdcb8e23c38352b46235598f34d7b345f458f1" PR = "r12" PV = "0.1+git${SRCPV}"
Signature · 1 line
1.7.10.4
Quoted 6 lines · Bruce Ashfield
Richard/Saul,
While I continue to battle with gcc 4.8, I've got a collection of other fixes that don't need to wait. Here's part of those pending changes.
- Remove the yocto 3.2 kernel, early in the Yocto 1.5 cycle as promised
Did I miss a request to remove the .bbappend from meta-yocto-bsp? There seems to be a 3.2 bbappend still.
Thanks
Sau!
Quoted 40 lines
- Fix the reported issues with linux-yocto-custom recipes by restricting NFSD kernel feature requirements to full linux-yocto kernels
- Refresh the 3.4 and 3.8 kernels with stable updates
- Fix a kernel feature processing bug reported with some of the Intel BSPsCheers,
Bruce
The following changes since commit
647db80298da0a8da212449fdd80d318773eacef:hicolor-icon-theme: keep inherited dependencies and switch to gnomebase (2013-05-30 22:31:37 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contribzedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernelBruce Ashfield (4):
linux-yocto: remove 3.2 kernel recipes
qemu*: restrict NFSD to linux-yocto only
linux-yocto: v3.8.13 and v3.4.46
kern-tools: expand kernel features that point to a directory namemeta/conf/machine/include/qemu.inc | 2 +- .../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 29 ----------------- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 8 ++--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 8 ++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb | 26 --------------- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 33 -------------------- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 16 +++++----- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 17 +++++----- 11 files changed, 32 insertions(+), 121 deletions(-)delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.2.bb
Quoted 10 lines · Saul Wold
Quoted 6 lines · Bruce Ashfield
Richard/Saul,
While I continue to battle with gcc 4.8, I've got a collection of other fixes that don't need to wait. Here's part of those pending changes.
- Remove the yocto 3.2 kernel, early in the Yocto 1.5 cycle as promised
Did I miss a request to remove the .bbappend from meta-yocto-bsp? There seems to be a 3.2 bbappend still.
In the interests of getting roughly caught up with patches, I've added a patch to delete this as well...
Cheers,
Richard
Quoted 7 lines · Richard Purdie
Quoted 6 lines · Saul Wold
Quoted 5 lines · Bruce Ashfield
Richard/Saul,
While I continue to battle with gcc 4.8, I've got a collection of other fixes that don't need to wait. Here's part of those pending changes.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
- Remove the yocto 3.2 kernel, early in the Yocto 1.5 cycle as promised
Did I miss a request to remove the .bbappend from meta-yocto-bsp? There seems to be a 3.2 bbappend still.
In the interests of getting roughly caught up with patches, I've added a patch to delete this as well...
Argh. yes. That's sitting on my oe-core branch and I managed to not send it out.
Thanks for fixing it up.
Bruce
Quoted 9 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"