From: Christian Lamparter Date: Sat, 24 Sep 2022 17:57:26 +0000 (+0200) Subject: uml: headers are not exportable X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1ce2691bf3dacca41559a20e7f1a55587469dfae;p=openwrt%2Fstaging%2Fnbd.git uml: headers are not exportable When building UML this showed up as of late (2022-09-01): | Makefile:1335: *** Headers not exportable for UML. Stop. This message popped up because of an upstream patch that fixed this error not showing up sooner. For more information see: Now, I don't think we can just skip the kernel headers. Some userspace applications are going to need these. So, The next best alternative I can think of, is to go with the headers by the host arch the UML is compiled for. (Technically, ARCH= should be safe for all other targets as well... But let's not poke a hornet's nest) Signed-off-by: Christian Lamparter --- diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 2e21392016..dcba319a0f 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -117,7 +117,7 @@ define Kernel/Configure/Default cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config; \ cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev; \ } - $(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(KERNEL_MAKE) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install + $(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(KERNEL_MAKE) $(if $(findstring uml,$(BOARD)),ARCH=$(ARCH)) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install grep '=[ym]' $(LINUX_DIR)/.config.set | LC_ALL=C sort | $(MKHASH) md5 > $(LINUX_DIR)/.vermagic endef