* [PATCH 0/1] yocto-bsp: add missing user include updates
@ 2013-02-07 14:48 tom.zanussi
2013-02-07 14:48 ` [PATCH 1/1] yocto-bsp: prepend includes in machine.scc files with machine tom.zanussi
0 siblings, 1 reply; 2+ messages in thread
From: tom.zanussi @ 2013-02-07 14:48 UTC (permalink / raw)
To: poky; +Cc: Tom Zanussi
From: Tom Zanussi <tom.zanussi@linux.intel.com>
The previous patch, 'yocto-bsp: qualify user files with machine name',
was missing some -user include updates.
Please pull into poky/master.
The following changes since commit 14fa964bbf8f3e2d798f8fd185c290a739cc8e0f:
qemuwrapper: Don't use STAGING_BINDIR_CROSS directly (2013-02-07 12:59:15 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-user-include-fixes-master
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bsp-user-include-fixes-master
Tom Zanussi (1):
yocto-bsp: prepend includes in machine.scc files with machine
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] yocto-bsp: prepend includes in machine.scc files with machine
2013-02-07 14:48 [PATCH 0/1] yocto-bsp: add missing user include updates tom.zanussi
@ 2013-02-07 14:48 ` tom.zanussi
0 siblings, 0 replies; 2+ messages in thread
From: tom.zanussi @ 2013-02-07 14:48 UTC (permalink / raw)
To: poky; +Cc: Tom Zanussi
From: Tom Zanussi <tom.zanussi@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@linux.intel.com>
---
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
.../{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
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 39f87f5..24196e6 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 8b94e58..2e3ca90 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 d8d28ce..41e1635 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 e3daafb..1ebbc32 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 1585fa4..0d64f58 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 0f20dcd..f3739be 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 d8d3d35..6189931 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
--
1.7.11.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-07 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-07 14:48 [PATCH 0/1] yocto-bsp: add missing user include updates tom.zanussi
2013-02-07 14:48 ` [PATCH 1/1] yocto-bsp: prepend includes in machine.scc files with machine tom.zanussi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.