projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[package] pptp: don't remove server route if the gateway is 0.0.0.0, this fixes a...
[openwrt.git] / toolchain / kernel-headers / Makefile
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index cf5a384..8241bdc 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -9,11 +9,8 @@ include $(TOPDIR)/rules.mk
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
 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 QUILT:=
-override CONFIG_AUTOREBUILD=
+override HOST_QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk
 
 
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -21,41 +18,45 @@ PKG_NAME:=linux
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_SOURCE:=$(LINUX_SOURCE)
 PKG_SOURCE_URL:=$(LINUX_SITE)
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_SOURCE:=$(LINUX_SOURCE)
 PKG_SOURCE_URL:=$(LINUX_SITE)
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
-LINUX_DIR := $(PKG_BUILD_DIR)
+LINUX_DIR := $(HOST_BUILD_DIR)
+FILES_DIR := 
+PATCH_DIR := ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
 
 
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 ifeq ($(strip $(BOARD)),uml)
 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
 
-KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+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)
 
        ARCH=$(LINUX_KARCH) \
        KBUILD_HAVE_NLS=no \
        CONFIG_SHELL=$(BASH)
 
-define Build/Prepare/pre/cris
-       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
-       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
-endef
-
-define Build/Prepare/pre/powerpc
-       if [ -d $(PKG_BUILD_DIR)/include/asm-ppc ]; then \
-               $(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/; \
-               rm -rf $(PKG_BUILD_DIR)/include/asm-ppc; \
-               ln -s $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc; \
+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; \
        fi
 endef
 
 ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
        fi
 endef
 
 ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
-  define Build/Prepare/all
+  define Host/Prepare/all
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
        $(KMAKE) \
                CROSS_COMPILE=$(TARGET_CROSS) \
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
        $(KMAKE) \
                CROSS_COMPILE=$(TARGET_CROSS) \
@@ -63,85 +64,79 @@ ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
                headers_install
   endef
 else
                headers_install
   endef
 else
-  define Build/Prepare/all
+  define Host/Prepare/all
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
-       cp -pLR \
-               $(PKG_BUILD_DIR)/include/asm \
-               $(PKG_BUILD_DIR)/include/asm-generic \
-               $(PKG_BUILD_DIR)/include/asm-$(LINUX_KARCH) \
-               $(PKG_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
 
 # XXX: the following is needed to build lzma-loader
   endef
 endif
 
 # XXX: the following is needed to build lzma-loader
-define Build/Prepare/lzma
+define Host/Prepare/lzma
        $(CP) \
        $(CP) \
-               $(PKG_BUILD_DIR)/include/asm-mips/asm.h \
-               $(PKG_BUILD_DIR)/include/asm-mips/regdef.h \
+               $(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
 
                $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
 endef
 
-# XXX: the following are needed to build a cris toolchain
-define Build/Prepare/post/cris
+define Host/Prepare/post/cris
        $(CP) \
        $(CP) \
-               $(PKG_BUILD_DIR)/include/linux/user.h \
+               $(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) \
-               $(PKG_BUILD_DIR)/include/asm-cris/elf.h \
-               $(PKG_BUILD_DIR)/include/asm-cris/page.h \
-               $(PKG_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) \
-               $(PKG_BUILD_DIR)/include/asm-cris/arch/elf.h \
-               $(PKG_BUILD_DIR)/include/asm-cris/arch/page.h \
-               $(PKG_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
-               $(PKG_BUILD_DIR)/include/asm-cris/arch/user.h \
-               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch/
-       $(CP) \
-               $(PKG_BUILD_DIR)/include/asm-generic/memory_model.h \
-               $(PKG_BUILD_DIR)/include/asm-generic/page.h \
-               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm-generic/
 endef
 
 endef
 
-define Build/Prepare/post/mips
-       $(call Build/Prepare/lzma)
+define Host/Prepare/post/mips
+       $(call Host/Prepare/lzma)
 endef
 
 endef
 
-define Build/Prepare/post/mipsel
-       $(call Build/Prepare/lzma)
+define Host/Prepare/post/mipsel
+       $(call Host/Prepare/lzma)
 endef
 
 endef
 
-define Build/Prepare
+define Host/Prepare
        $(call Kernel/Prepare/Default)
        ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
        $(call Kernel/Prepare/Default)
        ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
-       $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
+       $(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
        yes '' | $(KMAKE) oldconfig
        yes '' | $(KMAKE) oldconfig
-       $(KMAKE) include/linux/version.h include/asm
-       if [ -d $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
+       $(KMAKE) include/linux/version.h $(LINUX_ASM_INCLUDES)
+       if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
                $(CP) \
                $(CP) \
-                       $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
-                       $(PKG_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
+                       $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
+                       $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
        fi
        fi
-       $(call Build/Prepare/pre/$(ARCH))
-       $(call Build/Prepare/all)
-       $(call Build/Prepare/post/$(ARCH))
+       $(call Host/Prepare/pre/$(ARCH))
+       $(call Host/Prepare/all)
+       $(call Host/Prepare/post/$(ARCH))
 endef
 
 endef
 
-define Build/Configure
+define Host/Configure
 endef
 
 endef
 
-define Build/Compile
+define Host/Compile
 endef
 
 endef
 
-define Build/Install
+define Host/Install
        $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/
 endef
 
        $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/
 endef
 
-define Build/Clean
+define Host/Clean
        rm -rf \
        rm -rf \
-               $(PKG_BUILD_DIR) \
+               $(HOST_BUILD_DIR) \
                $(BUILD_DIR_TOOLCHAIN)/linux \
                $(BUILD_DIR_TOOLCHAIN)/linux-dev
 endef
                $(BUILD_DIR_TOOLCHAIN)/linux \
                $(BUILD_DIR_TOOLCHAIN)/linux-dev
 endef
Personal OpenWRT clone
This page took 0.027052 seconds and 4 git commands to generate.