summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorChoong YinThong <yin.thong.choong@intel.com>2017-06-21 12:04:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 15:03:10 +0100
commit5b23e19841686aaa549f7b4ee90447ed604d9f3d (patch)
tree4a73fe1aeb26ca408df247cd5b437078bb575fe0 /scripts
parent96e3848ba08fa68ccdfd0cc41cb790931f7541eb (diff)
downloadpoky-5b23e19841686aaa549f7b4ee90447ed604d9f3d.tar.gz
linux-yocto-custom: include a user feature description file
Missing user feature description file when select linux-yocto-custom in script/yocto-bsp and causes failure in script/yocto-kernel feature add. [YOCTO #11585] (From meta-yocto rev: 9939e7eacf8a205fb0b10de8a6cc065a8048b103) Signed-off-by: Choong YinThong <yin.thong.choong@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-features.scc1
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
index fda955b5e2..3ba4226aa9 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
@@ -42,6 +42,7 @@ SRC_URI += "file://{{=machine}}.scc \
42 file://{{=machine}}.cfg \ 42 file://{{=machine}}.cfg \
43 file://{{=machine}}-user-config.cfg \ 43 file://{{=machine}}-user-config.cfg \
44 file://{{=machine}}-user-patches.scc \ 44 file://{{=machine}}-user-patches.scc \
45 file://{{=machine}}-user-features.scc \
45 " 46 "
46 47
47{{ if kernel_choice == "custom" and custom_kernel_need_kbranch == "y" and custom_kernel_kbranch and custom_kernel_kbranch != "master": }} 48{{ if kernel_choice == "custom" and custom_kernel_need_kbranch == "y" and custom_kernel_kbranch and custom_kernel_kbranch != "master": }}
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-features.scc b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-features.scc
new file mode 100644
index 0000000000..582759e612
--- /dev/null
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-features.scc
@@ -0,0 +1 @@
# yocto-bsp-filename {{=machine}}-user-features.scc