X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=f7842cb9bd8b8659da305928519850c27b2e0bf6;hp=68fa1bc4e88b40323762f832561b214b640e9bb9;hb=0c9be4f76b25e1e69c878b2a7b50a17eb50bd9a6;hpb=c6bc77ea365704f3f5c79d64aed069792a4e95b1

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 68fa1bc4e8..f7842cb9bd 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -1,68 +1,104 @@
 # 
-# 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.
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=linux
-PKG_VERSION:=$(LINUX_VERSION)
-PKG_SOURCE:=$(LINUX_SOURCE)
-PKG_SOURCE_URL:=$(LINUX_SITE)
-
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
-PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
-LINUX_DIR := $(PKG_BUILD_DIR)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 override QUILT:=
+override HOST_QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/host-build.mk
+
+PKG_NAME:=linux
+PKG_VERSION:=$(LINUX_VERSION)
+PKG_SOURCE:=$(LINUX_SOURCE)
+ifneq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
+  PKG_SOURCE_PROTO:=git
+  PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI))
+  PKG_SOURCE_VERSION:=$(CONFIG_KERNEL_GIT_REF)
+else
+  PKG_SOURCE_URL:=$(LINUX_SITE)
+endif
+HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+PKG_HASH:=$(LINUX_KERNEL_HASH)
+LINUX_DIR := $(HOST_BUILD_DIR)
+FILES_DIR := 
+PATCH_DIR := ./patches$(if $(wildcard ./patches-$(LINUX_VERSION)),-$(LINUX_VERSION))
+
+include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
-define Build/Prepare/cris
-	mkdir -p $(BUILD_DIR_TOOLCHAIN)
-	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(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
+
+HOST_EXTRACFLAGS=
+
+LINUX_HAS_HEADERS_INSTALL:=y
+
+KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
+	$(KERNEL_MAKE_FLAGS) \
+	CC="$(KERNEL_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)"
 
-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
+define Host/Configure/all
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev
+	$(KMAKE) \
+		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \
+		headers_install
 endef
 
-ifneq (,$(findstring uml,$(BOARD)))
-  LINUX_KARCH:=$(ARCH)
+# XXX: the following is needed to build lzma-loader
+ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
+  define Host/Configure/lzma
+	$(CP) \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/asm-eva.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
+  endef
 endif
 
-KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
-	ARCH=$(LINUX_KARCH) \
-	CONFIG_SHELL=$(BASH)
+define Host/Configure/post/mips
+	$(call Host/Configure/lzma)
+endef
+
+define Host/Configure/post/mipsel
+	$(call Host/Configure/lzma)
+endef
+
+define Host/Prepare
+	rm -rf $(BUILD_DIR_TOOLCHAIN)/linux-*
+	$(call Kernel/Prepare/Default)
+	rm -f $(BUILD_DIR_TOOLCHAIN)/linux
+	ln -s linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
+	$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
+endef
 
-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/Configure
+	env
 	yes '' | $(KMAKE) oldconfig
-	$(KMAKE) include/linux/version.h include/asm
-	$(call Build/Configure/$(ARCH))
+	$(call Host/Configure/all)
+	$(call Host/Configure/post/$(ARCH))
 endef
 
-define Build/Configure
+define Host/Compile
 endef
 
-define Build/Compile
+define Host/Install
+	$(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/
 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))