From bf4bf8754d429adccf5d2c3e057fa4aac8f05afa Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 3 Jan 2016 20:58:02 +0000 Subject: [PATCH] image.mk: use new pure make functions for sanitizing image filenames Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48106 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/include/image.mk b/include/image.mk index cebe42e9d0..5ef800234b 100644 --- a/include/image.mk +++ b/include/image.mk @@ -18,17 +18,7 @@ KDIR=$(KERNEL_BUILD_DIR) KDIR_TMP=$(KDIR)/tmp DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts -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 +sanitize = $(call tolower,$(subst _,-,$(1))) DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME)) -- 2.11.0