Author: nbd Date: 2014-12-27 14:03:19 +0100 (Sat, 27 Dec 2014) New Revision: 43788
Modified: trunk/include/image.mk Log: image.mk: make ubinize.cfg optional 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 <[email protected]> [missing new-line before UbinizeImage added itentionally] Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2014-12-27 13:03:12 UTC (rev 43787) +++ trunk/include/image.mk 2014-12-27 13:03:19 UTC (rev 43788) @@ -146,6 +146,7 @@ (cd "$(KDIR_TMP)"; $(TAR) cvf \ "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1)) endef + # $(1) board name # $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage) # $(3) rootfstype (e.g. squashfs or ubifs) @@ -193,10 +194,10 @@ $(call Image/Build,ubifs) 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)) endif - $(call Image/Build,ubi) + $(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi)) endef endif _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
