EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

image: allow devices to override the -E 5 ubinize option

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-13 17:23:00 +02:00
parent e0ed6ec667
commit b8fddb8912
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/image-commands.mk
View File

@ -105,8 +105,9 @@ define Build/append-ubi
$(if $(KERNEL_IN_UBI),--kernel $(word 1,$^)) \ $(if $(KERNEL_IN_UBI),--kernel $(word 1,$^)) \
$(word 2,$^) \ $(word 2,$^) \
$@.tmp \ $@.tmp \
-p $(BLOCKSIZE) -m $(PAGESIZE) -E 5 \ -p $(BLOCKSIZE) -m $(PAGESIZE) \
$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) $(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
$(UBINIZE_OPTS)
cat $@.tmp >> $@ cat $@.tmp >> $@
rm $@.tmp rm $@.tmp
endef endef

4
include/image.mk
View File

@ -327,6 +327,7 @@ define Device/Init
BLOCKSIZE := BLOCKSIZE :=
PAGESIZE := PAGESIZE :=
SUBPAGESIZE := SUBPAGESIZE :=
UBINIZE_OPTS := -E 5
FILESYSTEMS := $(TARGET_FILESYSTEMS) FILESYSTEMS := $(TARGET_FILESYSTEMS)
endef endef
@ -334,7 +335,8 @@ endef
DEFAULT_DEVICE_VARS := \ DEFAULT_DEVICE_VARS := \
DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \ DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \
UBOOTENV_IN_UBI KERNEL_IN_UBI \ UBOOTENV_IN_UBI KERNEL_IN_UBI \
BLOCKSIZE PAGESIZE SUBPAGESIZE BLOCKSIZE PAGESIZE SUBPAGESIZE \
UBINIZE_OPTS
define Device/ExportVar define Device/ExportVar
$(1) : $(2):=$$($(2)) $(1) : $(2):=$$($(2))