yocto-bsp: make vfat feature inclusion conditional on kernel version

From: Tom Zanussi <[email protected]>

The linux-yocto-3.2 cfg/vfat feature changed location to cfg/fs/vfat in the 3.4 yocto kernel's meta branch. Add template code to include the appropriate version depending on kernel version.

Fixes [YOCTO #3178].

---
 .../target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc      | 4 +++-
 .../target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc   | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

index 7d29541..e3daafb 100644
@@ -1,8 +1,10 @@
 kconf hardware {{=machine}}.cfg
 
 include cfg/usb-mass-storage.scc
+{{ if kernel_choice == "linux-yocto_3.2": }}
 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
-

index 8a04ddd..ec46ec1 100644
@@ -1,7 +1,11 @@
 kconf hardware {{=machine}}.cfg
 
 include cfg/usb-mass-storage.scc
+{{ if kernel_choice == "linux-yocto_3.2": }}
 include cfg/vfat.scc
+{{ if kernel_choice == "linux-yocto_3.4": }}
+include cfg/fs/vfat.scc
+
 include cfg/dmaengine/dmaengine.scc
 
 kconf hardware user-config.cfg

1.7.11.4

From: Tom Zanussi <[email protected]>

The cfg/dmaengine/dmaengine feature changed location to cfg/dmaengine in the 3.4 yocto kernel's meta branch. Add template code to include the appropriate version.

---
 .../target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index ec46ec1..1585fa4 100644
@@ -6,7 +6,7 @@ include cfg/vfat.scc
 {{ if kernel_choice == "linux-yocto_3.4": }}
 include cfg/fs/vfat.scc
 
-include cfg/dmaengine/dmaengine.scc
+include cfg/dmaengine.scc
 
 kconf hardware user-config.cfg
 include user-patches.scc

1.7.11.4

From: Tom Zanussi <[email protected]>

This patchset fixes YOCTO #3178 [building a power pc image with a layer created using yocto-bsp fails due to cfg/vfat not available] and a similar problem with the dmaengine feature.

Build-tested both 3.2 and 3.4 kernels using yocto-bsp-generated powerpc BSPs.

The following changes since commit f40bfd2e5f91a3c699833f19cec435a9b897f4b5:

bitbake: hob/builder: When you stop a build, Hob should tell you stopping is happening (2012-09-27 16:45:28 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-ppc-fix
http://git.yoctoproject.org/cgit.cgi//log/?h=tzanussi/yocto-bsp-ppc-fix

Tom Zanussi (2):
yocto-bsp: make vfat feature inclusion conditional on kernel version
yocto-bsp: fix dmaengine feature inclusion

 .../target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc    | 4 +++-
 .../target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

1.7.11.4

Merged to master, thanks.

Richard