diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-02-06 23:22:42 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-07 22:59:50 +0000 |
| commit | 05c18a1dcf648848ef5853b32421cf292d2eb724 (patch) | |
| tree | 79a105088a862a98778148350bcf959776d1a2b5 | |
| parent | 713e7b9f740bb5fbbaac6acda07a9d52e210407d (diff) | |
| download | poky-05c18a1dcf648848ef5853b32421cf292d2eb724.tar.gz | |
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 <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | |||
| 3 | 3 | ||
| 4 | include features/usb-net/usb-net.scc | 4 | include features/usb-net/usb-net.scc |
| 5 | 5 | ||
| 6 | kconf hardware user-config.cfg | 6 | kconf hardware {{=machine}}-user-config.cfg |
| 7 | include user-patches.scc | 7 | 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 | |||
| 19 | include cfg/boot-live.scc | 19 | include cfg/boot-live.scc |
| 20 | include features/power/intel.scc | 20 | include features/power/intel.scc |
| 21 | 21 | ||
| 22 | kconf hardware user-config.cfg | 22 | kconf hardware {{=machine}}-user-config.cfg |
| 23 | include user-patches.scc | 23 | 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 | |||
| 6 | {{ if kernel_choice == "linux-yocto_3.4": }} | 6 | {{ if kernel_choice == "linux-yocto_3.4": }} |
| 7 | include cfg/fs/vfat.scc | 7 | include cfg/fs/vfat.scc |
| 8 | 8 | ||
| 9 | kconf hardware user-config.cfg | 9 | kconf hardware {{=machine}}-user-config.cfg |
| 10 | include user-patches.scc | 10 | 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 | |||
| 8 | 8 | ||
| 9 | include cfg/dmaengine.scc | 9 | include cfg/dmaengine.scc |
| 10 | 10 | ||
| 11 | kconf hardware user-config.cfg | 11 | kconf hardware {{=machine}}-user-config.cfg |
| 12 | include user-patches.scc | 12 | 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 @@ | |||
| 1 | kconf hardware {{=machine}}.cfg | 1 | kconf hardware {{=machine}}.cfg |
| 2 | 2 | ||
| 3 | kconf hardware user-config.cfg | 3 | kconf hardware {{=machine}}-user-config.cfg |
| 4 | include user-patches.scc | 4 | 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 | |||
| 8 | include cfg/usb-mass-storage.scc | 8 | include cfg/usb-mass-storage.scc |
| 9 | include features/power/intel.scc | 9 | include features/power/intel.scc |
| 10 | 10 | ||
| 11 | kconf hardware user-config.cfg | 11 | kconf hardware {{=machine}}-user-config.cfg |
| 12 | include user-patches.scc | 12 | include {{=machine}}-user-patches.scc |