target/jffs2/blocksize.mk for setting block size (req. for wrt54g)

squashfs removed in favor of squashfs-lzma


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@301 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Mike Baker
2005-03-03 02:44:10 +00:00
parent 79cb6ffbb0
commit 87f22e678a
12 changed files with 22 additions and 94 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1 @@
JFFS2_BLOCK_SIZE:=0x20000

View File

@@ -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)

View File

@@ -1,5 +0,0 @@
config BR2_TARGET_ROOTFS_SQUASHFS
bool "squashfs"
help
Build a squashfs root filesystem

View File

@@ -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