madwifi: remove stuck beacon workaround (does not work properly). add a workaround...

[openwrt/openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index c56e7cf193618b6b5b7cd82b2cde7a111e6f6a16..d00f779fe965f0088e448743638510083c2e30bc 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -35,14 +35,15 @@ endef
 
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
   ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
+    define Image/mkfs/jffs2/sub
+               # FIXME: removing this line will cause strange behaviour in the foreach loop below
+               $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1) -d $(BUILD_DIR)/root
+               $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1))
+               $(call Image/Build,jffs2-$(1))
+    endef
     define Image/mkfs/jffs2
                rm -rf $(BUILD_DIR)/root/jffs
-               
-               $(foreach SZ,$(JFFS2_BLOCKSIZE),\
-                       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(SZ)) -o $(KDIR)/root.jffs2-$(SZ) -d $(BUILD_DIR)/root; \
-                       $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(SZ)); \
-                       $(call Image/Build,jffs2-$(SZ)) \
-               )
+               $(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/sub,$(SZ)))
     endef
   endif
     
@@ -57,7 +58,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz
                $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
-               $(call Image/Build,tgz)
     endef
   endif
 else