X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=90f8eb1a3c2aea57bb143d501ef79d47a6a73a19;hb=79beb6c1e95010c46f6f99392236ceb0d20cc0a6;hp=b5aaa83c4710441084ce4a369426d09c0d885bfe;hpb=6a5754106177adff67148ceb366e4a9de48103bf;p=openwrt.git diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index b5aaa83c47..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 @@ -36,6 +36,7 @@ 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)" \ @@ -56,28 +57,11 @@ ifneq ($(CONFIG_mips)$(CONFIG_mipsel),) $(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/Configure/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 /d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h -endef - -define Host/Configure/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/Configure/post/mips $(call Host/Configure/lzma) endef