wrt350nv2-builder: fix a small off-by-one error (thx, mb)

[openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 237d87c..d75ca3c 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -23,7 +23,7 @@ JFFS2OPTS     :=  --pad --big-endian --squash
 SQUASHFS_OPTS :=  -be
 endif
 
 SQUASHFS_OPTS :=  -be
 endif
 

-ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),)
+ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),)

 USE_SQUASHFS3 := y
 endif
 
 USE_SQUASHFS3 := y
 endif
 


@@ -31,7 +31,7 @@ ifneq ($(USE_SQUASHFS3),)
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
 else
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
 else
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4

-SQUASHFS_OPTS  := -lzma -processors 1
+SQUASHFS_OPTS  := -comp lzma -processors 1

 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k
 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k


@@ -40,13 +40,17 @@ define add_jffs2_mark
        echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
 
        echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
 

-# pad to 64k and add jffs2 end-of-filesystem mark
-# do this twice to make sure that this works with 128k blocksize as well
+# pad to 4k, 8k, 64k, 128k and add jffs2 end-of-filesystem mark

 define prepare_generic_squashfs
 define prepare_generic_squashfs

-       dd if=$(1) of=$(KDIR)/tmpfile.1 bs=64k conv=sync
+       dd if=$(1) of=$(KDIR)/tmpfile.0 bs=4k conv=sync
+       $(call add_jffs2_mark,$(KDIR)/tmpfile.0)
+       dd if=$(KDIR)/tmpfile.0 of=$(KDIR)/tmpfile.1 bs=4k conv=sync

        $(call add_jffs2_mark,$(KDIR)/tmpfile.1)
        $(call add_jffs2_mark,$(KDIR)/tmpfile.1)

-       dd of=$(1) if=$(KDIR)/tmpfile.1 bs=64k conv=sync
+       dd if=$(KDIR)/tmpfile.1 of=$(KDIR)/tmpfile.2 bs=64k conv=sync
+       $(call add_jffs2_mark,$(KDIR)/tmpfile.2)
+       dd if=$(KDIR)/tmpfile.2 of=$(1) bs=64k conv=sync

        $(call add_jffs2_mark,$(1))
        $(call add_jffs2_mark,$(1))

+       rm -f $(KDIR)/tmpfile.*

 endef
 
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 endef
 
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)