X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=toolchain%2Fkernel-headers%2FMakefile;h=2a90e3d98a44e51821a502ca9f7186d3a0822865;hb=0742a44ed3af95145867f13c6c98046f06941f5b;hp=474ff6c71b710d4b59d67f1a70134df6563fc7d9;hpb=fcb636cada122ba224e8017c9cde758d1b0dbec8;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 474ff6c71b..2a90e3d98a 100644
--- 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)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
 override QUILT:=
-override CONFIG_AUTOREBUILD=
+override HOST_QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -21,115 +18,94 @@ 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)
+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)
-  LINUX_KARCH:=$(ARCH)
+  LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH)))
 endif
 
-KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+LINUX_HAS_HEADERS_INSTALL:=y
+
+KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
+	CC="$(KERNEL_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CROSS_COMPILE=$(TARGET_CROSS) \
 	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; \
-	fi
-endef
-
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
-  define Build/Prepare/all
-	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
+define Host/Prepare/all
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev
 	$(KMAKE) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
-		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \
+		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \
 		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
+
+# XXX: the following is needed to build lzma-loader
+ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
+  define Host/Prepare/lzma
+	$(CP) \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
   endef
 endif
 
-define Build/Prepare
-	$(call Kernel/Prepare/Default)
-	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-	ln -sf linux-$(LINUX_VERSION) $(LINUX_HEADERS_DIR)
-	yes '' | $(KMAKE) oldconfig
-	$(KMAKE) include/linux/version.h include/asm
-	if [ -d $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
-		$(CP) \
-			$(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
-			$(PKG_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
-	fi
-	$(call Build/Prepare/pre/$(ARCH))
-	$(call Build/Prepare/all)
+define Host/Prepare/post/cris
+	$(CP) \
+		$(HOST_BUILD_DIR)/include/linux/user.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/linux/
+	ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch-v10/arch \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch
+	$(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h
 endef
 
-define Build/Configure
+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/include/asm/
 endef
 
-define Build/Compile
+define Host/Prepare/post/mips
+	$(call Host/Prepare/lzma)
 endef
 
-define Build/Install/all
-	mkdir -p $(TOOLCHAIN_DIR)/usr/include
-	$(CP) \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/* \
-		$(TOOLCHAIN_DIR)/usr/include/
+define Host/Prepare/post/mipsel
+	$(call Host/Prepare/lzma)
 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
-
-# XXX: the following is needed to build final gcc on cris
-define Build/Install/post/cris
-	mkdir -p $(TOOLCHAIN_DIR)/usr/include/asm/arch
-	$(CP) \
-		$(PKG_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
-		$(TOOLCHAIN_DIR)/usr/include/asm/arch/
+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
+	$(call Host/Prepare/all)
+	$(call Host/Prepare/post/$(ARCH))
 endef
 
-define Build/Install/post/mips
-	$(call Build/Install/post/lzma)
+define Host/Configure
 endef
 
-define Build/Install/post/mipsel
-	$(call Build/Install/post/lzma)
+define Host/Compile
 endef
 
-define Build/Install
-	$(call Build/Install/all)
-	$(call Build/Install/post/$(ARCH))
+define Host/Install
+	$(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -rf \
-		$(PKG_BUILD_DIR) \
+		$(HOST_BUILD_DIR) \
 		$(BUILD_DIR_TOOLCHAIN)/linux \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev
 endef