From 19eb07a9f66cf55ca5c1e2acb74dc6ce2eb7772e Mon Sep 17 00:00:00 2001
From: Sergey Matyukevich <geomatsi@gmail.com>
Date: Tue, 19 Jun 2018 21:29:24 +0300
Subject: [PATCH] Fix regression: mainline defconfig files are not used

Mainline defconfig files from recipes-kernel/linux/linux-mainline
directories are not merged into the final kernel config.

As a result, build ends up with some default ARM kernel
w/o Allwinner support.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 recipes-kernel/linux/linux.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index bef63e2..2000a21 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -111,6 +111,9 @@ do_configure_prepend() {
         kernel_conf_variable CMDLINE \"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"
     fi
 
+    sed -e "${CONF_SED_SCRIPT}" \
+    < '${WORKDIR}/defconfig' >>'${B}/.config'
+
     yes '' | oe_runmake -C ${S} O=${B} oldconfig
 }