aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-11-22 13:46:09 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-11-22 13:46:09 +0000
commit06e8850d41f715ebd1e0ce2ea27129fd993a0ace (patch)
tree7dfbb68e7675836153d0fa35e9d2eda5c294f067
parent00da58c6ae0f70f2c6854e75b1ae12963db5b25b (diff)
downloadupstream-06e8850d41f715ebd1e0ce2ea27129fd993a0ace.tar.gz
upstream-06e8850d41f715ebd1e0ce2ea27129fd993a0ace.tar.bz2
upstream-06e8850d41f715ebd1e0ce2ea27129fd993a0ace.zip
cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24090 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/image.mk7
1 files changed, 1 insertions, 6 deletions
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