From 6b8dc76ae83be8a00cd726d55c1327031314f92e Mon Sep 17 00:00:00 2001 From: Trammell hudson Date: Tue, 6 Feb 2018 15:56:06 -0500 Subject: [PATCH] fix headers_install so that it does not corrupt the linux build tree #304 --- modules/linux | 4 ++-- modules/musl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/linux b/modules/linux index 98003788..90cc5ab1 100644 --- a/modules/linux +++ b/modules/linux @@ -15,10 +15,10 @@ linux_kconfig := $(or $(CONFIG_LINUX_CONFIG),config/linux.config) # Output directory for the Linux kernel build is based on the # configuration file name, not the board name -linux_board_dir := $(build)/$(linux_dir)/$(basename $(linux_kconfig)) +linux_board_dir := $(build)/$(linux_dir)/$(notdir $(basename $(linux_kconfig))) # temp file in the build dir to show that we have run make oldconfig -linux_config_file := $(basename $(linux_kconfig))/.config-$(BOARD) +linux_config_file := $(notdir $(basename $(linux_kconfig))/.config-$(BOARD)) linux_configure := \ $(MAKE) \ diff --git a/modules/musl b/modules/musl index 3cca3970..2c86f62a 100644 --- a/modules/musl +++ b/modules/musl @@ -37,10 +37,11 @@ musl_depends := musl-cross # Fake a target so that musl will force a header install by the # Linux kernel sources. -musl.intermediate: $(INSTALL)/include/linux/limits.h $(INSTALL)/include/linux/limits.h: $(build)/$(linux_dir)/.canary $(MAKE) \ -C "$(build)/$(linux_dir)" \ INSTALL_HDR_PATH="$(INSTALL)" \ + O="$(linux_board_dir)" \ + KCONFIG_CONFIG="$(pwd)/$(linux_kconfig)" \ headers_install