diff mbox

[LEDE-DEV,1/3] include: rename DIST_SANITIZED to VERSION_DIST_SANITZED

Message ID 20160526132548.19606-1-lynxis@fe80.eu
State Superseded
Headers show

Commit Message

Alexander 'lynxis' Couzens May 26, 2016, 1:25 p.m. UTC
All version variables contain VERSION prefix.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
---
 include/image.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jo-Philipp Wich May 26, 2016, 1:38 p.m. UTC | #1
On 05/26/2016 03:25 PM, Alexander Couzens wrote:
> All version variables contain VERSION prefix.
> 
> Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
Acked-by: Jo-Philipp Wich <jo@mein.io>
Alexander 'lynxis' Couzens May 26, 2016, 2:39 p.m. UTC | #2
Changelog:

v2:
- switch to VERSION_DIST_SANITZED for SDK/Toolchain too
- IB/SDK/Toolchain: use lower case file names (ImageBuilder -> imagebuilder)

Alexander Couzens (4):
  include: rename DIST_SANITIZED to VERSION_DIST_SANITZED
  include: move VERSION_DIST_SANITIZED to version.mk
  IB/SDK/toolchain: use VERSION_DIST_SANITIZED instead of VERSION_DIST
  IB/SDK/toolchain: use lower cases filenames

 include/image.mk             | 5 +----
 include/version.mk           | 3 +++
 target/imagebuilder/Makefile | 2 +-
 target/sdk/Makefile          | 2 +-
 target/toolchain/Makefile    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/include/image.mk b/include/image.mk
index fbb3a01..3955962 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -20,10 +20,10 @@  DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
 
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
-DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
+VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
 EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME))
 
-IMG_PREFIX:=$(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))
 
 MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt