aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/image.mk6
-rw-r--r--package/base-files/image-config.in9
2 files changed, 13 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk
index d1dcdd6bad..93c3bbd246 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -40,9 +40,11 @@ KDIR=$(KERNEL_BUILD_DIR)
KDIR_TMP=$(KDIR)/tmp
DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
-EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME))
+IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-)
+IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
+IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-)
-IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(if $(EXTRA_NAME_SANITIZED),$(EXTRA_NAME_SANITIZED)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
+IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 4610c2b995..b18f2d85b1 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -258,6 +258,15 @@ if VERSIONOPT
help
Enable this to include the version number in firmware image, SDK-
and Image Builder archive file names
+
+ config VERSION_CODE_FILENAMES
+ bool
+ prompt "Revision code in filenames"
+ default y
+ help
+ Enable this to include the revision identifier or the configured
+ version code into the firmware image, SDK- and Image Builder archive
+ file names
endif