hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ubifs: when creating ubi(fs) images profile originated arguments have priority 

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38381
lede-17.01
Luka Perkov 2013-10-13 03:35:15 +00:00
parent 5ed845fbea
commit a531d21590
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/image.mk
View File

@ -121,9 +121,12 @@ endif
ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
define Image/mkfs/ubifs define Image/mkfs/ubifs
ifdef UBIFS_OPTS ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),)
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \ $(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_FREE_SPACE_FIXUP),--space-fixup) \
$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \ $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \
$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \ $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \
@ -134,11 +137,14 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
endif endif
$(call Image/Build,ubifs) $(call Image/Build,ubifs)
ifdef UBI_OPTS ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),)
$(CP) ./ubinize.cfg $(KDIR) $(CP) ./ubinize.cfg $(KDIR)
( cd $(KDIR); \ ( cd $(KDIR); \
$(STAGING_DIR_HOST)/bin/ubinize \ $(STAGING_DIR_HOST)/bin/ubinize \
$(UBI_OPTS) \ $(if $($(PROFILE)_UBI_OPTS), \
$(shell echo $($(PROFILE)_UBI_OPTS)), \
$(shell echo $(UBI_OPTS)), \
) \
-o $(KDIR)/root.ubi \ -o $(KDIR)/root.ubi \
ubinize.cfg \ ubinize.cfg \
) )