diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /include/image.mk | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'include/image.mk')
| -rw-r--r-- | include/image.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk index 503115ddb..302228816 100644 --- a/include/image.mk +++ b/include/image.mk @@ -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) |