crans/openwrt-chaoscalmer-uappro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image.mk: make ubinize.cfg optional

Browse source 
When using UbinizeImage with ubifs rootfs, ubinize.cfg is no longer
needed. Yet, the absance of ubinize.cfg would make the build process
abort with an error.
Fix that by checking if ubinize.cfg is present and do no not call the
"classic" ubinize image generation if it isn't.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
[missing new-line before UbinizeImage added itentionally]

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43788 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2014-12-27 13:03:19 +00:00
parent ea2d8858a3
commit 75be0e0d42
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/image.mk
View file

@ -146,6 +146,7 @@ ifneq ($(CONFIG_NAND_SUPPORT),)
(cd "$(KDIR_TMP)"; $(TAR) cvf \ (cd "$(KDIR_TMP)"; $(TAR) cvf \
"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1)) "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
endef endef
# $(1) board name # $(1) board name
# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage) # $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage)
# $(3) rootfstype (e.g. squashfs or ubifs) # $(3) rootfstype (e.g. squashfs or ubifs)
@ -193,10 +194,10 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
$(call Image/Build,ubifs) $(call Image/Build,ubifs)
ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),) ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),)
$(call Image/mkfs/ubifs/generate,) $(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,))
$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay)) $(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
endif endif
$(call Image/Build,ubi) $(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi))
endef endef
endif endif