diff options
Diffstat (limited to 'openwrt/target')
| -rw-r--r-- | openwrt/target/Config.in | 1 | ||||
| -rw-r--r-- | openwrt/target/Makefile.in | 3 | ||||
| -rw-r--r-- | openwrt/target/jffs2/blocksize.mk | 1 | ||||
| -rw-r--r-- | openwrt/target/jffs2/jffs2root.mk | 4 | ||||
| -rw-r--r-- | openwrt/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 | bin | 5730 -> 0 bytes | |||
| -rw-r--r-- | openwrt/target/squashfs/Config.in | 5 | ||||
| -rw-r--r-- | openwrt/target/squashfs/squashfsroot.mk | 54 |
7 files changed, 6 insertions, 62 deletions
diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in index 36616f07b8..1a997da2a6 100644 --- a/openwrt/target/Config.in +++ b/openwrt/target/Config.in @@ -1,7 +1,6 @@ choice prompt "Target Root Filesystem" source "target/jffs2/Config.in" - source "target/squashfs/Config.in" source "target/squashfs-lzma/Config.in" endchoice diff --git a/openwrt/target/Makefile.in b/openwrt/target/Makefile.in index 15cf6bdede..22cd7a4208 100644 --- a/openwrt/target/Makefile.in +++ b/openwrt/target/Makefile.in @@ -6,7 +6,8 @@ TARGET_SKEL_DIR=target/default/target_skeleton include target/device/Makefile.in ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -JFFS2FLAGS+=-a 131072 +include target/jffs2/blocksize.mk +JFFS2FLAGS+=-a $(JFFS2_BLOCK_SIZE) endif diff --git a/openwrt/target/jffs2/blocksize.mk b/openwrt/target/jffs2/blocksize.mk new file mode 100644 index 0000000000..9e08a04974 --- /dev/null +++ b/openwrt/target/jffs2/blocksize.mk @@ -0,0 +1 @@ +JFFS2_BLOCK_SIZE:=0x20000 diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk index 92dad0e57c..9846d001f0 100644 --- a/openwrt/target/jffs2/jffs2root.mk +++ b/openwrt/target/jffs2/jffs2root.mk @@ -4,6 +4,8 @@ # ############################################################# +include target/jffs2/blocksize.mk + MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig MTD_SOURCE=mtd_20050122.orig.tar.gz MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd @@ -32,7 +34,7 @@ jffs2root: mtd -@find $(TARGET_DIR) -type f -perm +111 | xargs $(SSTRIP) 2>/dev/null || true; @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info - $(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \ + $(MKFS_JFFS2) --pad --little-endian --squash -e $(JFFS2_BLOCK_SIZE) \ -d $(TARGET_DIR) -o $(IMAGE).jffs2 jffs2root-source: $(DL_DIR)/$(MTD_SOURCE) diff --git a/openwrt/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 b/openwrt/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 Binary files differdeleted file mode 100644 index 8e19292c1e..0000000000 --- a/openwrt/target/squashfs-lzma/kernel-patch/linux-squashfs-lzma.bz2 +++ /dev/null diff --git a/openwrt/target/squashfs/Config.in b/openwrt/target/squashfs/Config.in deleted file mode 100644 index 6f1d709d50..0000000000 --- a/openwrt/target/squashfs/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_TARGET_ROOTFS_SQUASHFS - bool "squashfs" - help - Build a squashfs root filesystem - diff --git a/openwrt/target/squashfs/squashfsroot.mk b/openwrt/target/squashfs/squashfsroot.mk deleted file mode 100644 index d3a104a83f..0000000000 --- a/openwrt/target/squashfs/squashfsroot.mk +++ /dev/null @@ -1,54 +0,0 @@ -############################################################# -# -# squashfs target -# -############################################################# - -SQUASHFS_DIR=$(BUILD_DIR)/squashfs2.1-r2 -SQUASHFS_SOURCE=squashfs2.1-r2.tar.gz -SQUASHFS_SITE=http://dl.sourceforge.net/sourceforge/squashfs - -$(DL_DIR)/$(SQUASHFS_SOURCE): - $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE) - -$(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) - zcat $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - touch $(SQUASHFS_DIR)/.unpacked - -$(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked - $(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools; - -squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs - -squashfs-source: $(DL_DIR)/$(SQUASHFS_SOURCE) - -squashfs-clean: - -$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools clean - -squashfs-dirclean: - rm -rf $(SQUASHFS_DIR) - - -############################################################# -# -# Build the squashfs root filesystem image -# -############################################################# - -squashfsroot: squashfs - @rm -rf $(TARGET_DIR)/usr/man - @rm -rf $(TARGET_DIR)/usr/info - $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le - -squashfsroot-source: squashfs-source - -squashfsroot-clean: - -$(MAKE) -C $(SQUASHFS_DIR) clean - -squashfsroot-dirclean: - rm -rf $(SQUASHFS_DIR) - -ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y) -TARGETS+=squashfsroot openwrt-image -ROOTFS=squashfs -endif |