diff options
| -rw-r--r-- | include/image.mk | 3 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/image.mk b/include/image.mk index 4ffad28bd6..cebe42e9d0 100644 --- a/include/image.mk +++ b/include/image.mk @@ -31,8 +31,9 @@ $(shell echo $(call tolower,$(1)) | sed 's/_/-/g') 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 diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index f612ea9abc..1056a42ca3 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -43,7 +43,7 @@ Building images: 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 @@ package_postinst: FORCE 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: |