fix parallel build of brcm-2.4

[openwrt.git] / target / linux / x86-2.6 / Makefile

diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index 3bb8c4d..59f02b3 100644 (file)
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -1,25 +1,21 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk
 

-LINUX_VERSION:=2.6.15.1
+LINUX_VERSION:=2.6.17

 LINUX_RELEASE:=1
 LINUX_RELEASE:=1

-LINUX_KERNEL_MD5SUM:=3a71f70fecf25a893bb95efaa37f575c
+LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e

 
 

-include ../rules.mk

 include ./config
 include ./config

-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
-
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/kernel-build.mk

 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

-       [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
-       [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)
-       @cp config $(LINUX_DIR)/.config
+       [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
+       [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
+       @$(CP) config $(LINUX_DIR)/.config

        touch $@
        touch $@

-
-$(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux
-       $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE)
-       cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@
-       touch $@
-
-compile: $(LINUX_BUILD_DIR)/bzImage