From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 29 Mar 2013 22:07:22 +0000 (-0500)
Subject: yocto-bsp: pass in file object to replace_file()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56091c019000cfe3d22ec464c596d97ae78fc619;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

yocto-bsp: pass in file object to replace_file()

Pass the file object instead of the filename to replace_file for the
custom template, as now required by replace_file().

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---

diff --git "a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/defconfig" "b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/defconfig"
index e544a0a4a52..ceb0ffa30c9 100644
--- "a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/defconfig"	
+++ "b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == \"custom\": }} linux-yocto-custom/defconfig"	
@@ -2,4 +2,4 @@
 # Placeholder for custom default kernel configuration.  yocto-bsp will
 # replace this file with a user-specified defconfig.
 #
-{{ if custom_kernel_defconfig: replace_file(current_file, custom_kernel_defconfig) }}
+{{ if custom_kernel_defconfig: replace_file(of, custom_kernel_defconfig) }}