X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/69d1156956dde1f06b4fd17b6970617785f4c8d8..a3354e7005097cde95e004c0440b086d85154302:/toolchain/kernel-headers/Makefile?ds=sidebyside

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index dbeb144c9..6e02fe988 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -5,49 +5,67 @@
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME=kernel-headers
-PKG_VERSION=$(LINUX_VERSION)
+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=
 
-PKG_SOURCE=$(LINUX_SOURCE)
-PKG_SOURCE_URL=$(LINUX_SITE)
+include $(INCLUDE_DIR)/kernel.mk
 
-PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
-PKG_FILE_DEPEND:=$(GENERIC_PLATFORM_DIR)
+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_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+LINUX_DIR := $(PKG_BUILD_DIR)
 
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/kernel-defaults.mk
 
-define Build/Prepare
-	mkdir -p $(TOOLCHAIN_BUILD_DIR)
-	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
-	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches
-	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+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
-	mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
+	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
 
 ifneq (,$(findstring uml,$(BOARD)))
-  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH=i386 \
-		CONFIG_SHELL=$(BASH)
-else
-  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH=$(LINUX_KARCH) \
-		CONFIG_SHELL=$(BASH)
+  LINUX_KARCH:=$(ARCH)
 endif
 
-define Build/Configure
+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
+	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/Configure/$(ARCH))
 endef
 
+define Build/Configure
+endef
+
 define Build/Compile
 endef