diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-07-25 12:37:01 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-07-25 12:37:50 +0200 |
| commit | 33c8d35375706457768d32155f10e7df196e9a65 (patch) | |
| tree | 108f354c4a5f057809cea3198a0634fc0d1b93eb | |
| parent | 064bcdc25907e7c9c949bb80c4772ecf81178d66 (diff) | |
| download | master-31e0f0ae-33c8d35375706457768d32155f10e7df196e9a65.tar.gz master-31e0f0ae-33c8d35375706457768d32155f10e7df196e9a65.tar.bz2 master-31e0f0ae-33c8d35375706457768d32155f10e7df196e9a65.zip | |
image: remove shell calls from legacy ubi/ubifs image code
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | include/image-legacy.mk | 10 | ||||
| -rw-r--r-- | target/linux/kirkwood/image/Makefile | 6 |
2 files changed, 5 insertions, 11 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) \ diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 20c697ef79..217ec234b4 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -14,7 +14,7 @@ DEVICE_VARS += KERNEL_SIZE KERNEL_LOADADDR:=0x8000 TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome -UBI_OPTS:="-m 2048 -p 128KiB -s 512" +UBI_OPTS := -m 2048 -p 128KiB -s 512 UBIFS_OPTS := -m 2048 -e 126KiB -c 4096 define Device/Default @@ -141,8 +141,8 @@ define Image/Build/ubi endif endef -IOMEGA_IX2_200_UBIFS_OPTS:="-m 512 -e 15872 -c 2048" -IOMEGA_IX2_200_UBI_OPTS:="-m 512 -p 16384 -s 256" +IOMEGA_IX2_200_UBIFS_OPTS := -m 512 -e 15872 -c 2048 +IOMEGA_IX2_200_UBI_OPTS := -m 512 -p 16384 -s 256 Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template) Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0) |