[openwrt/openwrt] kernel-defaults: Delete external source tree user_headers

LEDE Commits lede-commits at lists.infradead.org
Sat Jan 9 17:50:55 EST 2021


florian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/09760cbb3b9d79472c1c6803a32128b7fbb161c4

commit 09760cbb3b9d79472c1c6803a32128b7fbb161c4
Author: Florian Fainelli <f.fainelli at gmail.com>
AuthorDate: Sat Sep 12 17:09:53 2020 -0700

    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 at gmail.com>
---
 include/kernel-defaults.mk | 1 +
 1 file changed, 1 insertion(+)

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
 



More information about the lede-commits mailing list