mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

images: use configured distribution name for output image names

Browse Source 
We allow to configure the version distribution name;
let's also use it for the final image filenames.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>

SVN-Revision: 48082
This commit is contained in:
Felix Fietkau 2016-01-03 14:44:48 +00:00
parent d69efa4e15
commit 150a1b18c5
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/image.mk
View File

@ -18,7 +18,21 @@ KDIR=$(KERNEL_BUILD_DIR)
KDIR_TMP=$(KDIR)/tmp
DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
define toupper
$(shell echo $(1) | tr '[:lower:]' '[:upper:]')
endef
define tolower
$(shell echo $(1) | tr '[:upper:]' '[:lower:]')
endef
define sanitize
$(shell echo $(call tolower,$(1)) | sed 's/_/-/g')
endef
DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
IMG_PREFIX:=$(DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt
@ -85,18 +99,6 @@ define add_jffs2_mark
echo -ne '\xde\xad\xc0\xde' >> $(1)
endef
define toupper
$(shell echo $(1) | tr '[:lower:]' '[:upper:]')
endef
define tolower
$(shell echo $(1) | tr '[:upper:]' '[:lower:]')
endef
define sanitize
$(shell echo $(call tolower,$(1)) | sed 's/_/-/g')
endef
PROFILE_SANITIZED := $(call sanitize,$(PROFILE))
define split_args