ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Haswell boards : renamed to UNTESTED_* while still built by CircleCI per new policy (not blocking tested boards from being merged and downloaded without risks of possible bricks, leading UNTESTED_ boards untested until reported tested in seperate issue and ideally a PR from board testers).

Browse Source 
Fix Haswell board HOTP variants wrongly sourcing old non-hotp variants paths through Makefile inclusion. Fixing Makefile helper

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
This commit is contained in:
Thierry Laurion 2024-09-09 11:52:08 -04:00
parent ebdfad3655
commit 3f4104d068
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@ -432,29 +432,29 @@ workflows:
- build: - build:
name: t440p-maximized name: UNTESTED_t440p-maximized
target: t440p-maximized target: UNTESTED_t440p-maximized
subcommand: "" subcommand: ""
requires: requires:
- x230-hotp-maximized - x230-hotp-maximized
- build: - build:
name: t440p-hotp-maximized name: UNTESTED_t440p-hotp-maximized
target: t440p-hotp-maximized target: UNTESTED_t440p-hotp-maximized
subcommand: "" subcommand: ""
requires: requires:
- x230-hotp-maximized - x230-hotp-maximized
- build: - build:
name: w541-maximized name: UNTESTED_w541-maximized
target: w541-maximized target: UNTESTED_w541-maximized
subcommand: "" subcommand: ""
requires: requires:
- x230-hotp-maximized - x230-hotp-maximized
- build: - build:
name: w541-hotp-maximized name: UNTESTED_w541-hotp-maximized
target: w541-hotp-maximized target: UNTESTED_w541-hotp-maximized
subcommand: "" subcommand: ""
requires: requires:
- x230-hotp-maximized - x230-hotp-maximized

6
Makefile
View File

@ -794,6 +794,8 @@ modules.clean:
board.move_untested_to_tested: board.move_untested_to_tested:
@echo "NEW_BOARD variable will remove UNTESTED_ prefix from $(BOARD)" @echo "NEW_BOARD variable will remove UNTESTED_ prefix from $(BOARD)"
@NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_//'); \ @NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_//'); \
echo "changing $(BOARD) name under boards/$(BOARD)/$(BOARD).config to $${NEW_BOARD}"; \
sed boards/$(BOARD)/$(BOARD).config 's/$(BOARD)/$${NEW_BOARD}/g'; \
echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \ echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \
mv boards/$$BOARD/$$BOARD.config boards/$$BOARD/$$NEW_BOARD.config; \ mv boards/$$BOARD/$$BOARD.config boards/$$BOARD/$$NEW_BOARD.config; \
echo "Renaming boards/$$BOARD to boards/$$NEW_BOARD"; \ echo "Renaming boards/$$BOARD to boards/$$NEW_BOARD"; \
@ -831,11 +833,13 @@ board.move_tested_to_untested:
@echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)" @echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)"
@NEW_BOARD=UNTESTED_$(BOARD); \ @NEW_BOARD=UNTESTED_$(BOARD); \
rm -rf boards/$${NEW_BOARD}; \ rm -rf boards/$${NEW_BOARD}; \
echo "changing $(BOARD) name under boards/$(BOARD)/$(BOARD).config to $${NEW_BOARD}"; \
sed boards/$(BOARD)/$(BOARD).config 's/$(BOARD)/$${NEW_BOARD}/g'; \
echo "Renaming boards/$(BOARD)/$(BOARD).config to boards/$(BOARD)/$${NEW_BOARD}.config"; \ echo "Renaming boards/$(BOARD)/$(BOARD).config to boards/$(BOARD)/$${NEW_BOARD}.config"; \
mv boards/$(BOARD)/$(BOARD).config boards/$(BOARD)/$${NEW_BOARD}.config; \ mv boards/$(BOARD)/$(BOARD).config boards/$(BOARD)/$${NEW_BOARD}.config; \
echo "Renaming boards/$(BOARD) to boards/$${NEW_BOARD}"; \ echo "Renaming boards/$(BOARD) to boards/$${NEW_BOARD}"; \
mv boards/$(BOARD) boards/$${NEW_BOARD}; \ mv boards/$(BOARD) boards/$${NEW_BOARD}; \
echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \ echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .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, # Inject a GPG key into the image - this is most useful when testing in qemu,

2
boards/t440p-hotp-maximized/t440p-hotp-maximized.config → boards/UNTESTED_t440p-hotp-maximized/UNTESTED_t440p-hotp-maximized.config
View File

@ -1,5 +1,5 @@
# Inherit the rest from the base T440p config. # Inherit the rest from the base T440p config.
include $(pwd)/boards/t440p-maximized/t440p-maximized.config include $(pwd)/boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config
CONFIG_HOTPKEY=y CONFIG_HOTPKEY=y
export CONFIG_AUTO_BOOT_TIMEOUT=5 export CONFIG_AUTO_BOOT_TIMEOUT=5

0
boards/t440p-maximized/t440p-maximized.config → boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config
View File

2
boards/w541-hotp-maximized/w541-hotp-maximized.config → boards/UNTESTED_w541-hotp-maximized/UNTESTED_w541-hotp-maximized.config
View File

@ -1,5 +1,5 @@
# Inherit the rest from the base W541 config. # Inherit the rest from the base W541 config.
include $(pwd)/boards/w541-maximized/w541-maximized.config include $(pwd)/boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config
CONFIG_HOTPKEY=y CONFIG_HOTPKEY=y
export CONFIG_AUTO_BOOT_TIMEOUT=5 export CONFIG_AUTO_BOOT_TIMEOUT=5

0
boards/w541-maximized/w541-maximized.config → boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config
View File