From 5223b6270c946b51bc225e741b239b112fdf4d54 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 2 Jan 2023 20:59:43 +0000 Subject: [PATCH 1/3] Remove cmp checks from Makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 1585ae7c2353..a978b6f8d25b 100644 --- a/Makefile +++ b/Makefile @@ -390,8 +390,6 @@ endef # Catch everything and parse the command line ourselves. .PHONY: % %: - # Check if we have the CMP tool installed - cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; # Ensure that $(QMK_BIN) works. if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi # Check if the submodules are dirty, and display a warning if they are From 0a55fd247b3b62b569429f268148f0e828c65aa2 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 2 Jan 2023 21:00:34 +0000 Subject: [PATCH 2/3] Update message.mk --- builddefs/message.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builddefs/message.mk b/builddefs/message.mk index 07d0e07ce80a..63b5276ad04e 100644 --- a/builddefs/message.mk +++ b/builddefs/message.mk @@ -66,7 +66,6 @@ MSG_CREATING_LIBRARY = Creating library: MSG_GENERATING = Generating: MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR) Some git submodules are out of date or modified.\n\ Please consider running $(BOLD)make git-submodule$(NO_COLOR).\n\n -MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) define GENERATE_MSG_MAKE_KB MSG_MAKE_KB_ACTUAL := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR) @@ -106,4 +105,4 @@ MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying a define CATASTROPHIC_ERROR $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2) $(error $1) -endef \ No newline at end of file +endef From ae9d6fe0603ada344e84fdfa54642a6e00e9f8de Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 3 Jan 2023 09:15:28 +1100 Subject: [PATCH 3/3] Update message.mk Thanks, github merge UI. --- builddefs/message.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/builddefs/message.mk b/builddefs/message.mk index ff93cc0d6461..bf39554dab77 100644 --- a/builddefs/message.mk +++ b/builddefs/message.mk @@ -68,7 +68,6 @@ MSG_NOT_REPO = $(WARN_COLOR)WARNING:$(NO_COLOR) Target folder is not a git repo, Please consider following $(BOLD)https://docs.qmk.fm/\#/newbs_getting_started$(NO_COLOR).\n\n MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR) Some git submodules are out of date or modified.\n\ Please consider running $(BOLD)qmk git-submodule$(NO_COLOR).\n\n -MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) define GENERATE_MSG_MAKE_KB MSG_MAKE_KB_ACTUAL := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR)