[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 cb7ed49..8241bdc 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -1,5 +1,5 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,9 +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 HOST_QUILT:=

 
 include $(INCLUDE_DIR)/kernel.mk
 
 
 include $(INCLUDE_DIR)/kernel.mk
 


@@ -19,52 +18,127 @@ 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
 
 include $(INCLUDE_DIR)/kernel-defaults.mk
 

-define Build/Prepare/cris
-       mkdir -p $(BUILD_DIR_TOOLCHAIN)
-       bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(BUILD_DIR_TOOLCHAIN) $(TAR_OPTIONS)
-       $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/generic_2.6
-       $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
-       ln -sf arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
-       ln -sf arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
-endef
+ifeq ($(strip $(BOARD)),uml)
+  LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH)))
+endif

 
 

-define Build/Configure/powerpc
-       $(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/
-       rm -rf $(PKG_BUILD_DIR)/include/asm-ppc
-       mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
-endef
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
+  LINUX_HAS_HEADERS_INSTALL:=y
+endif

 
 

-ifneq (,$(findstring uml,$(BOARD)))
-  LINUX_KARCH:=$(ARCH)
+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
 
 endif
 

-KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \

        ARCH=$(LINUX_KARCH) \
        ARCH=$(LINUX_KARCH) \

+       KBUILD_HAVE_NLS=no \

        CONFIG_SHELL=$(BASH)
 
        CONFIG_SHELL=$(BASH)
 

-define Build/Prepare
-       $(if $(Build/Prepare/$(ARCH)),$(Build/Prepare/$(ARCH)),$(call Kernel/Prepare/Default))
-       $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-       ln -sf linux-$(LINUX_VERSION) $(LINUX_HEADERS_DIR)
+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),)
+  define Host/Prepare/all
+       mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
+       $(KMAKE) \
+               CROSS_COMPILE=$(TARGET_CROSS) \
+               INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \
+               headers_install
+  endef
+else
+  define Host/Prepare/all
+       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
+
+# XXX: the following is needed to build lzma-loader
+define Host/Prepare/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
+
+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/
+       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) \
+               $(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/
+endef
+
+define Host/Prepare/post/mips
+       $(call Host/Prepare/lzma)
+endef
+
+define Host/Prepare/post/mipsel
+       $(call Host/Prepare/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
        yes '' | $(KMAKE) oldconfig

-       $(KMAKE) include/linux/version.h include/asm
-       $(call Build/Configure/$(ARCH))
+       $(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/. \
+                       $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
+       fi
+       $(call Host/Prepare/pre/$(ARCH))
+       $(call Host/Prepare/all)
+       $(call Host/Prepare/post/$(ARCH))
+endef
+
+define Host/Configure

 endef
 
 endef
 

-define Build/Configure
+define Host/Compile

 endef
 
 endef
 

-define Build/Compile
+define Host/Install
+       $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/

 endef
 
 endef
 

-define Build/Install
+define Host/Clean
+       rm -rf \
+               $(HOST_BUILD_DIR) \
+               $(BUILD_DIR_TOOLCHAIN)/linux \
+               $(BUILD_DIR_TOOLCHAIN)/linux-dev

 endef
 
 $(eval $(call HostBuild))
 endef
 
 $(eval $(call HostBuild))