[source] build: fix build of ubifs images
LEDE Commits
lede-commits at lists.infradead.org
Mon Jan 9 07:31:47 PST 2017
nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/5903c46ef8b1126a2a977496c918f23d09e1c361
commit 5903c46ef8b1126a2a977496c918f23d09e1c361
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Jan 9 16:31:26 2017 +0100
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 at nbd.name>
---
include/image-legacy.mk | 6 +++---
include/image.mk | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/image-legacy.mk b/include/image-legacy.mk
index edbee4c..1864d71 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 65f9b0e..ed96851 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))
More information about the lede-commits
mailing list