diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2013-03-12 02:33:05 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-17 23:10:28 +0000 |
commit | 15043fae43399c4a8ac99ce43d2a098107faefbb (patch) | |
tree | 9ac912f341a78fe45ed6873370d571cceea60d6a /scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux | |
parent | 8c9320cc922a165946ac557f0bda2e29ab794951 (diff) | |
download | poky-15043fae43399c4a8ac99ce43d2a098107faefbb.tar.gz |
yocto-bsp: add machine-user-features.scc to templates
Add the user-features.scc files needed by the new kernel feature
support in yocto-kernel.
(From meta-yocto rev: 0ef493fbbe412b6e30fc60b892ba6c2e5664307f)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux')
6 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-features.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-features.scc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-user-features.scc | |||
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend index 0d814469fb..5112c07a56 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend | |||
@@ -18,4 +18,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
18 | SRC_URI += "file://{{=machine}}-standard.scc \ | 18 | SRC_URI += "file://{{=machine}}-standard.scc \ |
19 | file://{{=machine}}-user-config.cfg \ | 19 | file://{{=machine}}-user-config.cfg \ |
20 | file://{{=machine}}-user-patches.scc \ | 20 | file://{{=machine}}-user-patches.scc \ |
21 | file://{{=machine}}-user-features.scc \ | ||
21 | " | 22 | " |
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend index 088bcc2d4c..7818a9232e 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend | |||
@@ -19,6 +19,7 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
19 | SRC_URI += "file://{{=machine}}-preempt-rt.scc \ | 19 | SRC_URI += "file://{{=machine}}-preempt-rt.scc \ |
20 | file://{{=machine}}-user-config.cfg \ | 20 | file://{{=machine}}-user-config.cfg \ |
21 | file://{{=machine}}-user-patches.scc \ | 21 | file://{{=machine}}-user-patches.scc \ |
22 | file://{{=machine}}-user-features.scc \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | # uncomment and replace these SRCREVs with the real commit ids once you've had | 25 | # uncomment and replace these SRCREVs with the real commit ids once you've had |
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend index ceb8928cd1..d6eac73d81 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend | |||
@@ -19,6 +19,7 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
19 | SRC_URI += "file://{{=machine}}-tiny.scc \ | 19 | SRC_URI += "file://{{=machine}}-tiny.scc \ |
20 | file://{{=machine}}-user-config.cfg \ | 20 | file://{{=machine}}-user-config.cfg \ |
21 | file://{{=machine}}-user-patches.scc \ | 21 | file://{{=machine}}-user-patches.scc \ |
22 | file://{{=machine}}-user-features.scc \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | # uncomment and replace these SRCREVs with the real commit ids once you've had | 25 | # uncomment and replace these SRCREVs with the real commit ids once you've had |
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend index cf8bf1d07e..09f9b05d0e 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend | |||
@@ -19,6 +19,7 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
19 | SRC_URI += "file://{{=machine}}-standard.scc \ | 19 | SRC_URI += "file://{{=machine}}-standard.scc \ |
20 | file://{{=machine}}-user-config.cfg \ | 20 | file://{{=machine}}-user-config.cfg \ |
21 | file://{{=machine}}-user-patches.scc \ | 21 | file://{{=machine}}-user-patches.scc \ |
22 | file://{{=machine}}-user-features.scc \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | # uncomment and replace these SRCREVs with the real commit ids once you've had | 25 | # uncomment and replace these SRCREVs with the real commit ids once you've had |
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend index a8e32eebf2..751dd7b8ff 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend | |||
@@ -19,6 +19,7 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
19 | SRC_URI += "file://{{=machine}}-standard.scc \ | 19 | SRC_URI += "file://{{=machine}}-standard.scc \ |
20 | file://{{=machine}}-user-config.cfg \ | 20 | file://{{=machine}}-user-config.cfg \ |
21 | file://{{=machine}}-user-patches.scc \ | 21 | file://{{=machine}}-user-patches.scc \ |
22 | file://{{=machine}}-user-features.scc \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | # uncomment and replace these SRCREVs with the real commit ids once you've had | 25 | # uncomment and replace these SRCREVs with the real commit ids once you've had |