[poky] [PATCH 1/1][danny] yocto-bsp: prepend includes in machine.scc files with machine
tom.zanussi at linux.intel.com
tom.zanussi at linux.intel.com
Thu Feb 7 06:49:31 PST 2013
From: Tom Zanussi <tom.zanussi at linux.intel.com>
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 <tom.zanussi at linux.intel.com>
---
.../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 39f87f5..24196e6 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 d8d28ce..41e1635 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 e3daafb..1ebbc32 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 1585fa4..0d64f58 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 0f20dcd..f3739be 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 d8d3d35..6189931 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
--
1.7.11.4
More information about the poky
mailing list