Changeset 1993322 in freewrt

Timestamp:

Apr 21, 2007, 7:23:44 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

6079702

Parents:

2d9a22a

Message:

remove squashfs symlinks root filesystem, it is ugly and overlay works stable and fine. 1.0.3 will come without squashfs-symlinks filesystem support. it is removed in trunk already. I never suggest to use symlinks method and we should not support it anymore

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@2403 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/targets.mk (modified) (1 diff)
• package/fwcf/Config.in (modified) (2 diffs)
• package/jffs2root/Config.in (modified) (1 diff)
• package/mtd/Config.in (modified) (1 diff)
• target/Config.in (modified) (1 diff)
• target/image/brcm/Makefile (modified) (2 diffs)
• target/linux/brcm-2.4/squashfs-symlinks/config/config.squashfs_symlinks (deleted)
• target/linux/brcm-2.4/squashfs-symlinks/files/sbin/mount_root (deleted)

mk/targets.mk

@@ -68 +68 @@
 $(eval $(call rootfs_template,jffs2,JFFS2))
 $(eval $(call rootfs_template,squashfs-overlay,SQUASHFS_OVERLAY))
-$(eval $(call rootfs_template,squashfs-symlinks,SQUASHFS_SYMLINKS))
 
 export FS

package/fwcf/Config.in

@@ -3 +3 @@
         tristate
         default y if FWRT_TARGET_ROOTFS_JFFS2
-        default y if FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS
         default y if FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         default n
@@ -31 +30 @@
         select FWRT_PACKAGE_MTD
         depends on FWRT_TARGET_ROOTFS_JFFS2 || \
-                   FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS || \
                    FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         help

package/jffs2root/Config.in

@@ -3 +3 @@
         tristate
         default y if FWRT_TARGET_ROOTFS_JFFS2 
-        default y if FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS
         default y if FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         default n
         depends on FWRT_TARGET_ROOTFS_JFFS2 || \
-                   FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS || \
                    FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         help

package/mtd/Config.in

@@ -3 +3 @@
         tristate
         default y if FWRT_TARGET_ROOTFS_JFFS2
-        default y if FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS
         default y if FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         default n
         depends on FWRT_TARGET_ROOTFS_JFFS2 || \
-                   FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS || \
                    FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         help

target/Config.in

@@ -25 +25 @@
           Build firmware images with a writable jffs2 root filesystem.
 
-config FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS
-        bool "read-only root filesystem and symlinks (squashfs-symlinks)"
-        select FWRT_PACKAGE_MTD
-        select FWRT_PACKAGE_FWCF
-        select FWRT_PACKAGE_JFFS2ROOT
-        depends on FWRT_LINUX_2_4_BRCM
-        help
-          Build firmware images with a read-only and highly compressed
-          (squashfs with lzma compression) root filesystem.
-          Startup scripts will create symlinks to the writable jffs2 portion.
-          If you want to change anything, first remove the symlink then edit
-          the file.
-
 config FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         bool "read-only root filesystem and overlay fs (squashfs-overlay)"

target/image/brcm/Makefile

@@ -60 +60 @@
 endif
 
-ifeq ($(FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS),y)
-$(KDIR)/root.squashfs-symlinks:
-        rm -f $(KDIR)/root.squashfs-symlinks
-        $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root \
-                $(KDIR)/root.squashfs-symlinks $(SQUASHFS_OPTS) $(MAKE_TRACE)
-endif
-
 $(KDIR)/loader.tmp.gz: lzma-loader-compile
         $(CP) $(BUILD_DIR)/loader.gz $@
@@ -81 +74 @@
 endif
 
-ifeq ($(FS),squashfs-symlinks)
-$(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS) $(KDIR)/vmlinux.lzma
-        $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma -a 1024 $(KDIR)/root.$(FS) $(MAKE_TRACE)
-endif
-
 ifeq ($(FS),jffs2)
 $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)-64k.trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS)-64k $(KDIR)/vmlinux.lzma