From 42db3738065d5adb41f7481d21eb2823c929b8e6 Mon Sep 17 00:00:00 2001 From: qthedev Date: Sat, 5 Feb 2022 10:25:16 +0000 Subject: [PATCH] Replace echo -n's used in environment processing with touch echo -n does not give the intended effect when invoked in macOS through /bin/sh, which is the shell make uses by default, see "https://stackoverflow.com/questions/11675070/makefile-echo-n-not-working" for a detailed explanation. In this case, it resulted in "-n" being written to env.txt and env.in even though they should be empty, which caused compilation to fail with "Your board uses a text-file environment, so must not define CONFIG_EXTRA_ENV_SETTINGS". This patch prevents the error by replacing echo -n's with touch, as they are used to create empty files in these cases. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1ee7089..fa9bac4 100644 --- a/Makefile +++ b/Makefile @@ -1843,7 +1843,7 @@ quiet_cmd_gen_envp = ENVP $@ -I$(srctree)/arch/$(ARCH)/include \ $< -o $@; \ else \ - echo -n >$@ ; \ + touch $@ ; \ fi include/generated/env.in: include/generated/env.txt FORCE $(call cmd,gen_envp) @@ -1860,7 +1860,7 @@ quiet_cmd_envc = ENVC $@ elif [ -n "$(ENV_SOURCE_FILE)" ]; then \ echo "Missing file $(ENV_FILE_CFG)"; \ else \ - echo -n >$@ ; \ + touch $@ ; \ fi include/generated/env.txt: $(wildcard $(ENV_FILE)) FORCE -- 2.7.4