follow the stable tree, upgrade to 2.6.16.3

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

diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index 5fc604d..09a50e7 100644 (file)
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -1,28 +1,27 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk

+include ../rules.mk

 
 

-ifneq ($(BOARD),ar7)
+package-y += base-files

 package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
 package-$(BR2_PACKAGE_KMOD_ALSA) += alsa

-endif

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

-package-$(BR2_PACKAGE_KMOD_BCM43XX_DSCAPE) += bcm43xx-dscape
+package-$(BR2_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone

 package-$(BR2_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
 package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
 package-$(BR2_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
 package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi

+package-$(BR2_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old

 package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
 package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx
 package-$(BR2_PACKAGE_KMOD_SWITCH) += switch
 package-$(BR2_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
 package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
 package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx
 package-$(BR2_PACKAGE_KMOD_SWITCH) += switch
 package-$(BR2_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm

-package-y += base-files
-bcm43xx-dscape-compile: ieee80211-dscape-compile
-
-ifeq ($(BOARD)-$(KERNEL),brcm-2.4)

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

+package-$(BR2_PACKAGE_KMOD_ZD1211) += zd1211
+
+bcm43xx-standalone-compile: ieee80211-dscape-compile

 wlcompat-compile: base-files-compile
 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))


@@ -30,20 +29,12 @@ 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))
 

-MAKEOPTS:=     BOARD="$(BOARD)" \
-               KERNEL="$(KERNEL)" \
-               IPKG="$(IPKG)" \
-               TARGET_DIR="$(TARGET_DIR)" \
-               BUILD_DIR="$(BUILD_DIR)" \
-               KERNEL_DIR="$(KERNEL_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
-               KERNEL_RELEASE="$(KERNEL_RELEASE)"
-
+KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)"

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

-               $(MAKEOPTS) \
+               $(KPKG_MAKEOPTS) \

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


@@ -51,7 +42,7 @@ MAKEOPTS:=    BOARD="$(BOARD)" \
 %-compile:
        @$(START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: "
        $(MAKE) -C $(patsubst %-compile,%,$@) \
 %-compile:
        @$(START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: "
        $(MAKE) -C $(patsubst %-compile,%,$@) \

-               $(MAKEOPTS) \
+               $(KPKG_MAKEOPTS) \

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


@@ -59,14 +50,16 @@ MAKEOPTS:=  BOARD="$(BOARD)" \
 %-install:
        @$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
        $(MAKE) -C $(patsubst %-install,%,$@) \
 %-install:
        @$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
        $(MAKE) -C $(patsubst %-install,%,$@) \

-               $(MAKEOPTS) \
+               $(KPKG_MAKEOPTS) \

                install
        @$(CMD_TRACE) " done"
        @$(END_TRACE)
 
 %-clean:
        @$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "
                install
        @$(CMD_TRACE) " done"
        @$(END_TRACE)
 
 %-clean:
        @$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "

-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
+       @$(MAKE) -C $(patsubst %-clean,%,$@) \
+               $(KPKG_MAKEOPTS) \
+               clean

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