Fix compilation of fuse with 2.6.24

[openwrt.git] / toolchain / kernel-headers / Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index a242ea2..7a12f62 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -6,52 +6,60 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME=kernel-headers
-PKG_VERSION=2.4.32
+KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
+BUILD_DIR := $(KERNEL_BUILD_DIR)
 
-PKG_SOURCE=linux-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL= \
-               http://www.de.kernel.org/pub/linux/kernel/v2.4 \
-               http://www.fi.kernel.org/pub/linux/kernel/v2.4 \
-               http://www.fr.kernel.org/pub/linux/kernel/v2.4 \
-               http://www.kernel.org/pub/linux/kernel/v2.4
-PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
+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
+
+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 $(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
+
+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
 
-LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-       -e 's/mipsel/mips/' \
-       -e 's/mipseb/mips/' \
-       -e 's/powerpc/ppc/' \
-       -e 's/sh[234]/sh/' \
-       -e 's/armeb/arm/' \
-)
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=$(ARCH)
+endif
 
+KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+       ARCH=$(LINUX_KARCH) \
+       KBUILD_HAVE_NLS=no \
+       CONFIG_SHELL=$(BASH)
 
 define Build/Prepare
-       mkdir -p $(TOOLCHAIN_BUILD_DIR)
-       bzcat $(DL_DIR)/$(PKG_SOURCE) | tar $(TAR_WILDCARDS) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) - \
-               linux-$(PKG_VERSION)/include \
-               linux-$(PKG_VERSION)/Makefile \
-               linux-$(PKG_VERSION)/Rules.make \
-               linux-$(PKG_VERSION)/arch/$(LINUX_KARCH)/Makefile \
-               linux-$(PKG_VERSION)/scripts \
-               linux-$(PKG_VERSION)/arch/$(LINUX_KARCH)/config*.in \
-               linux-$(PKG_VERSION)/*/*/Config.in \
-               linux-$(PKG_VERSION)/*/Config.in
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile 
-       ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+       $(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
-       -$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               ARCH=$(LINUX_KARCH) \
-               CONFIG_SHELL=$(shell which bash) \
-               oldconfig include/linux/version.h
 endef
 
 define Build/Compile