From 0ecf20b791ac200286ecfa0bf657c39840c8c089 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 5 Aug 2011 19:49:00 +0200 Subject: [PATCH] kernel: copy defconfig to {B} vs {S} For kernel's that use a split source/object build the copy of defconfig to {S} in the base kernel class is problematic. The previous solution for this was to override the do_configure of the base kernel class in a subclass. While this is still a viable/valid option, it does mean that changes to the base do_configure will be missed. The solution to this is to copy a defconfig to {B} which is typically the same as {S}, so most kernel recipes won't see or care about this change. With this change in place, linux-yocto.bbclass can drop its override of do_configure. Tested with linux-yocto and oe linux recipes. (From meta-openembedded rev: 3d96cb8778d347d070d32c390f113cb36e4587c9) Signed-off-by: Bruce Ashfield Signed-off-by: Koen Kooi Signed-off-by: Patrick Ohly --- meta-openembedded/meta-oe/classes/kernel.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/classes/kernel.bbclass b/meta-openembedded/meta-oe/classes/kernel.bbclass index edf455d..8629133 100644 --- a/meta-openembedded/meta-oe/classes/kernel.bbclass +++ b/meta-openembedded/meta-oe/classes/kernel.bbclass @@ -186,8 +186,8 @@ sysroot_stage_all_append() { kernel_do_configure() { # Copy defconfig to .config if .config does not exist. This allows # recipes to manage the .config themselves in do_configure_prepend(). - if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${S}/.config" ]; then - cp "${WORKDIR}/defconfig" "${S}/.config" + if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then + cp "${WORKDIR}/defconfig" "${B}/.config" fi yes '' | oe_runmake oldconfig -- 2.7.4