[OE-core] [PATCH 2/3] yocto-bsp: Set KTYPE to user selected base branch
leonardo.sandoval.gonzalez at linux.intel.com
leonardo.sandoval.gonzalez at linux.intel.com
Fri Nov 6 16:17:01 UTC 2015
From: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
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]
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
---
.../target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++-
.../target/arch/arm/recipes-kernel/linux/files/machine-standard.scc | 3 ++-
.../target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc | 3 ++-
.../target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++-
.../target/arch/i386/recipes-kernel/linux/files/machine-standard.scc | 3 ++-
.../target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc | 3 ++-
.../target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++-
.../target/arch/mips/recipes-kernel/linux/files/machine-standard.scc | 3 ++-
.../target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc | 3 ++-
.../arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++-
.../target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc | 3 ++-
.../target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc | 3 ++-
.../arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++-
.../arch/powerpc/recipes-kernel/linux/files/machine-standard.scc | 3 ++-
.../target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc | 3 ++-
.../target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++-
.../target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc | 3 ++-
.../target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc | 3 ++-
.../arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++-
.../target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc | 3 ++-
.../target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc | 3 ++-
21 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
index ca5f3b5..ea6966c 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
@@ -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
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
index 9014c2c..405972d 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.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
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
index 3f1c252..921b7e7 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.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
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
index 619ee3f..7146e23 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.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
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
index 682012f..67a54be 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.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
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
index cc75196..91373b3 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.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
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc
index 176190c..a128255 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.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
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc
index f05dd85..7c9dc52 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.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
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc
index f71c775..64f395b 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.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
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
index 176190c..a128255 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.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
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
index f05dd85..7c9dc52 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.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
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
index f71c775..64f395b 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.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
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc
index 40c9267..91ccfb8 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.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
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc
index 7a1d35b..89b344f 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.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
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc
index 1bf94b2..2701fd8 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.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
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
index 6aaffb8..a81b858 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.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
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
index d2a03ec..14554da 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.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
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
index 6c098fe..41d4c6f 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.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
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
index fd5320b..bbeeecd 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.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
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
index 569f967..9c9cc90 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.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
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
index fb21432..b53706f 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.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
--
1.8.4.5
More information about the Openembedded-core
mailing list