SVN-Revision: 24090
This commit is contained in:
Imre Kaloz 2010-11-22 13:46:09 +00:00
parent 5ea6194ab0
commit 66b08771ff

View File

@ -19,10 +19,8 @@ IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
ifneq ($(CONFIG_BIG_ENDIAN),) ifneq ($(CONFIG_BIG_ENDIAN),)
JFFS2OPTS := --pad --big-endian --squash -v JFFS2OPTS := --pad --big-endian --squash -v
SQUASHFS_OPTS := -be
else else
JFFS2OPTS := --pad --little-endian --squash -v JFFS2OPTS := --pad --little-endian --squash -v
SQUASHFS_OPTS := -le
endif endif
ifeq ($(CONFIG_JFFS2_RTIME),y) ifeq ($(CONFIG_JFFS2_RTIME),y)
@ -44,9 +42,6 @@ ifneq ($(CONFIG_JFFS2_LZMA),y)
JFFS2OPTS += -x lzma JFFS2OPTS += -x lzma
endif endif
MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
SQUASHFS_OPTS := -comp lzma -processors 1
JFFS2_BLOCKSIZE ?= 64k 128k JFFS2_BLOCKSIZE ?= 64k 128k
define add_jffs2_mark define add_jffs2_mark
@ -91,7 +86,7 @@ else
ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),) ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
define Image/mkfs/squashfs define Image/mkfs/squashfs
@mkdir -p $(TARGET_DIR)/overlay @mkdir -p $(TARGET_DIR)/overlay
$(MKSQUASHFS_CMD) $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS) $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp lzma -processors 1
$(call Image/Build,squashfs) $(call Image/Build,squashfs)
endef endef
endif endif