diff options
Diffstat (limited to 'include/image.mk')
| -rw-r--r-- | include/image.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/image.mk b/include/image.mk index 1977fc84c..302228816 100644 --- a/include/image.mk +++ b/include/image.mk @@ -18,9 +18,9 @@ KDIR=$(KERNEL_BUILD_DIR) IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) ifneq ($(CONFIG_BIG_ENDIAN),) - JFFS2OPTS := --pad --big-endian --squash -v + JFFS2OPTS := --pad --big-endian --squash-uids -v else - JFFS2OPTS := --pad --little-endian --squash -v + JFFS2OPTS := --pad --little-endian --squash-uids -v endif ifeq ($(CONFIG_JFFS2_RTIME),y) @@ -50,7 +50,10 @@ ifeq ($(CONFIG_SQUASHFS_LZMA),y) SQUASHFSCOMP := lzma $(LZMA_XZ_OPTIONS) endif ifeq ($(CONFIG_SQUASHFS_XZ),y) - SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS) + ifneq ($(filter arm x86 powerpc sparc,$(LINUX_KARCH)),) + BCJ_FILTER:=-Xbcj $(LINUX_KARCH) + endif + SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS) $(BCJ_FILTER) endif JFFS2_BLOCKSIZE ?= 64k 128k @@ -98,6 +101,7 @@ else define Image/mkfs/ubifs $(CP) ./ubinize.cfg $(KDIR) $(STAGING_DIR_HOST)/bin/mkfs.ubifs $(UBIFS_OPTS) -o $(KDIR)/root.ubifs -d $(TARGET_DIR) + $(call Image/Build,ubifs) (cd $(KDIR); \ $(STAGING_DIR_HOST)/bin/ubinize $(UBINIZE_OPTS) -o $(KDIR)/root.ubi ubinize.cfg) $(call Image/Build,ubi) @@ -124,7 +128,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_EXT4FS),) define Image/mkfs/ext4 # generate an ext2 fs - $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 + $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 -m $(CONFIG_TARGET_ROOTFS_RESERVED_PCT) # convert it to ext4 $(STAGING_DIR_HOST)/bin/tune2fs -O extents,uninit_bg,dir_index $(KDIR)/root.ext4 # fix it up |