Author: nbd Date: 2016-01-03 15:44:56 +0100 (Sun, 03 Jan 2016) New Revision: 48083
Modified: trunk/include/image.mk trunk/target/imagebuilder/files/Makefile Log: images imagebuilder: Allow to add sanitized extra name For final output image names allow user to add an extra string (which is sanitized). This is particularly useful with ImageBuilder where you may generate multiple images from the same base and for the same board, with different package selections and additional files (via FILES=). Signed-off-by: Daniel Dickinson <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2016-01-03 14:44:48 UTC (rev 48082) +++ trunk/include/image.mk 2016-01-03 14:44:56 UTC (rev 48083) @@ -31,8 +31,9 @@ endef DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) +EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME)) -IMG_PREFIX:=$(DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) +IMG_PREFIX:=$(DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(if $(EXTRA_NAME_SANITIZED),$(EXTRA_NAME_SANITIZED)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt Modified: trunk/target/imagebuilder/files/Makefile =================================================================== --- trunk/target/imagebuilder/files/Makefile 2016-01-03 14:44:48 UTC (rev 48082) +++ trunk/target/imagebuilder/files/Makefile 2016-01-03 14:44:56 UTC (rev 48083) @@ -43,7 +43,7 @@ make image PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages make image FILES="<path>" # include extra files from <path> make image BIN_DIR="<path>" # alternative output directory for the images - + make image EXTRA_IMAGE_NAME="<string>" # Add this to the output image filename (sanitized) endef $(eval $(call shexport,Helptext)) @@ -174,7 +174,7 @@ build_image: FORCE @echo @echo Building images... - $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 \ + $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \ $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)") clean: _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
