linux-yocto: 2.6.37-rc7 & bsp branch fixups
cover linux-yocto: 2.6.37-rc7 & bsp branch fixups
The first patch of this pull request updates the BSP branches to 2.6.37-rc7 (all qemu targets have been built and booted).
The second patch is an update to the handling of KMACHINE as it maps to the branch that we should be building for a BSP. During some investigation around the igep0020 and building it on top of the beagle board branches, the kernel branch was coming through processing as UNDEFINED. This lead to errors. I tracked it down to the non-override variable being used in the python processing. Patch 2/2 updates the processing to check overrrides and then fall back. With this, I was able to build an igep0020 on top of the 2.6.37-rc7 beagle board kernel branches.
Cheers,
Bruce
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 (2):
yocto-kernel: fix kmachine to deal with overrides yocto/meta: update to 2.6.37-rc7
meta/classes/kernel-yocto.bbclass | 7 +++++-- .../conf/distro/include/poky-default-revisions.inc | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-)
PATCH 1/2 yocto-kernel: fix kmachine to deal with overrides
BSPs are built from a particular branch of the kernel repository which is specfied via the mapping of MACHINE to KMACHINE. Unless a global branch is being forced (like libc headers), KMACHINE is an override on a per machine basis.
Because KMACHINE is typically override we must first try the most specific variant KMACHINE_<machine> and if that is undefined look for a fallack default. This allows any combination of variables to work (and at the time the anonymous python executes) safely and get us a properly defined branch for the fetcher and build.
--- meta/classes/kernel-yocto.bbclass | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
meta/classes/kernel-yocto.bbclass +5 -2
@@ -29,10 +29,13 @@ python __anonymous () { # The branch for a build is: # yocto/<kernel type>/${KMACHINE} or # yocto/<kernel type>/${KMACHINE}/base - bb.data.setVar("KBRANCH", bb.data.expand("${KMACHINE}",d), d) + mach = bb.data.getVar("KMACHINE_" + bb.data.expand("${MACHINE}",d), d, 1) + if mach == None: + mach = bb.data.getVar("KMACHINE", d, 1) + + bb.data.setVar("KBRANCH", mach, d) bb.data.setVar("KMETA", "meta", d) - mach = bb.data.getVar("KMACHINE", d, 1) # drop the "/base" if it was on the KMACHINE kmachine = mach.replace('/base','') # drop everything but the last segment
Signature · 1 line
1.7.0.4
PATCH 2/2 yocto/meta: update to 2.6.37-rc7
In reply to Bruce Ashfield--- .../conf/distro/include/poky-default-revisions.inc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +10 -10
@@ -95,16 +95,16 @@ 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 = "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_machine_pn-linux-yocto_qemuarm = "7bf177ac4ad275e38da20814b9feb5a9dce2e90d" +SRCREV_machine_pn-linux-yocto_qemumips = "8ed75362664355b89e8063a07b25f79c02711e8b" +SRCREV_machine_pn-linux-yocto_qemuppc = "3b4193f7d11c257472ad357555645a329c8e2a9e" +SRCREV_machine_pn-linux-yocto_qemux86 = "4cadabcdf0ef14c30bd3f18846d72d0da745c57f" +SRCREV_machine_pn-linux-yocto_qemux86-64 = "4cadabcdf0ef14c30bd3f18846d72d0da745c57f" +SRCREV_machine_pn-linux-yocto_emenlow = "4cadabcdf0ef14c30bd3f18846d72d0da745c57f" +SRCREV_machine_pn-linux-yocto_atom-pc = "4cadabcdf0ef14c30bd3f18846d72d0da745c57f" +SRCREV_machine_pn-linux-yocto_routerstationpro = "145fe6d49a4056adf2d0df6719e63ed860d26547" +SRCREV_machine_pn-linux-yocto_mpc8315e-rdb = "2629db6f8595d227758dc635c9e5c091930c4762" +SRCREV_machine_pn-linux-yocto_beagleboard = "4cadabcdf0ef14c30bd3f18846d72d0da745c57f" SRCREV_meta_pn-linux-yocto ?= "5955ebea1f0d2fbd67a66ed138ce2b3363adf72a" SRCREV_pn-linux-libc-headers-yocto ??= "f6454fa1af4340832f8943f0b3d8e9f2de11b1b1" SRCREV_pn-matchbox-config-gtk ??= "2081"
Signature · 1 line
1.7.0.4
Saul Wold
AppliedQuoted 30 lines · Bruce Ashfield
The first patch of this pull request updates the BSP branches to 2.6.37-rc7 (all qemu targets have been built and booted).
The second patch is an update to the handling of KMACHINE as it maps to the branch that we should be building for a BSP. During some investigation around the igep0020 and building it on top of the beagle board branches, the kernel branch was coming through processing as UNDEFINED. This lead to errors. I tracked it down to the non-override variable being used in the python processing. Patch 2/2 updates the processing to check overrrides and then fall back. With this, I was able to build an igep0020 on top of the 2.6.37-rc7 beagle board kernel branches.
Cheers,
Bruce
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: zedd/kernel
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernelThanks,
Bruce Ashfield<[email protected]>
---Bruce Ashfield (2):
yocto-kernel: fix kmachine to deal with overrides yocto/meta: update to 2.6.37-rc7
Quoted 9 lines
meta/classes/kernel-yocto.bbclass | 7 +++++-- .../conf/distro/include/poky-default-revisions.inc | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-)_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Merged into Master
Thanks
Sau!