when compiling mysql, don't grep for linuxthreads in /usr/include

[openwrt.git] / package / linux / linux.mk

diff --git a/package/linux/linux.mk b/package/linux/linux.mk
index 225683d..c443e65 100644 (file)
--- a/package/linux/linux.mk
+++ b/package/linux/linux.mk
@@ -1,4 +1,5 @@
 #############################################################
+# $Id$
 #
 # Linux kernel target for the OpenWRT project
 #
@@ -19,27 +20,28 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/sh[234]/sh/' \
        )
 
-LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
 LINUX_BINARY_DRIVER_SITE=http://openwrt.openbsd-geek.de
 LINUX_SOURCE=linux-$(LINUX_VERSION).tar.bz2
 LINUX_KCONFIG=./linux.config
 LINUX_PATCHES=./kernel-patches
 LINUX_KERNEL_SOURCE=./kernel-source
-LINUX_BINLOC=arch/$(LINUX_KARCH)/brcm-boards/bcm947xx/compressed/vmlinuz
+LINUX_BINLOC=arch/$(LINUX_KARCH)/brcm-boards/bcm947xx/compressed/piggy
 # Used by pcmcia-cs and others
 LINUX_SOURCE_DIR=$(LINUX_DIR)-$(LINUX_VERSION)
 
 # binary driver extracted from linksys firmware GPL sourcetree WRT54GS_3_37_2_1109_US 
-LINUX_BINARY_WL_DRIVER=kernel-binary-wl.tar.gz
-LINUX_BINARY_ET_DRIVER=kernel-binary-et.tar.gz
+LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.1.tar.gz
+LINUX_BINARY_WL_MD5SUM=1b57ba129ad80c7f1702d0be1422cfba
+LINUX_BINARY_ET_DRIVER=kernel-binary-et-0.2.tar.gz
+LINUX_BINARY_ET_MD5SUM=d657f929bceee926bc28821d753d945c
 
 TARGET_MODULES_DIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)
 
 $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER):
-       $(WGET) -P $(DL_DIR) $(LINUX_BINARY_DRIVER_SITE)/$(LINUX_BINARY_WL_DRIVER)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE)
 
 $(DL_DIR)/$(LINUX_BINARY_ET_DRIVER):
-       $(WGET) -P $(DL_DIR) $(LINUX_BINARY_DRIVER_SITE)/$(LINUX_BINARY_ET_DRIVER)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_ET_DRIVER) $(LINUX_BINARY_ET_MD5SUM) $(LINUX_BINARY_DRIVER_SITE)
 
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(DL_DIR)/$(LINUX_BINARY_ET_DRIVER)
        -mkdir -p $(BUILD_DIR)
@@ -57,6 +59,7 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        # copy binary drivers
        cp -a $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl
        cp -a $(BUILD_DIR)/et/*.o $(LINUX_DIR)/drivers/net/et
+       $(SED) 's/@expr length/@-expr length/' $(LINUX_DIR)/Makefile 
        touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
@@ -74,7 +77,6 @@ $(LINUX_DIR)/.depend_done:  $(LINUX_DIR)/.configured
 
 $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_FORMAT)
-       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
 
 $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
        cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL)
@@ -82,6 +84,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
 
 $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL)
        rm -rf $(BUILD_DIR)/modules
+       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
        $(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(BUILD_DIR)/modules modules_install
        touch $(LINUX_DIR)/.modules_done
 
@@ -92,8 +95,6 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
 
 $(TARGET_MODULES_DIR): 
        -mkdir -p $(TARGET_MODULES_DIR)
-       cp $(LINUX_DIR)/drivers/net/wl/wl.o $(TARGET_MODULES_DIR)
-       cp $(LINUX_DIR)/drivers/net/et/et.o $(TARGET_MODULES_DIR)
        cp $(LINUX_DIR)/drivers/net/diag/diag.o $(TARGET_MODULES_DIR)
 
 linux: $(LINUX_DIR)/.modules_done $(TARGET_MODULES_DIR)
@@ -110,4 +111,6 @@ linux-dirclean:
        rm -rf $(LINUX_DIR)-$(LINUX_VERSION)
        rm -rf $(LINUX_DIR)
        rm -rf $(BUILD_DIR)/modules
+       rm -rf $(BUILD_DIR)/wl
+       rm -rf $(BUILD_DIR)/et