projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[sibyte]: upgrade to 2.6.37.4
[openwrt.git]
/
include
/
image.mk
diff --git
a/include/image.mk
b/include/image.mk
index
9420721
..
29328b3
100644
(file)
--- 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
ifneq ($(CONFIG_BIG_ENDIAN),)
JFFS2OPTS := --pad --big-endian --squash -v
- SQUASHFS_OPTS := -be
else
JFFS2OPTS := --pad --little-endian --squash -v
else
JFFS2OPTS := --pad --little-endian --squash -v
- SQUASHFS_OPTS := -le
endif
ifeq ($(CONFIG_JFFS2_RTIME),y)
endif
ifeq ($(CONFIG_JFFS2_RTIME),y)
@@
-44,9
+42,6
@@
ifneq ($(CONFIG_JFFS2_LZMA),y)
JFFS2OPTS += -x lzma
endif
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
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
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
$(call Image/Build,squashfs)
endef
endif
This page took
0.026136 seconds
and
4
git commands to generate.