X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=7a12f62d588d58f06b368ad466f3d991819b5671;hb=5f258e330da772ed4551670d4ba6f4b423f8a349;hp=fadde33dbd2427c9bcbe31f0f88369fe3844bb11;hpb=7e79cae09004230dd7e7ac7978746c2085b1667d;p=oweals%2Fopenwrt.git

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index fadde33dbd..7a12f62d58 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -5,51 +5,40 @@
 # 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)
 
-PKG_SOURCE=$(LINUX_SOURCE)
-PKG_SOURCE_URL=$(LINUX_SITE)
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+override QUILT:=
 
-PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
+include $(INCLUDE_DIR)/kernel.mk
 
-LINUX_DIR:=$(PKG_BUILD_DIR)
-KERNEL_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)
-override QUILT:=
+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/cris
-	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/etrax-2.6/patches/generic_2.6
-	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
-	ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
-	ln -sf $(PKG_BUILD_DIR)/arch/cris/arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
-	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)
+	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(BUILD_DIR_TOOLCHAIN) $(TAR_OPTIONS)
+	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax/patches/generic_2.6
+	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax/patches/cris
+	ln -sf arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
+	ln -sf arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
 endef
 
-ifdef Build/Prepare/$(ARCH)
-define Build/Prepare
-	$(call Build/Prepare/$(ARCH))
-endef
-else
-define Build/Prepare
-	$(call Kernel/Prepare/Default)
-	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
-endef
-endif
-
 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
+	ln -s $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
 endef
 
 ifneq (,$(findstring uml,$(BOARD)))
@@ -58,14 +47,21 @@ endif
 
 KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
+	KBUILD_HAVE_NLS=no \
 	CONFIG_SHELL=$(BASH)
 
-define Build/Configure
+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)
 	yes '' | $(KMAKE) oldconfig
 	$(KMAKE) include/linux/version.h include/asm
 	$(call Build/Configure/$(ARCH))
 endef
 
+define Build/Configure
+endef
+
 define Build/Compile
 endef