From 820a8956847e06e302b48e7384fed53c5eae3cd4 Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Sat, 4 Feb 2023 11:52:15 +0100 Subject: [PATCH 1/2] Make: rename create-Makefile.ci to generate-Makefile.ci With this rename it is in line with the other generate-* targets --- Makefile.include | 2 +- makefiles/info-global.inc.mk | 3 ++- makefiles/info.inc.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.include b/Makefile.include index db8a0fd2a5..351b33b159 100644 --- a/Makefile.include +++ b/Makefile.include @@ -235,7 +235,7 @@ GLOBAL_GOALS += buildtest \ info-boards-features-missing \ info-boards-supported \ info-buildsizes info-buildsizes-diff \ - create-Makefile.ci \ + generate-Makefile.ci \ # ifneq (, $(filter $(GLOBAL_GOALS), $(MAKECMDGOALS))) diff --git a/makefiles/info-global.inc.mk b/makefiles/info-global.inc.mk index 9e1faa551c..13c7bf613c 100644 --- a/makefiles/info-global.inc.mk +++ b/makefiles/info-global.inc.mk @@ -149,9 +149,10 @@ info-boards-features-blacklisted: info-boards-features-conflicting: @for f in $(BOARDS_FEATURES_CONFLICTING); do echo $${f}; done | column -t -create-Makefile.ci: +generate-Makefile.ci: @$(RIOTTOOLS)/insufficient_memory/create_makefile.ci.sh --no-docker + # Reset BOARDSDIR so unchanged for makefiles included after, for now only # needed for buildtests.inc.mk BOARDDIR := $(BOARDDIR_GLOBAL) diff --git a/makefiles/info.inc.mk b/makefiles/info.inc.mk index cc2e123423..f6a4619a30 100644 --- a/makefiles/info.inc.mk +++ b/makefiles/info.inc.mk @@ -6,7 +6,7 @@ check-toolchain-supported \ info-programmers-supported \ info-rust \ - create-Makefile.ci \ + generate-Makefile.ci \ # info-objsize: From df18af51958fa02f6517262f398fd9df9c3d140f Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Sat, 4 Feb 2023 16:53:49 +0100 Subject: [PATCH 2/2] Make: default to docker with generate-Makefile.ci --- makefiles/info-global.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/info-global.inc.mk b/makefiles/info-global.inc.mk index 13c7bf613c..e307985386 100644 --- a/makefiles/info-global.inc.mk +++ b/makefiles/info-global.inc.mk @@ -150,7 +150,7 @@ info-boards-features-conflicting: @for f in $(BOARDS_FEATURES_CONFLICTING); do echo $${f}; done | column -t generate-Makefile.ci: - @$(RIOTTOOLS)/insufficient_memory/create_makefile.ci.sh --no-docker + @$(RIOTTOOLS)/insufficient_memory/create_makefile.ci.sh # Reset BOARDSDIR so unchanged for makefiles included after, for now only