From: Tom Zanussi Date: Thu, 7 Feb 2013 05:22:42 +0000 (-0600) Subject: yocto-bsp: prepend includes in machine.scc files with machine X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c430d6a0d126df7a51c0f585665de6aebbeac028;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git yocto-bsp: prepend includes in machine.scc files with machine The names of the -user files were changed to have the machine prepended, but the includes weren't - fix the includes. Signed-off-by: Tom Zanussi --- diff --git "a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" index 39f87f5e842..24196e6f67c 100644 --- "a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" @@ -3,5 +3,5 @@ kconf non-hardware {{machine}}-non_hardware.cfg include features/usb-net/usb-net.scc -kconf hardware user-config.cfg -include user-patches.scc +kconf hardware {{=machine}}-user-config.cfg +include {{=machine}}-user-patches.scc diff --git "a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/{{=machine}}.scc" index 8b94e588a45..2e3ca90793b 100644 --- "a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/{{=machine}}.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/{{=machine}}.scc" @@ -13,5 +13,5 @@ kconf hardware {{=machine}}.cfg # These are used by yocto-kernel to add config fragments and features. # Don't remove if you plan on using yocto-kernel with this BSP. -kconf hardware user-config.cfg -include user-patches.scc +kconf hardware {{=machine}}-user-config.cfg +include {{=machine}}-user-patches.scc diff --git "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" index d8d28cec7b0..41e16355bf9 100644 --- "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" @@ -19,5 +19,5 @@ include cfg/usb-mass-storage.scc include cfg/boot-live.scc include features/power/intel.scc -kconf hardware user-config.cfg -include user-patches.scc +kconf hardware {{=machine}}-user-config.cfg +include {{=machine}}-user-patches.scc diff --git "a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" index e3daafb692d..1ebbc32d7e9 100644 --- "a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" @@ -6,5 +6,5 @@ include cfg/vfat.scc {{ if kernel_choice == "linux-yocto_3.4": }} include cfg/fs/vfat.scc -kconf hardware user-config.cfg -include user-patches.scc +kconf hardware {{=machine}}-user-config.cfg +include {{=machine}}-user-patches.scc diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" index 1585fa4b1ce..0d64f58a18b 100644 --- "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" @@ -8,5 +8,5 @@ include cfg/fs/vfat.scc include cfg/dmaengine.scc -kconf hardware user-config.cfg -include user-patches.scc +kconf hardware {{=machine}}-user-config.cfg +include {{=machine}}-user-patches.scc diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" index 0f20dcd6bea..f3739be1e69 100644 --- "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" @@ -1,4 +1,4 @@ kconf hardware {{=machine}}.cfg -kconf hardware user-config.cfg -include user-patches.scc +kconf hardware {{=machine}}-user-config.cfg +include {{=machine}}-user-patches.scc diff --git "a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" index d8d3d3524d9..61899319dad 100644 --- "a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" @@ -8,5 +8,5 @@ include features/i915/i915.scc include cfg/usb-mass-storage.scc include features/power/intel.scc -kconf hardware user-config.cfg -include user-patches.scc +kconf hardware {{=machine}}-user-config.cfg +include {{=machine}}-user-patches.scc