The merge of ppc (32-bit headers) and powerpc (previously 64-bit only headers) has...

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

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index c85325e..6e02fe9 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -5,49 +5,39 @@
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
 # 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:=
+override CONFIG_AUTOREBUILD=

 
 

-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)
-include $(INCLUDE_DIR)/kernel-defaults.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)/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
+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)/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)
-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)
+       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch

 endef
 endef

-endif

 
 define Build/Configure/powerpc
 
 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)))
 endef
 
 ifneq (,$(findstring uml,$(BOARD)))


@@ -56,14 +46,26 @@ endif
 
 KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
        ARCH=$(LINUX_KARCH) \
 
 KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
        ARCH=$(LINUX_KARCH) \

+       KBUILD_HAVE_NLS=no \

        CONFIG_SHELL=$(BASH)
 
        CONFIG_SHELL=$(BASH)
 

-define Build/Configure
+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
        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
 
        $(call Build/Configure/$(ARCH))
 endef
 

+define Build/Configure
+endef
+

 define Build/Compile
 endef
 
 define Build/Compile
 endef