package/dropbear: bump release number (missed in r20960)

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

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 0494514..8241bdc 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -21,30 +21,34 @@ PKG_SOURCE_URL:=$(LINUX_SITE)
 HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(HOST_BUILD_DIR)
 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))

 
 include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 ifeq ($(strip $(BOARD)),uml)
 
 include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 ifeq ($(strip $(BOARD)),uml)

-  LINUX_KARCH:=$(ARCH)
+  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
 
 endif
 
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
   LINUX_HAS_HEADERS_INSTALL:=y
 endif
 

+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1)
+  LINUX_ASM_INCLUDES:=arch/$(LINUX_KARCH)/include/asm
+else
+  LINUX_ASM_INCLUDES:=include/asm
+endif
+

 KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
        ARCH=$(LINUX_KARCH) \
        KBUILD_HAVE_NLS=no \
        CONFIG_SHELL=$(BASH)
 
 KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
        ARCH=$(LINUX_KARCH) \
        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 \
 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; \
                $(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; \


@@ -62,12 +66,10 @@ ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
 else
   define Host/Prepare/all
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
 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
 
   endef
 endif
 


@@ -79,27 +81,23 @@ define Host/Prepare/lzma
                $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
 endef
 
                $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
 endef
 

-# XXX: the following are needed to build a cris toolchain

 define Host/Prepare/post/cris
        $(CP) \
                $(HOST_BUILD_DIR)/include/linux/user.h \
 define Host/Prepare/post/cris
        $(CP) \
                $(HOST_BUILD_DIR)/include/linux/user.h \

+               $(HOST_BUILD_DIR)/include/linux/autoconf.h \

                $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
                $(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
+
+define Host/Prepare/post/ubicom32

        $(CP) \
        $(CP) \

-               $(HOST_BUILD_DIR)/include/asm-cris/elf.h \
-               $(HOST_BUILD_DIR)/include/asm-cris/page.h \
-               $(HOST_BUILD_DIR)/include/asm-cris/user.h \
+               $(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/usr/include/asm/

-       mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch
-       $(CP) \
-               $(HOST_BUILD_DIR)/include/asm-cris/arch/elf.h \
-               $(HOST_BUILD_DIR)/include/asm-cris/arch/page.h \
-               $(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/
-       $(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
 
 define Host/Prepare/post/mips
 endef
 
 define Host/Prepare/post/mips


@@ -115,7 +113,7 @@ define Host/Prepare
        ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
        $(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
        yes '' | $(KMAKE) oldconfig
        ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
        $(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
        yes '' | $(KMAKE) oldconfig

-       $(KMAKE) include/linux/version.h include/asm
+       $(KMAKE) include/linux/version.h $(LINUX_ASM_INCLUDES)

        if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
                $(CP) \
                        $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
        if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
                $(CP) \
                        $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \