mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

yocto-bsp: Set KTYPE to user selected base branch

Browse Source 
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:
Leonardo Sandoval
2015-11-05 22:43:55 +00:00
committed by Richard Purdie
parent 1542c2ab72
commit 9d585b5025
21 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-preempt-rt.scc # yocto-bsp-filename {{=machine}}-preempt-rt.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE preempt-rt
define KARCH arm define KARCH arm
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-standard.scc # yocto-bsp-filename {{=machine}}-standard.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE standard
define KARCH arm define KARCH arm
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-tiny.scc # yocto-bsp-filename {{=machine}}-tiny.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE tiny
define KARCH arm define KARCH arm
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-preempt-rt.scc # yocto-bsp-filename {{=machine}}-preempt-rt.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE preempt-rt
define KARCH i386 define KARCH i386
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-standard.scc # yocto-bsp-filename {{=machine}}-standard.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE standard
define KARCH i386 define KARCH i386
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-tiny.scc # yocto-bsp-filename {{=machine}}-tiny.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE tiny
define KARCH i386 define KARCH i386
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-preempt-rt.scc # yocto-bsp-filename {{=machine}}-preempt-rt.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE preempt-rt
define KARCH mips define KARCH mips
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-standard.scc # yocto-bsp-filename {{=machine}}-standard.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE standard
define KARCH mips define KARCH mips
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-tiny.scc # yocto-bsp-filename {{=machine}}-tiny.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE tiny
define KARCH mips define KARCH mips
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-preempt-rt.scc # yocto-bsp-filename {{=machine}}-preempt-rt.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE preempt-rt
define KARCH mips define KARCH mips
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-standard.scc # yocto-bsp-filename {{=machine}}-standard.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE standard
define KARCH mips define KARCH mips
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-tiny.scc # yocto-bsp-filename {{=machine}}-tiny.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE tiny
define KARCH mips define KARCH mips
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-preempt-rt.scc # yocto-bsp-filename {{=machine}}-preempt-rt.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE preempt-rt
define KARCH powerpc define KARCH powerpc
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-standard.scc # yocto-bsp-filename {{=machine}}-standard.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE standard
define KARCH powerpc define KARCH powerpc
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-tiny.scc # yocto-bsp-filename {{=machine}}-tiny.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE tiny
define KARCH powerpc define KARCH powerpc
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-preempt-rt.scc # yocto-bsp-filename {{=machine}}-preempt-rt.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE preempt-rt
define KARCH {{=qemuarch}} define KARCH {{=qemuarch}}
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
+2 -1
View File
@@ -1,6 +1,6 @@
# yocto-bsp-filename {{=machine}}-standard.scc # yocto-bsp-filename {{=machine}}-standard.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE standard
define KARCH {{=qemuarch}} define KARCH {{=qemuarch}}
{{ if qemuarch == "i386" or qemuarch == "x86_64": }} {{ if qemuarch == "i386" or qemuarch == "x86_64": }}
@@ -14,6 +14,7 @@ include bsp/mti-malta32/mti-malta32-be-standard
{{ if qemuarch == "mips64": }} {{ if qemuarch == "mips64": }}
include bsp/mti-malta64/mti-malta64-be-standard include bsp/mti-malta64/mti-malta64-be-standard
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-tiny.scc # yocto-bsp-filename {{=machine}}-tiny.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE tiny
define KARCH {{=qemuarch}} define KARCH {{=qemuarch}}
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-preempt-rt.scc # yocto-bsp-filename {{=machine}}-preempt-rt.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE preempt-rt
define KARCH x86_64 define KARCH x86_64
include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-standard.scc # yocto-bsp-filename {{=machine}}-standard.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE standard
define KARCH x86_64 define KARCH x86_64
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
+2 -1
View File
@@ -1,10 +1,11 @@
# yocto-bsp-filename {{=machine}}-tiny.scc # yocto-bsp-filename {{=machine}}-tiny.scc
define KMACHINE {{=machine}} define KMACHINE {{=machine}}
define KTYPE tiny
define KARCH x86_64 define KARCH x86_64
include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
{{ if need_new_kbranch == "y": }} {{ if need_new_kbranch == "y": }}
define KTYPE {{=new_kbranch}}
branch {{=machine}} branch {{=machine}}
include {{=machine}}.scc include {{=machine}}.scc