From 5fa82b9dda18296e86fb3b0dc3cba9710d2e3242 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 29 Mar 2013 17:07:22 -0500 Subject: [PATCH] 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(). (From meta-yocto rev: 56091c019000cfe3d22ec464c596d97ae78fc619) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../{{ if kernel_choice == \"custom\": }} linux-yocto-custom/defconfig" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e544a0a..ceb0ffa 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) }} -- 2.7.4