From ad8540d84c157d55cceae8888178c5de7b462fef Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sat, 8 Jun 2013 12:09:32 +0200 Subject: kernel-headers: use environment Signed-off-by: Michael Olbrich (cherry picked from commit d2a0730603bc6ec5a4e2c57a47ee5c0d07f96706) Signed-off-by: Michael Olbrich --- rules/kernel-headers.make | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rules/kernel-headers.make b/rules/kernel-headers.make index 3ce7618..0d2e8ee 100644 --- a/rules/kernel-headers.make +++ b/rules/kernel-headers.make @@ -60,8 +60,10 @@ KERNEL_HEADERS_MAKEVARS := \ $(STATEDIR)/kernel-headers.prepare: @$(call targetinfo) - $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) defconfig - yes "" | $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) oldconfig + $(KERNEL_HEADERS_ENV) $(KERNEL_HEADERS_PATH) \ + $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) defconfig + $(KERNEL_HEADERS_ENV) $(KERNEL_HEADERS_PATH) \ + yes "" | $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) oldconfig @$(call touch) @@ -76,7 +78,8 @@ ifndef PTXCONF_KERNEL_HEADERS_SANITIZED # this is used to generate asm and asm/mach links for arm # but fails on ppc/powerpc, thus the '-' and '-k' # - -$(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) archprepare -k + @-$(KERNEL_HEADERS_ENV) $(KERNEL_HEADERS_PATH) \ + $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) archprepare -k # # if the include/asm link is missing, it's really fatal # @@ -92,7 +95,9 @@ $(STATEDIR)/kernel-headers.install: @$(call targetinfo) ifdef PTXCONF_KERNEL_HEADERS_SANITIZED - $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) headers_install INSTALL_HDR_PATH=$(SYSROOT)/usr + @$(KERNEL_HEADERS_ENV) $(KERNEL_HEADERS_PATH) \ + $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) \ + headers_install INSTALL_HDR_PATH=$(SYSROOT)/usr else mkdir -p $(SYSROOT)/usr/include/asm cp -r $(KERNEL_HEADERS_DIR)/include/linux $(SYSROOT)/usr/include -- cgit v1.2.3