Corrected WAP54G bug as explained in #146, closes ticket #146

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

diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index fd66e5a..de24c77 100644 (file)
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/target/linux/package/Makefile
@@ -1,19 +1,35 @@
 # 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_IEEE80211_DSCAPE) += ieee80211-dscape
+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

-ifeq ($(LINUX_VERSION),2.4.30)
+package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
+package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx
+package-$(BR2_PACKAGE_KMOD_SWITCH) += switch
+package-y += base-files
+
+ifeq ($(BOARD)-$(KERNEL),brcm-2.4)
+package-$(BR2_PACKAGE_KMOD_DIAG) += diag

 package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
 package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat

+wlcompat-compile: base-files-compile

 endif
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 endif
 
 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))
 
 MAKEOPTS:=     BOARD="$(BOARD)" \
 compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 
 MAKEOPTS:=     BOARD="$(BOARD)" \

+               KERNEL="$(KERNEL)" \
+               IPKG="$(IPKG)" \

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


@@ -22,20 +38,32 @@ MAKEOPTS:=  BOARD="$(BOARD)" \
 
 
 %-prepare:
 
 
 %-prepare:

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

        $(MAKE) -C $(patsubst %-prepare,%,$@) \
                $(MAKEOPTS) \
                prepare
        $(MAKE) -C $(patsubst %-prepare,%,$@) \
                $(MAKEOPTS) \
                prepare

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

 
 

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

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

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

 
 

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

        $(MAKE) -C $(patsubst %-install,%,$@) \
                $(MAKEOPTS) \
                install
        $(MAKE) -C $(patsubst %-install,%,$@) \
                $(MAKEOPTS) \
                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)