summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-02 01:23:36 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-02 01:23:36 +0000
commit1ebe6d34880d1e26b37fe4f794b5039a8245e750 (patch)
treec94b490dfda5ac1250f15663f2b17eeeb3924990 /include
parent9bf71c00ca3afbd968f782da24b16dbb00b2326e (diff)
make squashfs overlay support more generic and integrate it for x86-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6450 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/image.mk18
1 files changed, 16 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk
index ec0512f904..9c170af11b 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -17,6 +17,19 @@ JFFS2OPTS := --pad --big-endian --squash
SQUASHFS_OPTS := -be
endif
+define add_jffs2_mark
+ 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
+define prepare_generic_squashfs
+ dd if=$(1) of=$(KDIR)/tmpfile.1 bs=64k conv=sync
+ $(call add_jffs2_mark,$(KDIR)/tmpfile.1)
+ dd of=$(1) if=$(KDIR)/tmpfile.1 bs=64k conv=sync
+ $(call add_jffs2_mark,$(1))
+endef
+
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
define Image/mkfs/jffs2
@@ -25,9 +38,10 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root
+
# add End-of-Filesystem markers
- echo -ne '\xde\xad\xc0\xde' >> $(KDIR)/root.jffs2-64k
- echo -ne '\xde\xad\xc0\xde' >> $(KDIR)/root.jffs2-128k
+ $(call add_jffs2_mark,$(KDIR)/root.jffs2-64k)
+ $(call add_jffs2_mark,$(KDIR)/root.jffs2-128k)
$(call Image/Build,jffs2-64k)
$(call Image/Build,jffs2-128k)