update to new version, fixes bug #153

[openwrt.git] / openwrt / target / linux / package / Makefile

diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index 868400d..2963a0b 100644 (file)
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/target/linux/package/Makefile
@@ -1,36 +1,67 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
 
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
 

+ifneq ($(BOARD),ar7)
+package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
+endif

 package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
 package-$(BR2_PACKAGE_KMOD_FUSE) += fuse

-package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
+package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
+package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
+package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo

 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan

+package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
+package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx
+package-y += base-files
+
+ifeq ($(BOARD)-$(KERNEL),brcm-2.4)
+package-$(BR2_PACKAGE_KMOD_DIAG) += diag
+package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
+wlcompat-compile: base-files-compile
+endif

 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))

+prepare: $(patsubst %,%-prepare,$(package-y) $(package-m))

 compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 
 compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 

-%-prepare:
-       $(MAKE) -C $(patsubst %-prepare,%,$@) \
+MAKEOPTS:=     BOARD="$(BOARD)" \
+               KERNEL="$(KERNEL)" \
+               IPKG="$(IPKG)" \
+               TARGET_DIR="$(TARGET_DIR)" \

                BUILD_DIR="$(BUILD_DIR)" \
                KERNEL_DIR="$(KERNEL_DIR)" \
                LINUX_VERSION="$(LINUX_VERSION)" \
                BUILD_DIR="$(BUILD_DIR)" \
                KERNEL_DIR="$(KERNEL_DIR)" \
                LINUX_VERSION="$(LINUX_VERSION)" \

+               KERNEL_RELEASE="$(KERNEL_RELEASE)"
+
+
+%-prepare:
+       @$(START_TRACE) "target/linux/package/$(patsubst %-prepare,%,$@)/prepare: "
+       $(MAKE) -C $(patsubst %-prepare,%,$@) \
+               $(MAKEOPTS) \

                prepare
                prepare

+       @$(CMD_TRACE) " done"
+       @$(END_TRACE)

 
 

-%-compile: %-prepare 
+%-compile:
+       @$(START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: "

        $(MAKE) -C $(patsubst %-compile,%,$@) \
        $(MAKE) -C $(patsubst %-compile,%,$@) \

-               BUILD_DIR="$(BUILD_DIR)" \
-               KERNEL_DIR="$(KERNEL_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
+               $(MAKEOPTS) \

                compile
                compile

+       @$(CMD_TRACE) " done"
+       @$(END_TRACE)

 
 

-%-install: %-compile
+%-install:
+       @$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "

        $(MAKE) -C $(patsubst %-install,%,$@) \
        $(MAKE) -C $(patsubst %-install,%,$@) \

-               BUILD_DIR="$(BUILD_DIR)" \
-               KERNEL_DIR="$(KERNEL_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
+               $(MAKEOPTS) \

                install
                install

+       @$(CMD_TRACE) " done"
+       @$(END_TRACE)

 
 %-clean:
 
 %-clean:

+       @$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "

        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean

+       @$(CMD_TRACE) " done"
+       @$(END_TRACE)