mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
yocto-bsp: Set KTYPE to user selected base branch
Fixes the hardcode branch name set to KTYPE, where its value is used as a base branch when user decides to create a new branch. Tested on x86_64 architecture. [YOCTO #8630] (From meta-yocto rev: ab895be90a0cae7dfa77a8aab3b19e5571e7e7bc) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1542c2ab72
commit
9d585b5025
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-preempt-rt.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE preempt-rt
|
||||
|
||||
define KARCH arm
|
||||
|
||||
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-standard.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE standard
|
||||
|
||||
define KARCH arm
|
||||
|
||||
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-tiny.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE tiny
|
||||
|
||||
define KARCH arm
|
||||
|
||||
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-preempt-rt.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE preempt-rt
|
||||
|
||||
define KARCH i386
|
||||
|
||||
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-standard.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE standard
|
||||
|
||||
define KARCH i386
|
||||
|
||||
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-tiny.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE tiny
|
||||
|
||||
define KARCH i386
|
||||
|
||||
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-preempt-rt.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE preempt-rt
|
||||
|
||||
define KARCH mips
|
||||
|
||||
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-standard.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE standard
|
||||
|
||||
define KARCH mips
|
||||
|
||||
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-tiny.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE tiny
|
||||
|
||||
define KARCH mips
|
||||
|
||||
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-preempt-rt.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE preempt-rt
|
||||
|
||||
define KARCH mips
|
||||
|
||||
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-standard.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE standard
|
||||
|
||||
define KARCH mips
|
||||
|
||||
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-tiny.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE tiny
|
||||
|
||||
define KARCH mips
|
||||
|
||||
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-preempt-rt.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE preempt-rt
|
||||
|
||||
define KARCH powerpc
|
||||
|
||||
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-standard.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE standard
|
||||
|
||||
define KARCH powerpc
|
||||
|
||||
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-tiny.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE tiny
|
||||
|
||||
define KARCH powerpc
|
||||
|
||||
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-preempt-rt.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE preempt-rt
|
||||
|
||||
define KARCH {{=qemuarch}}
|
||||
|
||||
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# yocto-bsp-filename {{=machine}}-standard.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE standard
|
||||
|
||||
define KARCH {{=qemuarch}}
|
||||
|
||||
{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
|
||||
|
|
@ -14,6 +14,7 @@ include bsp/mti-malta32/mti-malta32-be-standard
|
|||
{{ if qemuarch == "mips64": }}
|
||||
include bsp/mti-malta64/mti-malta64-be-standard
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-tiny.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE tiny
|
||||
|
||||
define KARCH {{=qemuarch}}
|
||||
|
||||
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-preempt-rt.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE preempt-rt
|
||||
|
||||
define KARCH x86_64
|
||||
|
||||
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-standard.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE standard
|
||||
|
||||
define KARCH x86_64
|
||||
|
||||
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# yocto-bsp-filename {{=machine}}-tiny.scc
|
||||
define KMACHINE {{=machine}}
|
||||
define KTYPE tiny
|
||||
|
||||
define KARCH x86_64
|
||||
|
||||
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
define KTYPE {{=new_kbranch}}
|
||||
branch {{=machine}}
|
||||
|
||||
include {{=machine}}.scc
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user