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

image: remove shell calls from legacy ubi/ubifs image code 

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Felix Fietkau 2016-07-25 12:37:01 +02:00
parent 064bcdc259
commit 33c8d35375
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/image-legacy.mk
View File

@ -3,10 +3,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
$(CP) ./ubinize$(1).cfg $(KDIR) $(CP) ./ubinize$(1).cfg $(KDIR)
( cd $(KDIR); \ ( cd $(KDIR); \
$(STAGING_DIR_HOST)/bin/ubinize \ $(STAGING_DIR_HOST)/bin/ubinize \
$(if $($(PROFILE)_UBI_OPTS), \ $(if $($(PROFILE)_UBI_OPTS),$($(PROFILE)_UBI_OPTS),$(shell echo $(UBI_OPTS))) \
$(shell echo $($(PROFILE)_UBI_OPTS)), \
$(shell echo $(UBI_OPTS)) \
) \
-o $(KDIR)/root$(1).ubi \ -o $(KDIR)/root$(1).ubi \
ubinize$(1).cfg \ ubinize$(1).cfg \
) )
@ -16,10 +13,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
$(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS), $(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \ $(STAGING_DIR_HOST)/bin/mkfs.ubifs \
$(if $($(PROFILE)_UBIFS_OPTS), \ $(if $($(PROFILE)_UBIFS_OPTS),$($(PROFILE)_UBIFS_OPTS),$(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) \

6
target/linux/kirkwood/image/Makefile
View File

@ -14,7 +14,7 @@ DEVICE_VARS += KERNEL_SIZE
KERNEL_LOADADDR:=0x8000 KERNEL_LOADADDR:=0x8000
TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome 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 UBIFS_OPTS := -m 2048 -e 126KiB -c 4096
define Device/Default define Device/Default
@ -141,8 +141,8 @@ define Image/Build/ubi
endif endif
endef endef
IOMEGA_IX2_200_UBIFS_OPTS:="-m 512 -e 15872 -c 2048" 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_UBI_OPTS := -m 512 -p 16384 -s 256
Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template) Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template)
Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0) Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0)