Fix kernel headers for cris (thanks hinkocevar)

[openwrt/svn-archive/archive.git] / toolchain / kernel-headers / Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 5fdfee9a6a062ed0e694ea18a4b437b29e718544..47737b0064c218923b1378bb4926824eea83f61d 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -9,12 +9,8 @@ include $(TOPDIR)/rules.mk
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
 override QUILT:=
 override HOST_QUILT:=
-override CONFIG_AUTOREBUILD=
 
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -26,7 +22,7 @@ HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(HOST_BUILD_DIR)
 
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 ifeq ($(strip $(BOARD)),uml)
@@ -42,13 +38,9 @@ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
        KBUILD_HAVE_NLS=no \
        CONFIG_SHELL=$(BASH)
 
-define Host/Prepare/pre/cris
-       ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/include/asm-cris/arch
-       ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/arch/cris/arch
-endef
-
 define Host/Prepare/pre/powerpc
        if [ -d $(HOST_BUILD_DIR)/include/asm-ppc ]; then \
+               mkdir -p $(PKG_BUILD_DIR)/include/asm-powerpc/; \
                $(CP) $(HOST_BUILD_DIR)/include/asm-ppc/* $(HOST_BUILD_DIR)/include/asm-powerpc/; \
                rm -rf $(HOST_BUILD_DIR)/include/asm-ppc; \
                ln -s $(HOST_BUILD_DIR)/include/asm-powerpc $(HOST_BUILD_DIR)/include/asm-ppc; \
@@ -66,12 +58,10 @@ ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
 else
   define Host/Prepare/all
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
-       cp -pLR \
-               $(HOST_BUILD_DIR)/include/asm \
-               $(HOST_BUILD_DIR)/include/asm-generic \
-               $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH) \
-               $(HOST_BUILD_DIR)/include/linux \
-               $(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
 
@@ -84,7 +74,16 @@ define Host/Prepare/lzma
 endef
 
 # XXX: the following are needed to build a cris toolchain
-define Host/Prepare/post/cris
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.28)),1)
+  define Host/Prepare/pre/cris
+       ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/include/asm-cris/arch
+       ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/arch/cris/arch
+  endef
+
+  define Host/Prepare/post/cris
+       $(CP) \
+               $(HOST_BUILD_DIR)/include/linux/user.h \
+               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
        $(CP) \
                $(HOST_BUILD_DIR)/include/linux/user.h \
                $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
@@ -93,6 +92,11 @@ define Host/Prepare/post/cris
                $(HOST_BUILD_DIR)/include/asm-cris/page.h \
                $(HOST_BUILD_DIR)/include/asm-cris/user.h \
                $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
+       $(CP) \
+               $(HOST_BUILD_DIR)/include/asm-generic/memory_model.h \
+               $(HOST_BUILD_DIR)/include/asm-generic/page.h \
+               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm-generic/
+
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch
        $(CP) \
                $(HOST_BUILD_DIR)/include/asm-cris/arch/elf.h \
@@ -100,11 +104,17 @@ define Host/Prepare/post/cris
                $(HOST_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
                $(HOST_BUILD_DIR)/include/asm-cris/arch/user.h \
                $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch/
+  endef
+else
+  define Host/Prepare/post/cris
        $(CP) \
-               $(HOST_BUILD_DIR)/include/asm-generic/memory_model.h \
-               $(HOST_BUILD_DIR)/include/asm-generic/page.h \
-               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm-generic/
-endef
+               $(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
+  endef
+endif
 
 define Host/Prepare/post/mips
        $(call Host/Prepare/lzma)