diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2016-02-02 10:50:51 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:20:18 +0000 |
commit | a88d6cb170345b7ed4101924e11dd36912deaa29 (patch) | |
tree | 6284c38f4ef2a95f852f9257a4f8b2aa62353d4c /scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc | |
parent | 4e74b36458b36ee1202689388da5423ed9ee7b71 (diff) | |
download | poky-a88d6cb170345b7ed4101924e11dd36912deaa29.tar.gz |
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)
(From meta-yocto rev: bc5aec2348b2c314953806734a8fbabf798d142c)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9d585b5025187f059f75ffbdc01bda72d17e8a86)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc | 3 |
1 files changed, 2 insertions, 1 deletions
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 f05dd851d2..7c9dc52d22 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 @@ | |||
1 | # yocto-bsp-filename {{=machine}}-standard.scc | 1 | # yocto-bsp-filename {{=machine}}-standard.scc |
2 | define KMACHINE {{=machine}} | 2 | define KMACHINE {{=machine}} |
3 | define KTYPE standard | 3 | |
4 | define KARCH mips | 4 | define KARCH mips |
5 | 5 | ||
6 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} | 6 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
7 | {{ if need_new_kbranch == "y": }} | 7 | {{ if need_new_kbranch == "y": }} |
8 | define KTYPE {{=new_kbranch}} | ||
8 | branch {{=machine}} | 9 | branch {{=machine}} |
9 | 10 | ||
10 | include {{=machine}}.scc | 11 | include {{=machine}}.scc |