From 077d24202ae03803c4228f58d5f0a6871e1a49a1 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 19 Apr 2022 20:02:38 +0200
Subject: [PATCH] - raname message macros

---
 make/buildsystem-bootstrap.mk     | 2 +-
 make/buildsystem-clean.mk         | 2 +-
 make/buildsystem-prerequisites.mk | 6 +++---
 make/flash-images.mk              | 2 +-
 support/misc/utils.mk             | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/make/buildsystem-bootstrap.mk b/make/buildsystem-bootstrap.mk
index b3a0a1f5..034fd0d5 100644
--- a/make/buildsystem-bootstrap.mk
+++ b/make/buildsystem-bootstrap.mk
@@ -27,7 +27,7 @@ endif
 bootstrap: $(BOOTSTRAP)
 	@touch $(BUILD_DIR)/.$(BOXTYPE)-$(BOXMODEL)
 	$(call draw_line);
-	@$(call MESSAGE_GREEN,"Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))")
+	@$(call SUCCESS,"Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))")
 	$(call draw_line);
 
 # -----------------------------------------------------------------------------
diff --git a/make/buildsystem-clean.mk b/make/buildsystem-clean.mk
index a8865553..18ff4a4e 100644
--- a/make/buildsystem-clean.mk
+++ b/make/buildsystem-clean.mk
@@ -40,7 +40,7 @@ ccache-clean:
 rebuild-clean: host-bin-config-clean target-clean deps-clean build-clean checkout-branches
 
 all-clean: rebuild-clean staging-clean host-clean static-base-clean
-	@$(call MESSAGE_RED,"Any other key then CTRL-C will now remove CROSS_BASE")
+	@$(call WARNING,"Any other key then CTRL-C will now remove CROSS_BASE")
 	@read
 	make cross-base-clean
 
diff --git a/make/buildsystem-prerequisites.mk b/make/buildsystem-prerequisites.mk
index cdbecf57..22e9eaa2 100644
--- a/make/buildsystem-prerequisites.mk
+++ b/make/buildsystem-prerequisites.mk
@@ -36,14 +36,14 @@ TOOLCHECK += find-yacc
 
 find-%:
 	@TOOL=$(patsubst find-%,%,$(@)); type -p $$TOOL >/dev/null || \
-		{ $(call MESSAGE_RED,"Warning",": required tool $$TOOL missing."); false; }
+		{ $(call WARNING,"Warning",": required tool $$TOOL missing."); false; }
 
 bashcheck:
 	@test "$(subst /bin/,,$(shell readlink /bin/sh))" == "bash" || \
-		{ $(call MESSAGE_RED,"Warning",": /bin/sh is not linked to bash"); false; }
+		{ $(call WARNING,"Warning",": /bin/sh is not linked to bash"); false; }
 
 toolcheck: bashcheck $(TOOLCHECK)
-	@$(call MESSAGE_GREEN,"All required tools seem to be installed.")
+	@$(call SUCCESS,"All required tools seem to be installed.")
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/flash-images.mk b/make/flash-images.mk
index 0ee77acc..d9774ff3 100644
--- a/make/flash-images.mk
+++ b/make/flash-images.mk
@@ -112,7 +112,7 @@ check-image-size:
 ifdef IMAGE_TO_CHECK
 	@IMAGE_SIZE=$(shell wc -c < $(IMAGE_TO_CHECK)); \
 	if [ $$IMAGE_SIZE -ge $(ROOTFS_SIZE) ]; then \
-		$(call MESSAGE_RED,"$(IMAGE_TO_CHECK) is too big"); \
+		$(call WARNING,"$(IMAGE_TO_CHECK) is too big"); \
 		false; \
 	fi
 endif
diff --git a/support/misc/utils.mk b/support/misc/utils.mk
index a8607e15..fae52c54 100644
--- a/support/misc/utils.mk
+++ b/support/misc/utils.mk
@@ -82,8 +82,8 @@ TERM_RESET := $(shell tput rmso 2>/dev/null)
 
 # MESSAGE Macro -- display a message in bold type
 MESSAGE = echo -e "$(TERM_YELLOW)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
-MESSAGE_GREEN = echo -e "$(TERM_GREEN)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
-MESSAGE_RED = echo -e "$(TERM_RED_BOLD)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
+SUCCESS = echo -e "$(TERM_GREEN)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
+WARNING = echo -e "$(TERM_RED_BOLD)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
 
 # Utility functions for 'find'
 # findfileclauses(filelist) => -name 'X' -o -name 'Y'