From: Florian Fainelli <f.fainelli@gmail.com>
Date: Sun, 13 Sep 2020 00:09:53 +0000 (-0700)
Subject: kernel-defaults: Delete external source tree user_headers
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=09760cbb3b9d79472c1c6803a32128b7fbb161c4;p=openwrt%2Fstaging%2Fjow.git

kernel-defaults: Delete external source tree user_headers

When we use an external kernel tree which may not have been fully
cleaned, there may be user_headers left which do not match the target
architecture, leading to build failures for packages that do an explicit
inclusion of user_headers (such as iproute2 or iptables). Make sure we
delete them while preparing the directory.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 863c180e48..6be4cff1f2 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -46,6 +46,7 @@ else
 		rmdir $(LINUX_DIR); \
 	fi
 	ln -s $(CONFIG_EXTERNAL_KERNEL_TREE) $(LINUX_DIR)
+	$(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] && rm -rf $(LINUX_DIR)/user_headers
   endef
 endif