linux-yocto: update to 2.6.37-rc6 and minor fixes
PATCH 1/3 linux-yocto-stable: fix qemux86 branch name
In reply to Bruce AshfieldThe mapping of qemu to kernel branch name for the stable kernel had a small leak from the devel kernel. Nothing broke since qemux86 prefers the 2.6.37 kernel and this was hidden.
This fixes the mapping for anyone who does want a 2.6.34 based qemux86 kernel.
--- .../recipes-kernel/linux/linux-yocto-stable_git.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-yocto-stable_git.bb +1 -1
@@ -1,7 +1,7 @@ inherit kernel require linux-yocto.inc -KMACHINE_qemux86 = "common_pc/base" +KMACHINE_qemux86 = "common_pc" KMACHINE_qemux86-64 = "common_pc_64" KMACHINE_qemuppc = "qemu_ppc32" KMACHINE_qemumips = "mti_malta32_be"
Signature · 1 line
1.7.0.4
PATCH 2/3 qemu: match kernel headers to preferred kernel
In reply to Bruce AshfieldAs the yocto-kernel advances, the libc headers must also advance. This commit fixes the SRC_URI and SRCPV to work properly with the latest linux-yocto kernel. It also switches the qemu* targets to prefer this libc recipe.
--- meta/conf/machine/include/qemu.inc | 2 +- .../linux-libc-headers-yocto_git.bb | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-)
meta/conf/machine/include/qemu.inc +1 -1
@@ -16,6 +16,6 @@ RDEPENDS_kernel-base = "" # Use a common kernel recipe for all QEMU machines PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" -#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb +4 -6
@@ -6,14 +6,12 @@ B = "${S}" INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" PROVIDES = "linux-libc-headers" -PV = "2.6.34+git-${SRCPV}" -PR = "r1" - -SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;fullclone=1" +PV = "2.6.37+git-${SRCPV}" +PR = "r2" SRCREV_FORMAT = "meta_machine" -SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ - git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta" +SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ + git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta" set_arch() { case ${TARGET_ARCH} in
Signature · 1 line
1.7.0.4
PATCH 3/3 linux-yocto: update to 2.6.37-rc6
In reply to Bruce AshfieldFixes [BUGID #596]
Updating the SRCREVs of the target branches in the linux-yocto development kernel to point to 2.6.37-rc6 content.
At this point branches have been switched from _ to - and we are able to remove the old branch names.
--- .../conf/distro/include/poky-default-revisions.inc | 26 ++++++++++---------- 1 files changed, 13 insertions(+), 13 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +13 -13
@@ -57,7 +57,7 @@ SRCREV_pn-gypsy ??= "147" SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" -SRCREV_pn-kern-tools-native ??= "796d7fef92b2eed449c17c14441587ff0c465368" +SRCREV_pn-kern-tools-native ??= "72683bf61fdb83a1c0b4110763f803ff3e39f8ca" SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" SRCREV_pn-libfakekey ??= "2031" SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"
@@ -96,18 +96,18 @@ SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d1 SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" SRCREV_meta_pn-linux-yocto-stable ?= "50ccd2b3213b6a1bacb3f898c035119802dac420" # development SRCREVs -SRCREV_machine_pn-linux-yocto_qemuarm = "87e00a2d47ba80b4ad1f9170cb3f6cf81f21d739" -SRCREV_machine_pn-linux-yocto_qemumips = "7231e473dd981a28e3cea9f677ed60583e731550" -SRCREV_machine_pn-linux-yocto_qemuppc = "e2b529d7d74a9b21e1d1715f0c4062a4fd92a3ed" -SRCREV_machine_pn-linux-yocto_qemux86 = "87aacc373557f8849dde8618fbe1f7f8f2af6038" -SRCREV_machine_pn-linux-yocto_qemux86-64 = "87aacc373557f8849dde8618fbe1f7f8f2af6038" -SRCREV_machine_pn-linux-yocto_emenlow = "87aacc373557f8849dde8618fbe1f7f8f2af6038" -SRCREV_machine_pn-linux-yocto_atom-pc = "87aacc373557f8849dde8618fbe1f7f8f2af6038" -SRCREV_machine_pn-linux-yocto_routerstationpro = "773d3a1c8eba563ffcdbf61057ef6e39cee0c88b" -SRCREV_machine_pn-linux-yocto_mpc8315e-rdb = "5ff609967ffe87c49d534d7861a7e0b150517726" -SRCREV_machine_pn-linux-yocto_beagleboard = "87aacc373557f8849dde8618fbe1f7f8f2af6038" -SRCREV_meta_pn-linux-yocto ?= "ee0a10ab687b29c4d22d47e5b28bc8b3ebb7a8d9" -SRCREV_pn-linux-libc-headers-yocto ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" +SRCREV_machine_pn-linux-yocto_qemuarm = "eeca27d6fb4c7cc8b0ec8e421a51115513740bb9" +SRCREV_machine_pn-linux-yocto_qemumips = "ed31b5de9b82b9c7e80e93f42822501d0080bcd6" +SRCREV_machine_pn-linux-yocto_qemuppc = "c01bc9165ab3192368dc2030a98fb75a7f8dc008" +SRCREV_machine_pn-linux-yocto_qemux86 = "f6454fa1af4340832f8943f0b3d8e9f2de11b1b1" +SRCREV_machine_pn-linux-yocto_qemux86-64 = "f6454fa1af4340832f8943f0b3d8e9f2de11b1b1" +SRCREV_machine_pn-linux-yocto_emenlow = "f6454fa1af4340832f8943f0b3d8e9f2de11b1b1" +SRCREV_machine_pn-linux-yocto_atom-pc = "f6454fa1af4340832f8943f0b3d8e9f2de11b1b1" +SRCREV_machine_pn-linux-yocto_routerstationpro = "f0d79e2ae0cbb3924c57655b8c7d6a1276c9fc05" +SRCREV_machine_pn-linux-yocto_mpc8315e-rdb = "a0243e84c1cca7fb625ae4bd76274882ccbe4333" +SRCREV_machine_pn-linux-yocto_beagleboard = "f6454fa1af4340832f8943f0b3d8e9f2de11b1b1" +SRCREV_meta_pn-linux-yocto ?= "7ca94548e68a72e57715d65d6d8f723582aafa59" +SRCREV_pn-linux-libc-headers-yocto ??= "f6454fa1af4340832f8943f0b3d8e9f2de11b1b1" SRCREV_pn-matchbox-config-gtk ??= "2081" SRCREV_pn-matchbox-desktop-sato ??= "76" SRCREV_pn-matchbox-desktop ??= "2096"
Signature · 1 line
1.7.0.4
cover linux-yocto: update to 2.6.37-rc6 and minor fixes
Richard/Saul,
This fixes BUGID #596 (mouse in qemuarm), through the fixing of the linux-libc-headers-yocto recipe. The mouse was broken due to tslib being out of sync with the kernel and not activating the pointer. Having the matching kernel headers fixes this problem.
** Note: I saw some instances where I was getting fetcher/unpack errors during my testing of this. I wasn't able to consistently reproduce the error, so I wasn't able to conclusively determine if it has anything to do with the libc-headers change. I recommend that we watch this carefully and be prepared to revert as required (revert the headers preference in qemu.inc).
This also updating the SRCREVs of the target branches in the linux-yocto development kernel to point to 2.6.37-rc6 content.
And finally, this updates the meta branch to remove the rest of the _'s from branch meta data. At this point branches have been switched from _ to - and we are able to remove the old branch names. (which I have done).
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: zedd/kernel
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Thanks,
Bruce Ashfield <[email protected]>
---
Bruce Ashfield (3):
linux-yocto-stable: fix qemux86 branch name
qemu: match kernel headers to preferred kernel
linux-yocto: update to 2.6.37-rc6
.../conf/distro/include/poky-default-revisions.inc | 26 ++++++++++---------- meta/conf/machine/include/qemu.inc | 2 +- .../linux-libc-headers-yocto_git.bb | 10 +++---- .../recipes-kernel/linux/linux-yocto-stable_git.bb | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-)