add support for alternative C libraries (currently only glibc/eglibc) other (related) changes: - kernel headers are now installed using "make headers_install" on 2.6 - target names now contain an openwrt "vendor" tag (e.g. mips-openwrt-linux-gnu) - build directory names now contain gcc/libc name/version - default cpu for x86 is now i486 (required to build glibc/eglibc)

SVN-Revision: 13931

1 files changed, 66 insertions, 12 deletions

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 6e02fe9888..2274ee2447 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,6 +11,7 @@ BUILD_DIR := $(KERNEL_BUILD_DIR)
 
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
 BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+
 override QUILT:=
 override CONFIG_AUTOREBUILD=
 
@@ -20,19 +21,28 @@ 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)
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(PKG_BUILD_DIR)
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
-define Build/Configure/cris
+ifeq ($(strip $(BOARD)),uml)
+  LINUX_KARCH:=$(ARCH)
+endif
+
+KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+	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/Configure/powerpc
+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; \
@@ -40,15 +50,26 @@ define Build/Configure/powerpc
 	fi
 endef
 
-ifneq (,$(findstring uml,$(BOARD)))
-  LINUX_KARCH:=$(ARCH)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
+  define Build/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 Build/Prepare/all
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
+	cp -pLR \
+		$(BUILD_DIR_TOOLCHAIN)/linux/include/asm \
+		$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-generic \
+		$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-$(LINUX_KARCH) \
+		$(BUILD_DIR_TOOLCHAIN)/linux/include/linux \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
+  endef
 endif
 
-KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
-	ARCH=$(LINUX_KARCH) \
-	KBUILD_HAVE_NLS=no \
-	CONFIG_SHELL=$(BASH)
-
 define Build/Prepare
 	$(call Kernel/Prepare/Default)
 	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
@@ -60,7 +81,8 @@ define Build/Prepare
 			$(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
 			$(PKG_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
 	fi
-	$(call Build/Configure/$(ARCH))
+	$(call Build/Prepare/pre/$(ARCH))
+	$(call Build/Prepare/all)
 endef
 
 define Build/Configure
@@ -69,7 +91,39 @@ endef
 define Build/Compile
 endef
 
+define Build/Install/all
+	mkdir -p $(TOOLCHAIN_DIR)/usr/include
+	$(CP) \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/* \
+		$(TOOLCHAIN_DIR)/usr/include/
+endef
+
+# XXX: the following is needed to build lzma-loader
+define Build/Install/post/lzma
+	$(CP) \
+		$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-mips/asm.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-mips/regdef.h \
+		$(TOOLCHAIN_DIR)/usr/include/asm/
+endef
+
+define Build/Install/post/mips
+	$(call Build/Install/post/lzma)
+endef
+
+define Build/Install/post/mipsel
+	$(call Build/Install/post/lzma)
+endef
+
 define Build/Install
+	$(call Build/Install/all)
+	$(call Build/Install/post/$(ARCH))
+endef
+
+define Build/Clean
+	rm -rf \
+		$(PKG_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/linux \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev
 endef
 
 $(eval $(call HostBuild))