diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-09 16:31:26 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-09 16:31:39 +0100 |
| commit | 5903c46ef8b1126a2a977496c918f23d09e1c361 (patch) | |
| tree | 651e22e14504fdc17046b1987ee14097b87b4692 /include | |
| parent | 1c6b1ab01dd6a5aa05e1b6d5f41c16b813288dd5 (diff) | |
| download | upstream-5903c46ef8b1126a2a977496c918f23d09e1c361.tar.gz upstream-5903c46ef8b1126a2a977496c918f23d09e1c361.tar.bz2 upstream-5903c46ef8b1126a2a977496c918f23d09e1c361.zip | |
build: fix build of ubifs images
--force-compr was added by the xz compression patch, which is gone now.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'include')
| -rw-r--r-- | include/image-legacy.mk | 6 | ||||
| -rw-r--r-- | include/image.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/image-legacy.mk b/include/image-legacy.mk index edbee4c831..1864d714e5 100644 --- a/include/image-legacy.mk +++ b/include/image-legacy.mk @@ -15,9 +15,9 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ $(if $($(PROFILE)_UBIFS_OPTS),$($(PROFILE)_UBIFS_OPTS),$(UBIFS_OPTS)) \ $(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--compr=none) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--compr=lzo) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--compr=zlib) \ $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \ --squash-uids \ -o $(KDIR)/root.ubifs \ diff --git a/include/image.mk b/include/image.mk index 65f9b0e96d..ed968513a1 100644 --- a/include/image.mk +++ b/include/image.mk @@ -233,9 +233,9 @@ define Image/mkfs/ubifs $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ $(UBIFS_OPTS) $(call param_unmangle,$(call param_get,fs,$(1))) \ $(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--compr=none) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--compr=lzo) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--compr=zlib) \ $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \ --squash-uids \ -o $@ -d $(call mkfs_target_dir,$(1)) |