Skip to content

Commit 54e96ad

Browse files
authored
Merge pull request #1567 from tlaurion/Makefile_helpers_to_ease_moving_untested_boards
Makefile helpers to ease moving untested boards (and move tested t420 and w530 boards)
2 parents 129a772 + 718a831 commit 54e96ad

File tree

6 files changed

+30
-8
lines changed

6 files changed

+30
-8
lines changed

.circleci/config.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ workflows:
279279
- x230-hotp-maximized
280280

281281
- build:
282-
name: UNTESTED_t420-hotp-maximized
283-
target: UNTESTED_t420-hotp-maximized
282+
name: t420-hotp-maximized
283+
target: t420-hotp-maximized
284284
subcommand: ""
285285
requires:
286286
- x230-hotp-maximized
@@ -293,8 +293,8 @@ workflows:
293293
- x230-hotp-maximized
294294

295295
- build:
296-
name: UNTESTED_t420-maximized
297-
target: UNTESTED_t420-maximized
296+
name: t420-maximized
297+
target: t420-maximized
298298
subcommand: ""
299299
requires:
300300
- x230-hotp-maximized
@@ -398,8 +398,8 @@ workflows:
398398
- x230-hotp-maximized
399399

400400
- build:
401-
name: UNTESTED_w530-hotp-maximized
402-
target: UNTESTED_w530-hotp-maximized
401+
name: w530-hotp-maximized
402+
target: w530-hotp-maximized
403403
subcommand: ""
404404
requires:
405405
- x230-hotp-maximized
@@ -440,8 +440,8 @@ workflows:
440440
- x230-hotp-maximized
441441

442442
- build:
443-
name: UNTESTED_w530-maximized
444-
target: UNTESTED_w530-maximized
443+
name: w530-maximized
444+
target: w530-maximized
445445
subcommand: ""
446446
requires:
447447
- x230-hotp-maximized

Makefile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,28 @@ modules.clean:
728728
rm -f "build/${CONFIG_TARGET_ARCH}/$$dir/.configured" ; \
729729
done
730730

731+
board.move_untested_to_tested:
732+
@echo "NEW_BOARD variable will remove UNTESTED_ prefix from $(BOARD)"
733+
@NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_//'); \
734+
echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \
735+
mv boards/$$BOARD/$$BOARD.config boards/$$BOARD/$$NEW_BOARD.config; \
736+
echo "Renaming boards/$$BOARD to boards/$$NEW_BOARD"; \
737+
rm -rf boards/$$NEW_BOARD; \
738+
mv boards/$$BOARD boards/$$NEW_BOARD; \
739+
echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml"; \
740+
sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml
741+
742+
board.move_tested_to_untested:
743+
@echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)"
744+
@NEW_BOARD=UNTESTED_$(BOARD); \
745+
rm -rf boards/$${NEW_BOARD}; \
746+
echo "Renaming boards/$(BOARD)/$(BOARD).config to boards/$(BOARD)/$${NEW_BOARD}.config"; \
747+
mv boards/$(BOARD)/$(BOARD).config boards/$(BOARD)/$${NEW_BOARD}.config; \
748+
echo "Renaming boards/$(BOARD) to boards/$${NEW_BOARD}"; \
749+
mv boards/$(BOARD) boards/$${NEW_BOARD}; \
750+
echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
751+
sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml
752+
731753
# Inject a GPG key into the image - this is most useful when testing in qemu,
732754
# since we can't reflash the firmware in qemu to update the keychain. Instead,
733755
# inject the public key ahead of time. Specify the location of the key with

0 commit comments

Comments
 (0)