Changeset 2557
- Timestamp:
- 05/20/07 12:31:19 (2 years ago)
- Files:
-
- trunk/freewrt/mk/targets.mk (modified) (1 diff)
- trunk/freewrt/package/fwcf/Config.in (modified) (1 diff)
- trunk/freewrt/package/jffs2root/Config.in (modified) (1 diff)
- trunk/freewrt/package/mini_fo/Config.in (modified) (1 diff)
- trunk/freewrt/package/mtd/Config.in (modified) (1 diff)
- trunk/freewrt/target/Config.in (modified) (2 diffs)
- trunk/freewrt/target/image/brcm/Makefile (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/freewrt/mk/targets.mk
r2504 r2557 73 73 74 74 $(eval $(call rootfs_template,jffs2,JFFS2,rootfstype=jffs2 root=/dev/mtdblock2)) 75 $(eval $(call rootfs_template,squashfs -overlay,SQUASHFS_OVERLAY,rootfstype=squashfs root=/dev/mtdblock2))75 $(eval $(call rootfs_template,squashfs,SQUASHFS,rootfstype=squashfs root=/dev/mtdblock2)) 76 76 $(eval $(call rootfs_template,nfs,NFS,root=/dev/nfs ip=dhcp)) 77 77 $(eval $(call rootfs_template,ext2-cf,EXT2_CF,root=/dev/cfa2)) trunk/freewrt/package/fwcf/Config.in
r2258 r2557 3 3 tristate 4 4 default y if FWRT_TARGET_ROOTFS_JFFS2 5 default y if FWRT_TARGET_ROOTFS_SQUASHFS _OVERLAY5 default y if FWRT_TARGET_ROOTFS_SQUASHFS 6 6 default n 7 7 select BUSYBOX_CONFIG_CAT trunk/freewrt/package/jffs2root/Config.in
r943 r2557 3 3 tristate 4 4 default y if FWRT_TARGET_ROOTFS_JFFS2 5 default y if FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS 6 default y if FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY 5 default y if FWRT_TARGET_ROOTFS_SQUASHFS 7 6 default n 8 7 depends on FWRT_TARGET_ROOTFS_JFFS2 || \ 9 FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS || \ 10 FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY 8 FWRT_TARGET_ROOTFS_SQUASHFS 11 9 help 12 10 jffs2 resize utility for broadcom devices trunk/freewrt/package/mini_fo/Config.in
r1111 r2557 3 3 tristate 4 4 default n 5 depends on ! FWRT_TARGET_ROOTFS_SQUASHFS _OVERLAY5 depends on ! FWRT_TARGET_ROOTFS_SQUASHFS 6 6 help 7 7 The mini fanout overlay file system. trunk/freewrt/package/mtd/Config.in
r1090 r2557 3 3 tristate 4 4 default y if FWRT_TARGET_ROOTFS_JFFS2 5 default y if FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS 6 default y if FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY 5 default y if FWRT_TARGET_ROOTFS_SQUASHFS 7 6 default n 8 7 depends on FWRT_TARGET_ROOTFS_JFFS2 || \ 9 FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS || \ 10 FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY 8 FWRT_TARGET_ROOTFS_SQUASHFS 11 9 help 12 10 Update utility for trx firmware images. trunk/freewrt/target/Config.in
r2504 r2557 22 22 choice 23 23 prompt "Target Firmware type" 24 default FWRT_TARGET_ROOTFS_SQUASHFS _OVERLAY24 default FWRT_TARGET_ROOTFS_SQUASHFS 25 25 26 26 config FWRT_TARGET_ROOTFS_JFFS2 … … 35 35 Build firmware images with a writable jffs2 root filesystem. 36 36 37 config FWRT_TARGET_ROOTFS_SQUASHFS _OVERLAY38 bool "read-only root filesystem and overlay fs (squashfs -overlay)"37 config FWRT_TARGET_ROOTFS_SQUASHFS 38 bool "read-only root filesystem and overlay fs (squashfs)" 39 39 select FWRT_PACKAGE_MTD 40 40 select FWRT_PACKAGE_FWCF trunk/freewrt/target/image/brcm/Makefile
r2534 r2557 47 47 endif 48 48 49 ifeq ($(FWRT_TARGET_ROOTFS_SQUASHFS _OVERLAY),y)50 $(KDIR)/root.squashfs -overlay:51 rm -f $(KDIR)/root.squashfs -overlay49 ifeq ($(FWRT_TARGET_ROOTFS_SQUASHFS),y) 50 $(KDIR)/root.squashfs: 51 rm -f $(KDIR)/root.squashfs 52 52 $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root \ 53 $(KDIR)/root.squashfs -overlay$(SQUASHFS_OPTS) $(MAKE_TRACE)53 $(KDIR)/root.squashfs $(SQUASHFS_OPTS) $(MAKE_TRACE) 54 54 endif 55 55 … … 61 61 cp $(BUILD_DIR)/loader.elf $(BIN_DIR)/kernel/bootloader-$(BOARD)-$(KERNEL).elf 62 62 63 ifeq ($(FS),squashfs -overlay)63 ifeq ($(FS),squashfs) 64 64 $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS) $(KDIR)/vmlinux.lzma 65 65 $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma -a 1024 $(KDIR)/root.$(FS) $(MAKE_TRACE)
