fix the jffs2 eof detect patch for linux 2.6 (unlocking required for erasing blocks)

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

diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index a2567ea..a8f01ff 100644 (file)
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -2,23 +2,20 @@
 include $(TOPDIR)/rules.mk
 include ../rules.mk
 
 include $(TOPDIR)/rules.mk
 include ../rules.mk
 

-package-y += base-files
-package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
-package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
-package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
-package-$(BR2_PACKAGE_KMOD_BCM43XX_DSCAPE) += bcm43xx-dscape
-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_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_DIAG) += diag
-package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
-
-bcm43xx-dscape-compile: ieee80211-dscape-compile
+package-$(CONFIG_PACKAGE_KMOD_ALSA) += alsa
+package-$(CONFIG_PACKAGE_KMOD_FUSE) += fuse
+package-$(CONFIG_PACKAGE_KMOD_HOSTAP) += hostap
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI) += madwifi
+package-$(CONFIG_PACKAGE_KMOD_MINI_FO) += mini_fo
+package-$(CONFIG_PACKAGE_KMOD_OPENSWAN) += openswan
+package-$(CONFIG_PACKAGE_KMOD_SHFS) += shfs
+package-$(CONFIG_PACKAGE_KMOD_SPCA5XX) += spca5xx
+package-$(CONFIG_PACKAGE_KMOD_SWITCH) += switch
+package-$(CONFIG_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
+package-$(CONFIG_PACKAGE_KMOD_DIAG) += diag
+package-$(CONFIG_PACKAGE_KMOD_WLCOMPAT) += wlcompat
+package-$(CONFIG_PACKAGE_KMOD_ZD1211) += zd1211
+

 wlcompat-compile: base-files-compile
 
 all: compile install
 wlcompat-compile: base-files-compile
 
 all: compile install


@@ -29,33 +26,23 @@ install: $(patsubst %,%-install,$(package-y))
 
 KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)"
 
 
 KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)"
 

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

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

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

 
 

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

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

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

 
 

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

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

-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
-
-%-clean:
-       @$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
+
+%-clean: FORCE
+       @$(MAKE) -C $(patsubst %-clean,%,$@) \
+               $(KPKG_MAKEOPTS) \
+               clean