X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=include%2Fimage.mk;h=29328b314e5b0df80942cfefc66b91022d5f98aa;hp=942072102fc707c707fe87ec933cf5973e8b838f;hb=ac6a6c04bcccc42711ffa3915159f37e14659cac;hpb=a695ed8a415f249366717c90ea7c6edfa231b91f diff --git a/include/image.mk b/include/image.mk index 942072102f..29328b314e 100644 --- a/include/image.mk +++ b/include/image.mk @@ -19,10 +19,8 @@ IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) ifneq ($(CONFIG_BIG_ENDIAN),) JFFS2OPTS := --pad --big-endian --squash -v - SQUASHFS_OPTS := -be else JFFS2OPTS := --pad --little-endian --squash -v - SQUASHFS_OPTS := -le endif ifeq ($(CONFIG_JFFS2_RTIME),y) @@ -44,9 +42,6 @@ ifneq ($(CONFIG_JFFS2_LZMA),y) JFFS2OPTS += -x lzma endif - MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4 - SQUASHFS_OPTS := -comp lzma -processors 1 - JFFS2_BLOCKSIZE ?= 64k 128k define add_jffs2_mark @@ -91,7 +86,7 @@ else ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),) define Image/mkfs/squashfs @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) endef endif