linux-yocto/meta-yocto: update branch mappings
cover linux-yocto/meta-yocto: update branch mappings
Richard/Saul,
This is a follow up to the oe-core pull request that I just sent. It updates the 3.0 yocto recipe to have explicit branch mappings (so they'll work with the new tools).
Merge this after the oe-core changes are in place, or bad things will happen :)
Cheers,
Bruce
The following changes since commit 18a93648e7927a33bcaa3a7210fdee4ff5669b3b:
kern-tools: integrate minor fixes (2012-05-08 10:18:56 -0400)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel-dev-yocto
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-dev-yocto
Bruce Ashfield (1):
meta-yocto/linux-yocto-3.0: update branch mappings for new tools
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.5.4
PATCH 1/1 meta-yocto/linux-yocto-3.0: update branch mappings for new tools
Updates to the kern-tools to be more flexible and support multiple upstream repository formats means that KMACHINE should really only map to a machine and that KBRANCH should specify branch information.
To adapt to this change, we split the hardware reference boards into KMACHINE and KBRANCH mappings.
--- .../recipes-kernel/linux/linux-yocto_3.0.bbappend | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend +6 -4
@@ -1,8 +1,10 @@ -KMACHINE_atom-pc = "yocto/standard/common-pc/atom-pc" -KMACHINE_routerstationpro = "yocto/standard/routerstationpro" -KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" -KMACHINE_beagleboard = "yocto/standard/beagleboard" +KBRANCH_atom-pc = "yocto/standard/common-pc/atom-pc" +KBRANCH_routerstationpro = "yocto/standard/routerstationpro" +KBRANCH_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" +KBRANCH_beagleboard = "yocto/standard/beagleboard" +# temporary until 3.0 tree is updated to have machine mapping +KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" SRCREV_machine_atom-pc ?= "afdda882f902dd28693cd8701a7d497958290f09" SRCREV_machine_routerstationpro ?= "220d89fcf345ee28fb0cdcf0f33f83b3dc7c460f"
Signature · 1 line
1.7.5.4
Richard Purdie
AppliedRe: [PATCH 1/1] meta-yocto/linux-yocto-3.0: update branch mappings for new tools
Quoted 11 lines · Bruce Ashfield
Updates to the kern-tools to be more flexible and support multiple upstream repository formats means that KMACHINE should really only map to a machine and that KBRANCH should specify branch information.
To adapt to this change, we split the hardware reference boards into KMACHINE and KBRANCH mappings.
Signed-off-by Bruce Ashfield <[email protected]>--- .../recipes-kernel/linux/linux-yocto_3.0.bbappend | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
Merged to master, thanks.
Richard