From 15043fae43399c4a8ac99ce43d2a098107faefbb Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 12 Mar 2013 02:33:05 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../{{=machine}}-user-features.scc" | 0 ...if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" | 1 + ...nel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 1 + ...choice == \"linux-yocto-tiny_3.4\": }} linux-yocto-tiny_3.4.bbappend" | 1 + ...if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 1 + ...if kernel_choice == \"linux-yocto_3.8\": }} linux-yocto_3.8.bbappend" | 1 + 6 files changed, 5 insertions(+) create mode 100644 "scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-user-features.scc" (limited to 'scripts/lib/bsp/substrate/target/arch/powerpc') diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-user-features.scc" "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-user-features.scc" new file mode 100644 index 0000000000..e69de29bb2 diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" index 0d814469fb..5112c07a56 100644 --- "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" @@ -18,4 +18,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ + file://{{=machine}}-user-features.scc \ " diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/powerpc/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/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/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" SRC_URI += "file://{{=machine}}-preempt-rt.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ + file://{{=machine}}-user-features.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-tiny_3.4\": }} linux-yocto-tiny_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/powerpc/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/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-tiny_3.4\": }} linux-yocto-tiny_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/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" SRC_URI += "file://{{=machine}}-tiny.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ + file://{{=machine}}-user-features.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" index 3b12ed8011..bc5b0aa487 100644 --- "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/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" SRC_URI += "file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ + file://{{=machine}}-user-features.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.8\": }} linux-yocto_3.8.bbappend" "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.8\": }} linux-yocto_3.8.bbappend" index cb24ffdb0e..d2559e0da1 100644 --- "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.8\": }} linux-yocto_3.8.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/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" SRC_URI += "file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ + file://{{=machine}}-user-features.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had -- cgit v1.2.3-54-g00ecf