From 05c18a1dcf648848ef5853b32421cf292d2eb724 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 6 Feb 2013 23:22:42 -0600 Subject: 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. (From meta-yocto rev: f56d24c04f00cfb2671e3f097f221d636ebb7943) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../target/arch/arm/recipes-kernel/linux/files/{{=machine}}.scc | 4 ++-- .../target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc | 4 ++-- .../target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc | 4 ++-- .../target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc | 4 ++-- .../target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc | 4 ++-- .../target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}.scc index 39f87f5e84..24196e6f67 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/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/i386/recipes-kernel/linux/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc index d8d28cec7b..41e16355bf 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/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/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc index e3daafb692..1ebbc32d7e 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/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/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc index 1585fa4b1c..0d64f58a18 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/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/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc index 0f20dcd6be..f3739be1e6 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/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/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc index d8d3d3524d..61899319da 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/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 -- cgit v1.2.3-54-g00ecf