kernel-yocto: consolidated pull request
cover kernel-yocto: consolidated pull request
Richard/Saul,
Here's the latest batch of kernel changes. In this series, we are moving the linux-yocto-dev recipe out of poky-extras into a more visible location (using the scheme agreed upon to avoid AUTOREV network access). I also have a cleanup patch to existing KERNEL_FEATURES references, and finally a bump of the 3.4 and 3.4-rt versions.
Details follow:
[PATCH 1/3] linux-yocto/dev: linux-yocto development tree tracking recipe
The linux-yocto-dev recipe uses the upstream tracking linux-yocto-dev repository. Since this tree is frequently updated, and periodically rebuilt, AUTOREV is used to track its contents.
This recipe is just like other linux-yocto variants, with the only difference being that to avoid network access during initial parsing, static SRCREVs are provided and overridden if the preferred kernel provider is linux-yocto-dev.
[PATCH 2/3] linux-yocto/3.4: update to v3.4.28, 3.4.28-rt40
Updating the linux-yocto_3.4 SRCREVs to pick up the 3.4.28 -stable update as well as the 3.4.28-rt40 refresh.
[PATCH 3/3] linux-yocto: KERNEL_FEATURES should reference full scc files
Some existing KERNEL_FEATURE references use a shorcut notation, but mapping these shortcuts to actual .scc files in the tree are not obvious. So we clarify where they are found by referencing the full .scc filename in the KERNEL_FEATURE addtions.
Cheers,
Bruce
The following changes since commit 7e9cb437b1b720e656f4a33f73c07c5dc7356a2c:
dropbear: fix RPROVIDES (2013-02-04 23:31:02 +0000)
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 (3):
linux-yocto/dev: linux-yocto development tree tracking recipe linux-yocto/3.4: update to v3.4.28, 3.4.28-rt40
linux-yocto: KERNEL_FEATURES should reference full scc files
meta/recipes-kernel/linux/linux-yocto-dev.bb | 48 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 8 ++-- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 18 ++++---- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 +-- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 8 ++-- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 28 ++++++------ 6 files changed, 81 insertions(+), 35 deletions(-) create mode 100644 meta/recipes-kernel/linux/linux-yocto-dev.bb
Signature · 1 line
1.7.10.4
PATCH 2/3 linux-yocto/3.4: update to v3.4.28, 3.4.28-rt40
Updating the linux-yocto_3.4 SRCREVs to pick up the 3.4.28 -stable update as well as the 3.4.28-rt40 refresh.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 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.26" +LINUX_VERSION ?= "3.4.28" LINUX_KERNEL_TYPE = "preempt-rt" KMETA = "meta" -SRCREV_machine ?= "408343900a234254d7be8f0bb52d6f87c8fbbc76" -SRCREV_machine_qemuppc ?= "bd7b26015e1dcbed4e8e0e9b6ac2ef4c744e0257" -SRCREV_meta ?= "c0b3904d60830e24b3930b0fa606a48b2758d979" +SRCREV_machine ?= "3d56b103cd7072d520c395194e620aba2f6e52e3" +SRCREV_machine_qemuppc ?= "09178bc8825d6fb66ddcb1785f20a022c4ba2efd" +SRCREV_meta ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" PR = "${INC_PR}.0" 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.26" +LINUX_VERSION ?= "3.4.28" KMETA = "meta" -SRCREV_machine ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" -SRCREV_meta ?= "c0b3904d60830e24b3930b0fa606a48b2758d979" +SRCREV_machine ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" +SRCREV_meta ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" PR = "${INC_PR}.0" 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 ?= "b5a80c6a46604d7636c18a3e1ad362d1e6ed234e" -SRCREV_machine_qemumips ?= "66bc662b2cd469a9807fbe838069d3f85cb01bd9" -SRCREV_machine_qemuppc ?= "d771422df10af41ee61598f4aa06e3c3a018c323" -SRCREV_machine_qemux86 ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" -SRCREV_machine_qemux86-64 ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" -SRCREV_machine ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" -SRCREV_meta ?= "c0b3904d60830e24b3930b0fa606a48b2758d979" +SRCREV_machine_qemuarm ?= "a720acacc415b3323a3ee9076bf9a621a964af2f" +SRCREV_machine_qemumips ?= "7d9f14326db1e602b4408f295bef7d12fd07dd55" +SRCREV_machine_qemuppc ?= "62d3cb6a8e048c4833a5501bea2f35998de0b89d" +SRCREV_machine_qemux86 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" +SRCREV_machine_qemux86-64 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" +SRCREV_machine ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" +SRCREV_meta ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" 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.26" +LINUX_VERSION ?= "3.4.28" PR = "${INC_PR}.3" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.10.4
PATCH 1/3 linux-yocto/dev: linux-yocto development tree tracking recipe
In reply to Bruce AshfieldThe linux-yocto-dev recipe uses the upstream tracking linux-yocto-dev repository. Since this tree is frequently updated, and periodically rebuilt, AUTOREV is used to track its contents.
This recipe is just like other linux-yocto variants, with the only difference being that to avoid network access during initial parsing, static SRCREVs are provided and overridden if the preferred kernel provider is linux-yocto-dev.
--- meta/recipes-kernel/linux/linux-yocto-dev.bb | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto-dev.bb
meta/recipes-kernel/linux/linux-yocto-dev.bb new file +48 -0
@@ -0,0 +1,48 @@ +# This recipe tracks the linux-yocto-dev repository as its upstream source. +# Since this tree is frequently updated, and periodically rebuilt, AUTOREV is +# used to track its contents. +# +# This recipe is just like other linux-yocto variants, with the only difference +# being that to avoid network access during initial parsing, static SRCREVs are +# provided and overridden if the preferred kernel provider is linux-yocto-dev. +# +# To enable this recipe, set PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" + +inherit kernel +require recipes-kernel/linux/linux-yocto.inc + +KBRANCH = "standard/base" +KBRANCH_DEFAULT = "${KBRANCH}" +KMETA = "meta" + +SRC_URI = "git://git.pokylinux.org/linux-yocto-dev.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta" + +# Set default SRCREVs. Both the machine and meta SRCREVs are statically set +# to the korg v3.7 tag, and hence prevent network access during parsing. If +# linux-yocto-dev is the preferred provider, they will be overridden to +# AUTOREV in following anonymous python routine and resolved when the +# variables are finalized. +SRCREV_machine="29594404d7fe73cd80eaa4ee8c43dcc53970c60e" +SRCREV_meta="29594404d7fe73cd80eaa4ee8c43dcc53970c60e" + +python () { + if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev": + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it") + else: + d.setVar("SRCREV_machine", "${AUTOREV}") + d.setVar("SRCREV_meta", "${AUTOREV}") +} + +LINUX_VERSION ?= "3.8+" +LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" +PR = "r0" +PV = "${LINUX_VERSION}+git${SRCPV}" + +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" + +# Functionality flags +KERNEL_FEATURES_append = " features/netfilter/netfilter.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
Signature · 1 line
1.7.10.4
PATCH 3/3 linux-yocto: KERNEL_FEATURES should reference full scc files
In reply to Bruce AshfieldSome existing KERNEL_FEATURE references use a shorcut notation, but mapping these shortcuts to actual .scc files in the tree are not obvious. So we clarify where they are found by referencing the full .scc filename in the KERNEL_FEATURE addtions.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 10 +++++----- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 12 +++++------- 4 files changed, 18 insertions(+), 20 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +4 -4
@@ -23,7 +23,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2.git;protocol=git;bareclone COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" # Functionality flags -KERNEL_FEATURES_append = "features/netfilter" -KERNEL_FEATURES_append = " features/taskstats" -KERNEL_FEATURES_append_qemux86 = " cfg/sound" -KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" +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-rt_3.4.bb +5 -5
@@ -23,8 +23,8 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" # Functionality flags -KERNEL_FEATURES_append = " features/netfilter" -KERNEL_FEATURES_append = " features/taskstats" -KERNEL_FEATURES_append_qemux86 = " cfg/sound" -KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}" +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" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +4 -4
@@ -27,7 +27,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;b COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags -KERNEL_FEATURES_append=" features/netfilter" -KERNEL_FEATURES_append=" features/taskstats" -KERNEL_FEATURES_append_qemux86=" cfg/sound" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound" +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_3.4.bb +5 -7
@@ -23,10 +23,8 @@ KMETA = "meta" COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags -KERNEL_REVISION_CHECKING="" -KERNEL_FEATURES_append = " features/netfilter" -KERNEL_FEATURES_append_qemux86=" cfg/sound" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound" -KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm" -#KERNEL_FEATURES_append_qemux86-64=" cfg/paravirt_kvm" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}" +KERNEL_FEATURES_append = " features/netfilter/netfilter.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
Signature · 1 line
1.7.10.4