From e81f59eac248c7c8aa41293f54eafe2432846eca Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sat, 30 Dec 2023 13:29:16 -0500 Subject: [PATCH 1/2] Makefile: Add basic helpers permitting to move boards from/to UNTESTED_ Adds two golbal helpers in Makefile: - board.move_untested_to_tested - board.move_tested_to_untested Which can be called by: - make BOARD=UNTESTED_t420-maximized board.move_untested_to_tested - make BOARD=x230-legacy board.move_tested_to_untested Signed-off-by: Thierry Laurion --- Makefile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Makefile b/Makefile index a83bd5e4..a0264e2b 100644 --- a/Makefile +++ b/Makefile @@ -728,6 +728,28 @@ modules.clean: rm -f "build/${CONFIG_TARGET_ARCH}/$$dir/.configured" ; \ done +board.move_untested_to_tested: + @echo "NEW_BOARD variable will remove UNTESTED_ prefix from $(BOARD)" + @NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_//'); \ + echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \ + mv boards/$$BOARD/$$BOARD.config boards/$$BOARD/$$NEW_BOARD.config; \ + echo "Renaming boards/$$BOARD to boards/$$NEW_BOARD"; \ + rm -rf boards/$$NEW_BOARD; \ + mv boards/$$BOARD boards/$$NEW_BOARD; \ + echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml"; \ + sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml + +board.move_tested_to_untested: + @echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)" + @NEW_BOARD=UNTESTED_$(BOARD); \ + rm -rf boards/$${NEW_BOARD}; \ + echo "Renaming boards/$(BOARD)/$(BOARD).config to boards/$(BOARD)/$${NEW_BOARD}.config"; \ + mv boards/$(BOARD)/$(BOARD).config boards/$(BOARD)/$${NEW_BOARD}.config; \ + echo "Renaming boards/$(BOARD) to boards/$${NEW_BOARD}"; \ + mv boards/$(BOARD) boards/$${NEW_BOARD}; \ + echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \ + sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml + # Inject a GPG key into the image - this is most useful when testing in qemu, # since we can't reflash the firmware in qemu to update the keychain. Instead, # inject the public key ahead of time. Specify the location of the key with From 718a8314817cd45f6446979f66c36d9f79fbe035 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sat, 30 Dec 2023 13:33:50 -0500 Subject: [PATCH 2/2] Board configs: move t420-hotp-maximized t420-maximized w530-maximized w530-hotp-maximized away from UNTESTED_ boards Signed-off-by: Thierry Laurion --- .circleci/config.yml | 16 ++++++++-------- .../t420-hotp-maximized.config} | 0 .../t420-maximized.config} | 0 .../w530-hotp-maximized.config} | 0 .../w530-maximized.config} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename boards/{UNTESTED_t420-hotp-maximized/UNTESTED_t420-hotp-maximized.config => t420-hotp-maximized/t420-hotp-maximized.config} (100%) rename boards/{UNTESTED_t420-maximized/UNTESTED_t420-maximized.config => t420-maximized/t420-maximized.config} (100%) rename boards/{UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config => w530-hotp-maximized/w530-hotp-maximized.config} (100%) rename boards/{UNTESTED_w530-maximized/UNTESTED_w530-maximized.config => w530-maximized/w530-maximized.config} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9de6de68..2b75dfe1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -279,8 +279,8 @@ workflows: - x230-hotp-maximized - build: - name: UNTESTED_t420-hotp-maximized - target: UNTESTED_t420-hotp-maximized + name: t420-hotp-maximized + target: t420-hotp-maximized subcommand: "" requires: - x230-hotp-maximized @@ -293,8 +293,8 @@ workflows: - x230-hotp-maximized - build: - name: UNTESTED_t420-maximized - target: UNTESTED_t420-maximized + name: t420-maximized + target: t420-maximized subcommand: "" requires: - x230-hotp-maximized @@ -398,8 +398,8 @@ workflows: - x230-hotp-maximized - build: - name: UNTESTED_w530-hotp-maximized - target: UNTESTED_w530-hotp-maximized + name: w530-hotp-maximized + target: w530-hotp-maximized subcommand: "" requires: - x230-hotp-maximized @@ -440,8 +440,8 @@ workflows: - x230-hotp-maximized - build: - name: UNTESTED_w530-maximized - target: UNTESTED_w530-maximized + name: w530-maximized + target: w530-maximized subcommand: "" requires: - x230-hotp-maximized diff --git a/boards/UNTESTED_t420-hotp-maximized/UNTESTED_t420-hotp-maximized.config b/boards/t420-hotp-maximized/t420-hotp-maximized.config similarity index 100% rename from boards/UNTESTED_t420-hotp-maximized/UNTESTED_t420-hotp-maximized.config rename to boards/t420-hotp-maximized/t420-hotp-maximized.config diff --git a/boards/UNTESTED_t420-maximized/UNTESTED_t420-maximized.config b/boards/t420-maximized/t420-maximized.config similarity index 100% rename from boards/UNTESTED_t420-maximized/UNTESTED_t420-maximized.config rename to boards/t420-maximized/t420-maximized.config diff --git a/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config b/boards/w530-hotp-maximized/w530-hotp-maximized.config similarity index 100% rename from boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config rename to boards/w530-hotp-maximized/w530-hotp-maximized.config diff --git a/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config b/boards/w530-maximized/w530-maximized.config similarity index 100% rename from boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config rename to boards/w530-maximized/w530-maximized.config