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>

diff --git a/include/image-legacy.mk b/include/image-legacy.mk
index edbee4c831841db7b54722c4a5cc730e38440bf5..1864d714e55ccefc0e6c3f9c12fde14d0f6080f6 100644 (file)
--- 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 65f9b0e96dfc7df1be43383a52cf40ec64995274..ed968513a1f307ce97ee1ae01234a41280ab943b 100644 (file)
--- 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))