X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a860e07cbadb8cb81a6c87496e8b88f8883321af..c5a04aaadcc0cd1cee7174ed5fbb376ee30332d1:/toolchain/kernel-headers/Makefile?ds=sidebyside

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index a182c83c1..4c4d4273f 100644
--- 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.
@@ -9,10 +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 CONFIG_AUTOREBUILD=
+override HOST_QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -20,54 +18,123 @@ PKG_NAME:=linux
 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)
-LINUX_DIR := $(PKG_BUILD_DIR)
+LINUX_DIR := $(HOST_BUILD_DIR)
 
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
-define Build/Configure/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/Configure/powerpc
-	$(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
-endef
-
-ifneq (,$(findstring uml,$(BOARD)))
+ifeq ($(strip $(BOARD)),uml)
   LINUX_KARCH:=$(ARCH)
 endif
 
-KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
+  LINUX_HAS_HEADERS_INSTALL:=y
+endif
+
+KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
 	KBUILD_HAVE_NLS=no \
 	CONFIG_SHELL=$(BASH)
 
-define Build/Prepare
+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)
-	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-	ln -sf linux-$(LINUX_VERSION) $(LINUX_HEADERS_DIR)
+	ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
+	$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
 	yes '' | $(KMAKE) oldconfig
+ifeq ($(CONFIG_LINUX_2_6_33),y)
+	$(KMAKE) include/linux/version.h arch/$(LINUX_KARCH)/include/asm
+else
 	$(KMAKE) include/linux/version.h include/asm
-	if [ -d $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
+endif
+	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
 		$(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
-	$(call Build/Configure/$(ARCH))
+	$(call Host/Prepare/pre/$(ARCH))
+	$(call Host/Prepare/all)
+	$(call Host/Prepare/post/$(ARCH))
+endef
+
+define Host/Configure
 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))