X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0835d732ce79bc5d764dfeaf1d3ae6d04b767763..441ff9ca0cabf0333998277d84cb361be10b7f1a:/include/image.mk diff --git a/include/image.mk b/include/image.mk index d7d981ba1..29328b314 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,17 +42,6 @@ ifneq ($(CONFIG_JFFS2_LZMA),y) JFFS2OPTS += -x lzma endif -ifneq ($(CONFIG_LINUX_2_6_25),) - USE_SQUASHFS3 := y -endif - -ifneq ($(USE_SQUASHFS3),) - MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma -else - MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4 - SQUASHFS_OPTS := -comp lzma -processors 1 -endif - JFFS2_BLOCKSIZE ?= 64k 128k define add_jffs2_mark @@ -99,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