X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/df44890bd5ed1bac3eef4465ff9c503bd52630b1..74d78766e81f8608556c0ca22a3804f4b5fd1a87:/toolchain/kernel-headers/Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 104b44c19..b5aaa83c4 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -31,9 +31,9 @@ ifeq ($(strip $(BOARD)),uml)
   LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH)))
 endif
 
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
-  LINUX_HAS_HEADERS_INSTALL:=y
-endif
+HOST_EXTRACFLAGS=
+
+LINUX_HAS_HEADERS_INSTALL:=y
 
 KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
@@ -43,73 +43,60 @@ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
 	KBUILD_HAVE_NLS=no \
 	CONFIG_SHELL=$(BASH)
 
-ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
-  define Host/Prepare/all
-	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
+define Host/Configure/all
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev
 	$(KMAKE) \
-		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \
+		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \
 		headers_install
-	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
-		$(CP) \
-			$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
-			$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
-	fi
-  endef
-else
-  define Host/Prepare/all
-	$(KMAKE) include/linux/version.h include/asm
-	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
-	cp -pLR $(HOST_BUILD_DIR)/include/asm $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
-	cp -pLR $(HOST_BUILD_DIR)/include/asm-generic $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
-	cp -pLR $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH) $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
-	cp -pLR $(HOST_BUILD_DIR)/include/linux $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
-  endef
-endif
+endef
 
 # XXX: the following is needed to build lzma-loader
-define Host/Prepare/lzma
+ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
+  define Host/Configure/lzma
 	$(CP) \
-		$(HOST_BUILD_DIR)/include/asm-mips/asm.h \
-		$(HOST_BUILD_DIR)/include/asm-mips/regdef.h \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
-endef
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
+  endef
+endif
 
-define Host/Prepare/post/cris
+define Host/Configure/post/cris
 	$(CP) \
 		$(HOST_BUILD_DIR)/include/linux/user.h \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
-	ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch-v10/arch \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch
-	$(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/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
+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/usr/include/asm/
+		$(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