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>
This commit is contained in:
parent
38d845b405
commit
a7d13178f4
2 changed files with 3 additions and 3 deletions
|
@ -18,9 +18,6 @@ KDIR=$(KERNEL_BUILD_DIR)
|
||||||
KDIR_TMP=$(KDIR)/tmp
|
KDIR_TMP=$(KDIR)/tmp
|
||||||
DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
|
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))
|
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))
|
IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(if $(EXTRA_NAME_SANITIZED),$(EXTRA_NAME_SANITIZED)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
|
||||||
|
|
|
@ -24,6 +24,8 @@ PKG_CONFIG_DEPENDS += \
|
||||||
qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
|
qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
|
||||||
#'
|
#'
|
||||||
|
|
||||||
|
sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
|
||||||
|
|
||||||
VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
|
VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
|
||||||
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))
|
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:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
|
||||||
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE)
|
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:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
|
||||||
VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE)
|
VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE)
|
||||||
|
|
Loading…
Reference in a new issue