aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-25 12:37:01 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-25 12:37:50 +0200
commit33c8d35375706457768d32155f10e7df196e9a65 (patch)
tree108f354c4a5f057809cea3198a0634fc0d1b93eb /include
parent064bcdc25907e7c9c949bb80c4772ecf81178d66 (diff)
downloadupstream-33c8d35375706457768d32155f10e7df196e9a65.tar.gz
upstream-33c8d35375706457768d32155f10e7df196e9a65.tar.bz2
upstream-33c8d35375706457768d32155f10e7df196e9a65.zip
image: remove shell calls from legacy ubi/ubifs image code
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'include')
-rw-r--r--include/image-legacy.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/image-legacy.mk b/include/image-legacy.mk
index 1b8a9115fc..da8279c263 100644
--- a/include/image-legacy.mk
+++ b/include/image-legacy.mk
@@ -3,10 +3,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
$(CP) ./ubinize$(1).cfg $(KDIR)
( cd $(KDIR); \
$(STAGING_DIR_HOST)/bin/ubinize \
- $(if $($(PROFILE)_UBI_OPTS), \
- $(shell echo $($(PROFILE)_UBI_OPTS)), \
- $(shell echo $(UBI_OPTS)) \
- ) \
+ $(if $($(PROFILE)_UBI_OPTS),$($(PROFILE)_UBI_OPTS),$(shell echo $(UBI_OPTS))) \
-o $(KDIR)/root$(1).ubi \
ubinize$(1).cfg \
)
@@ -16,10 +13,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
$(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
- $(if $($(PROFILE)_UBIFS_OPTS), \
- $(shell echo $($(PROFILE)_UBIFS_OPTS)), \
- $(shell echo $(UBIFS_OPTS)) \
- ) \
+ $(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) \