X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/35566135378e8a87af810f775aff9cc09c5bc42b..12a79375002ad6ce40b4c568bb39e6dd8854ba8b:/toolchain/kernel-headers/Makefile?ds=inline diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 5fdfee9a6..614c40515 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -9,12 +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 HOST_QUILT:= -override CONFIG_AUTOREBUILD= include $(INCLUDE_DIR)/kernel.mk @@ -25,85 +21,63 @@ PKG_SOURCE_URL:=$(LINUX_SITE) HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM) 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 -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1) - LINUX_HAS_HEADERS_INSTALL:=y -endif +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 Host/Prepare/pre/cris - ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/include/asm-cris/arch - ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/arch/cris/arch -endef - -define Host/Prepare/pre/powerpc - if [ -d $(HOST_BUILD_DIR)/include/asm-ppc ]; then \ - $(CP) $(HOST_BUILD_DIR)/include/asm-ppc/* $(HOST_BUILD_DIR)/include/asm-powerpc/; \ - rm -rf $(HOST_BUILD_DIR)/include/asm-ppc; \ - ln -s $(HOST_BUILD_DIR)/include/asm-powerpc $(HOST_BUILD_DIR)/include/asm-ppc; \ - fi -endef - -ifneq ($(LINUX_HAS_HEADERS_INSTALL),) - define Host/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 Host/Prepare/all - mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include - cp -pLR \ - $(HOST_BUILD_DIR)/include/asm \ - $(HOST_BUILD_DIR)/include/asm-generic \ - $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH) \ - $(HOST_BUILD_DIR)/include/linux \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/ - endef -endif + if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \ + mkdir -p $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH); \ + $(CP) \ + $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \ + $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \ + fi +endef # XXX: the following is needed to build lzma-loader define Host/Prepare/lzma $(CP) \ $(HOST_BUILD_DIR)/include/asm-mips/asm.h \ $(HOST_BUILD_DIR)/include/asm-mips/regdef.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/ + $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/ endef -# XXX: the following are needed to build a cris toolchain define Host/Prepare/post/cris $(CP) \ $(HOST_BUILD_DIR)/include/linux/user.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/ - $(CP) \ - $(HOST_BUILD_DIR)/include/asm-cris/elf.h \ - $(HOST_BUILD_DIR)/include/asm-cris/page.h \ - $(HOST_BUILD_DIR)/include/asm-cris/user.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/ - mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch - $(CP) \ - $(HOST_BUILD_DIR)/include/asm-cris/arch/elf.h \ - $(HOST_BUILD_DIR)/include/asm-cris/arch/page.h \ - $(HOST_BUILD_DIR)/include/asm-cris/arch/ptrace.h \ - $(HOST_BUILD_DIR)/include/asm-cris/arch/user.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch/ + $(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 /d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h +endef + +define Host/Prepare/post/ubicom32 $(CP) \ - $(HOST_BUILD_DIR)/include/asm-generic/memory_model.h \ - $(HOST_BUILD_DIR)/include/asm-generic/page.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm-generic/ + $(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 Host/Prepare/post/mips @@ -119,13 +93,6 @@ define Host/Prepare ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux $(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile yes '' | $(KMAKE) oldconfig - $(KMAKE) include/linux/version.h include/asm - if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \ - $(CP) \ - $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \ - $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \ - fi - $(call Host/Prepare/pre/$(ARCH)) $(call Host/Prepare/all) $(call Host/Prepare/post/$(ARCH)) endef