cpmac: fix race condition (closes #3019)

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

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 68fa1bc..7a12f62 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -6,14 +6,7 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=linux
-PKG_VERSION:=$(LINUX_VERSION)
-PKG_SOURCE:=$(LINUX_SOURCE)
-PKG_SOURCE_URL:=$(LINUX_SITE)
-
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
-PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
-LINUX_DIR := $(PKG_BUILD_DIR)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
@@ -21,14 +14,23 @@ BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 override QUILT:=
 
 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 $(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
+       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
@@ -36,7 +38,7 @@ 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
+       ln -s $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
 endef
 
 ifneq (,$(findstring uml,$(BOARD)))
@@ -45,6 +47,7 @@ endif
 
 KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
        ARCH=$(LINUX_KARCH) \
+       KBUILD_HAVE_NLS=no \
        CONFIG_SHELL=$(BASH)
 
 define Build/Prepare