X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=90f8eb1a3c2aea57bb143d501ef79d47a6a73a19;hb=d807337fcd5d74d0dfd59253bdefcc997749deb3;hp=2a90e3d98a44e51821a502ca9f7186d3a0822865;hpb=ac36e7bbbfcf8ec780c38dfa40c799331a5c83da;p=15.05%2Fopenwrt.git

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 2a90e3d98a..90f8eb1a3c 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -22,7 +22,7 @@ HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(HOST_BUILD_DIR)
 FILES_DIR := 
-PATCH_DIR := ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+PATCH_DIR := ./patches$(if $(wildcard ./patches-$(LINUX_VERSION)),-$(LINUX_VERSION))
 
 include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
@@ -31,9 +31,12 @@ ifeq ($(strip $(BOARD)),uml)
   LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH)))
 endif
 
+HOST_EXTRACFLAGS=
+
 LINUX_HAS_HEADERS_INSTALL:=y
 
 KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
+	HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
 	ARCH=$(LINUX_KARCH) \
 	CC="$(KERNEL_CC)" \
 	CFLAGS="$(TARGET_CFLAGS)" \
@@ -41,7 +44,7 @@ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
 	KBUILD_HAVE_NLS=no \
 	CONFIG_SHELL=$(BASH)
 
-define Host/Prepare/all
+define Host/Configure/all
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev
 	$(KMAKE) \
 		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \
@@ -50,50 +53,34 @@ endef
 
 # XXX: the following is needed to build lzma-loader
 ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
-  define Host/Prepare/lzma
+  define Host/Configure/lzma
 	$(CP) \
 		$(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \
 		$(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \
+		$(if $(call kernel_patchver_ge,3.15.0),$(HOST_BUILD_DIR)/arch/mips/include/asm/asm-eva.h) \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
   endef
 endif
 
-define Host/Prepare/post/cris
-	$(CP) \
-		$(HOST_BUILD_DIR)/include/linux/user.h \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/linux/
-	ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch-v10/arch \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch
-	$(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h
-endef
-
-define Host/Prepare/post/ubicom32
-	$(CP) \
-		$(HOST_BUILD_DIR)/arch/ubicom32/include/asm/elf.h \
-		$(HOST_BUILD_DIR)/arch/ubicom32/include/asm/user.h \
-		$(HOST_BUILD_DIR)/arch/ubicom32/include/asm/page.h \
-		$(HOST_BUILD_DIR)/arch/ubicom32/include/asm/page_offset.h \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
-endef
-
-define Host/Prepare/post/mips
-	$(call Host/Prepare/lzma)
+define Host/Configure/post/mips
+	$(call Host/Configure/lzma)
 endef
 
-define Host/Prepare/post/mipsel
-	$(call Host/Prepare/lzma)
+define Host/Configure/post/mipsel
+	$(call Host/Configure/lzma)
 endef
 
 define Host/Prepare
 	$(call Kernel/Prepare/Default)
 	ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
 	$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
-	yes '' | $(KMAKE) oldconfig
-	$(call Host/Prepare/all)
-	$(call Host/Prepare/post/$(ARCH))
 endef
 
 define Host/Configure
+	env
+	yes '' | $(KMAKE) oldconfig
+	$(call Host/Configure/all)
+	$(call Host/Configure/post/$(ARCH))
 endef
 
 define Host/Compile