From bb0aab79e488a99cb1b43f72f0e8ddbe39d97519 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 28 Aug 2012 22:01:35 -0500 Subject: yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' cases The new yocto-kernel way of specifying that the branch sanity check doesn't need to be run is to specify a default kbranch and build that. In the case where we have a new kbranch but it's not yet in the repo, we need to tell it that our new branch is the default and we're building the default and that's how we avoid the sanity check and the subsequent do_validate_branches() failure. (From meta-yocto rev: dadd020c67e901609be3ac13a4ffd8cb28532966) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- ...l_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend') diff --git "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" index 094cf5c90d..f11bfa5833 100644 --- "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" @@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" +KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" +KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" -- cgit v1.2.3-54-g00ecf