X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fimage.mk;h=94e4438312a7bf599e4924838e2c36536ff3be5d;hb=a8bb90bd2f07fa5da756c11911c64af1c855ee3d;hp=7375bf563f6bc6666cdd086097afb058ac2bd2f4;hpb=49305aa537d5235b2deca67e34f0d2bf26e855d8;p=openwrt-github%2F.git diff --git a/include/image.mk b/include/image.mk index 7375bf563f..94e4438312 100644 --- a/include/image.mk +++ b/include/image.mk @@ -9,6 +9,7 @@ override TARGET_BUILD= include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/version.mk override MAKE:=$(_SINGLE)$(SUBMAKE) override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) @@ -16,7 +17,7 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) KDIR=$(KERNEL_BUILD_DIR) DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/ -IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) +IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt