From: Tom Zanussi Date: Thu, 27 Sep 2012 22:12:41 +0000 (-0500) Subject: yocto-bsp: make vfat feature inclusion conditional on kernel version X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d574c56c51789ec56ff50518ac2057607740eaa8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git yocto-bsp: make vfat feature inclusion conditional on kernel version 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]. Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- 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 7d295418fc6..e3daafb692d 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 @@ -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 - 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 8a04ddd1af1..ec46ec18e36 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 @@ -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