yocto-bsp: add missing user include updates
cover yocto-bsp: add missing user include updates
From: Tom Zanussi <[email protected]>
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(-)Signature · 1 line
1.7.11.4
PATCH 1/1 yocto-bsp: prepend includes in machine.scc files with machine
From: Tom Zanussi <[email protected]>
The names of the -user files were changed to have the machine prepended, but the includes weren't - fix the includes.
---
.../{{ 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(-)scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc +2 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/{{=machine}}.scc +2 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc +2 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc +2 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc +2 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc +2 -2
@@ -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
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc +2 -2
@@ -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
Signature · 1 line
1.7.11.4