diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-13 03:35:15 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-13 03:35:15 +0000 |
| commit | a531d21590a7b6276f1ade8bea4fda45883aa405 (patch) | |
| tree | 18153c19c3d852bb0bbd62a3a36e3d34dcbd8f38 /include/image.mk | |
| parent | 5ed845fbeafd4c98fbc9cde47af5fdb36e5b8f00 (diff) | |
| download | upstream-a531d21590a7b6276f1ade8bea4fda45883aa405.tar.gz upstream-a531d21590a7b6276f1ade8bea4fda45883aa405.tar.bz2 upstream-a531d21590a7b6276f1ade8bea4fda45883aa405.zip | |
ubifs: when creating ubi(fs) images profile originated arguments have priority
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38381
Diffstat (limited to 'include/image.mk')
| -rw-r--r-- | include/image.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/image.mk b/include/image.mk index 67cfa4b677..c79d823538 100644 --- a/include/image.mk +++ b/include/image.mk @@ -121,9 +121,12 @@ endif ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) define Image/mkfs/ubifs - ifdef UBIFS_OPTS + ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),) $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ - $(UBIFS_OPTS) \ + $(if $($(PROFILE)_UBIFS_OPTS), \ + $(shell echo $($(PROFILE)_UBIFS_OPTS)), \ + $(shell echo $(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) \ @@ -134,11 +137,14 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) endif $(call Image/Build,ubifs) - ifdef UBI_OPTS + ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),) $(CP) ./ubinize.cfg $(KDIR) ( cd $(KDIR); \ $(STAGING_DIR_HOST)/bin/ubinize \ - $(UBI_OPTS) \ + $(if $($(PROFILE)_UBI_OPTS), \ + $(shell echo $($(PROFILE)_UBI_OPTS)), \ + $(shell echo $(UBI_OPTS)), \ + ) \ -o $(KDIR)/root.ubi \ ubinize.cfg \ ) |