2 files changed, 2 insertions, 8 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 98272fcc3b..a374df13be 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -118,12 +118,6 @@ python do_kernel_configcheck() {
     bb.plain( "%s" % result )
 }
 
-# overrides the base kernel_do_configure, since we don't want all the
-# defconfig processing in there
-kernel_do_configure() {
-        yes '' | oe_runmake oldconfig
-}
-
 
 # Ensure that the branches (BSP and meta) are on the locatios specified by
 # their SRCREV values. If they are NOT on the right commits, the branches
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 2e36e86eb8..9c492a3ecc 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -181,8 +181,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