Changeset 492449f in freewrt

Timestamp:

Aug 2, 2007, 4:18:14 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

1e3c84d

Parents:

70cb764

Message:

symlink-based squashfs-with-tmpfs-overlay filesystem type (tested)

• Closes: #310
• untested if this breaks normal squashfs…

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3388 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/targets.mk (modified) (1 diff)
• package/base-files/Makefile (modified) (1 diff)
• package/fwcf/Config.in (modified) (1 diff)
• package/fwupdate/Config.in (modified) (1 diff)
• package/fwupdate/Makefile (modified) (1 diff)
• package/mini_fo/Config.in (modified) (1 diff)
• package/mtd/Config.in (modified) (1 diff)
• target/Config.in (modified) (2 diffs)
• target/image/brcm/Makefile (modified) (2 diffs)
• target/linux/brcm-2.4/ramovl/files/sbin/mount_root (added)
• target/linux/brcm-2.4/squashfs/files/sbin/mount_root (modified) (1 diff)

mk/targets.mk

@@ -94 +94 @@
 $(eval $(call rootfs_template,jffs2,JFFS2,rootfstype=jffs2 root=/dev/mtdblock2))
 $(eval $(call rootfs_template,squashfs,SQUASHFS,rootfstype=squashfs root=/dev/mtdblock2))
+$(eval $(call rootfs_template,ramovl,RAMOVL,rootfstype=squashfs root=/dev/mtdblock2))
 $(eval $(call rootfs_template,nfs,NFS,root=/dev/nfs ip=dhcp))
 $(eval $(call rootfs_template,ext2-cf,EXT2_CF,root=/dev/cfa2))

package/base-files/Makefile

@@ -380 +380 @@
 ${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_JFFS2
 ${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_SQUASHFS
+${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_RAMOVL
 ${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_NFS
 ${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_EXT2_CF

package/fwcf/Config.in

@@ -4 +4 @@
         default y if FWRT_TARGET_ROOTFS_JFFS2
         default y if FWRT_TARGET_ROOTFS_SQUASHFS
+        default y if FWRT_TARGET_ROOTFS_RAMOVL
         default n
         select FWRT_PACKAGE_MKSH

package/fwupdate/Config.in

@@ -4 +4 @@
         default n
         depends on FWRT_TARGET_ROOTFS_JFFS2 || FWRT_TARGET_ROOTFS_SQUASHFS || \
+            FWRT_TARGET_ROOTFS_RAMOVL || \
             FWRT_TARGET_ROOTFS_EXT2_CF || FWRT_TARGET_ROOTFS_YAFFS2
         select FWRT_PACKAGE_TAR if FWRT_TARGET_ROOTFS_EXT2_CF

package/fwupdate/Makefile

@@ -18 +18 @@
 fs-script-${FWRT_TARGET_ROOTFS_JFFS2}=fs-mtd.sh
 fs-script-${FWRT_TARGET_ROOTFS_SQUASHFS}=fs-mtd.sh
+fs-script-${FWRT_TARGET_ROOTFS_RAMOVL}=fs-mtd.sh
 fs-script-${FWRT_TARGET_ROOTFS_EXT2_CF}=fs-tar.sh
 fs-script-${FWRT_TARGET_ROOTFS_YAFFS2}=fs-tar.sh

package/mini_fo/Config.in

@@ -3 +3 @@
         tristate
         default n
-        depends on ! FWRT_TARGET_ROOTFS_SQUASHFS
+        depends on !FWRT_KERNEL_MINI_FO
         help
           The mini fanout overlay file system.

package/mtd/Config.in

@@ -4 +4 @@
         default y if FWRT_TARGET_ROOTFS_JFFS2
         default y if FWRT_TARGET_ROOTFS_SQUASHFS
+        default y if FWRT_TARGET_ROOTFS_RAMOVL
         default n
         depends on FWRT_TARGET_ROOTFS_JFFS2 || \
+                   FWRT_TARGET_ROOTFS_RAMOVL || \
                    FWRT_TARGET_ROOTFS_SQUASHFS
         help
           Update utility for trx firmware images.
-

target/Config.in

@@ -45 +45 @@
 choice 
 prompt "Embedded Device"
+        default FWRT_DEVICE_BRCM_ASUS_WL500G_PREMIUM if FWRT_TARGET_CATEGORY_MIPS
 
 #
@@ -300 +301 @@
         select FWRT_PACKAGE_JFFS2ROOT
         select FWRT_KERNEL_JFFS2_FS
-        select FWRT_KERNEL_SQUASHFS 
+        select FWRT_KERNEL_SQUASHFS
         select FWRT_KERNEL_MINI_FO
         depends on FWRT_LINUX_2_4_BRCM || FWRT_LINUX_2_6_BRCM
         help
           Build firmware images with a read-only and highly compressed
-          (squashfs with lzma compression) root filesystem and a overlay
+          (squashfs with lzma compression) root filesystem and an overlay
           filesystem for a pseudo writable root filesystem. Only differences
           to the read-only image are kept on a writable jffs2 partition.
+
+config FWRT_TARGET_ROOTFS_RAMOVL
+        bool "read-only root filesystem and tmpfs (squashfs)"
+        select FWRT_PACKAGE_MTD
+        select FWRT_PACKAGE_FWCF
+        select FWRT_KERNEL_SQUASHFS
+        select FWRT_KERNEL_MINI_FO
+        depends on FWRT_LINUX_2_4_BRCM || FWRT_LINUX_2_6_BRCM
+        help
+          Build firmware images with a read-only and highly compressed
+          (squashfs with lzma compression) root filesystem and an overlay
+          filesystem for a pseudo writable root filesystem. Differences
+          to the read-only image are kept in RAM and lost on reboot.
 
 config FWRT_TARGET_ROOTFS_NFS

target/image/brcm/Makefile

@@ -76 +76 @@
 endif
 
-ifeq ($(FWRT_TARGET_ROOTFS_SQUASHFS),y)
-$(KDIR)/root.squashfs:
-        rm -f $(KDIR)/root.squashfs
+ifeq ($(FWRT_TARGET_ROOTFS_SQUASHFS)$(FWRT_TARGET_ROOTFS_RAMOVL),y)
+$(KDIR)/root.$(FS):
+        rm -f $(KDIR)/root.$(FS)
         $(STAGING_TOOLS)/bin/mksquashfs-lzma $(KDIR)/root \
-                $(KDIR)/root.squashfs $(SQUASHFS_OPTS) $(MAKE_TRACE)
+                $(KDIR)/root.$(FS) $(SQUASHFS_OPTS) $(MAKE_TRACE)
 endif
 
@@ -90 +90 @@
         cp $(BUILD_DIR)/loader.elf $(BIN_DIR)/kernel/bootloader-$(BOARD)-$(KERNEL).elf
 
-ifeq ($(FS),squashfs)
+ifneq ($(filter squashfs ramovl,$(strip ${FS})),)
 $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS) $(KDIR)/vmlinux.lzma
         $(STAGING_TOOLS)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma -a 1024 $(KDIR)/root.$(FS) $(MAKE_TRACE)

target/linux/brcm-2.4/squashfs/files/sbin/mount_root

@@ -19 +19 @@
         echo -n "creating directories... "
         {
-                cd $2 
+                cd $2
                 find . -xdev -type d
                 echo "./dev ./jffs ./mnt ./proc ./tmp"
                 # xdev skips mounted directories
-                cd $1 
+                cd $1
         } | xargs mkdir -p
         echo "done"