From: Alexander Couzens <lynxis@fe80.eu>
Date: Thu, 26 May 2016 13:23:41 +0000 (+0200)
Subject: include: move VERSION_DIST_SANITIZED to version.mk
X-Git-Tag: v17.01.0-rc1~2564
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a7d13178f430027ae9073e0a7d3edc2f344bcea6;p=oweals%2Fopenwrt.git

include: move VERSION_DIST_SANITIZED to version.mk

Also move sanitize function to version.mk
Prepare use of VERSION_DIST_SANITIZED by IB/SDK/toolchain

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
---

diff --git a/include/image.mk b/include/image.mk
index ffa4bb5ef6..365098d5c0 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -18,9 +18,6 @@ KDIR=$(KERNEL_BUILD_DIR)
 KDIR_TMP=$(KDIR)/tmp
 DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
 
-sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
-
-VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
 EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME))
 
 IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(if $(EXTRA_NAME_SANITIZED),$(EXTRA_NAME_SANITIZED)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
diff --git a/include/version.mk b/include/version.mk
index ef8024002f..88d6245fcd 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -24,6 +24,8 @@ PKG_CONFIG_DEPENDS += \
 qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
 #'
 
+sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
+
 VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
 VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))
 
@@ -38,6 +40,7 @@ VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project
 
 VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE)
+VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
 
 VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
 VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE)