Skip to content

Commit 853dd7e

Browse files
committed
x230 legacy boards: move to unmaintained
Also add Makefile helper to move from tested to unmaintained Done by: docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) tlaurion/heads-dev-env:latest -- make BOARD=x230-hotp-legacy board.move_tested_to_unmaintained docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) tlaurion/heads-dev-env:latest -- make BOARD=x230-legacy board.move_tested_to_unmaintained docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) tlaurion/heads-dev-env:latest -- make BOARD=x230-legacy-flash board.move_tested_to_unmaintained git difftool -d git add .circleci/config.yml boards/x230-hotp-legacy/x230-hotp-legacy.config boards/x230-legacy-flash/x230-legacy-flash.config boards/x230-legacy/x230-legacy.config unmaintained_boards/UNMAINTAINED_x230-hotp-legacy/ unmaintained_boards/UNMAINTAINED_x230-legacy-flash/ unmaintained_boards/UNMAINTAINED_x230-legacy/ git commit --signoff -m Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 33edf8e commit 853dd7e

5 files changed

Lines changed: 25 additions & 24 deletions

File tree

.circleci/config.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -306,27 +306,6 @@ workflows:
306306
requires:
307307
- x230-hotp-maximized
308308

309-
- build:
310-
name: x230-legacy-flash
311-
target: x230-legacy-flash
312-
subcommand: ""
313-
requires:
314-
- x230-hotp-maximized
315-
316-
- build:
317-
name: x230-legacy
318-
target: x230-legacy
319-
subcommand: ""
320-
requires:
321-
- x230-hotp-maximized
322-
323-
- build:
324-
name: x230-hotp-legacy
325-
target: x230-hotp-legacy
326-
subcommand: ""
327-
requires:
328-
- x230-hotp-maximized
329-
330309
- build:
331310
name: x230-hotp-maximized_usb-kb
332311
target: x230-hotp-maximized_usb-kb

Makefile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,28 @@ board.move_tested_to_untested:
837837
echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
838838
sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml
839839

840+
board.move_tested_to_unmaintained:
841+
@echo "Moving $(BOARD) from tested to unmaintained status"
842+
@NEW_BOARD=UNMAINTAINED_$(BOARD); \
843+
INCLUDE_BOARD=$$(grep "include \$$(pwd)/boards/" boards/$(BOARD)/$(BOARD).config | sed 's/.*boards\/\(.*\)\/.*/\1/'); \
844+
NEW_INCLUDE_BOARD=UNMAINTAINED_$${INCLUDE_BOARD}; \
845+
echo "Updating config file: boards/$(BOARD)/$(BOARD).config"; \
846+
sed -i 's/$(BOARD)/'$${NEW_BOARD}'/g' boards/$(BOARD)/$(BOARD).config; \
847+
if [ -n "$$INCLUDE_BOARD" ]; then \
848+
sed -i 's/'$$INCLUDE_BOARD'/'$$NEW_INCLUDE_BOARD'/g' boards/$(BOARD)/$(BOARD).config; \
849+
fi; \
850+
echo "Creating unmaintained_boards directory if it doesn't exist"; \
851+
mkdir -p unmaintained_boards/$${NEW_BOARD}; \
852+
echo "Moving and renaming config file to unmaintained_boards/$${NEW_BOARD}/$${NEW_BOARD}.config"; \
853+
mv boards/$(BOARD)/$(BOARD).config unmaintained_boards/$${NEW_BOARD}/$${NEW_BOARD}.config; \
854+
echo "Moving board directory contents to unmaintained_boards/$${NEW_BOARD}"; \
855+
mv boards/$(BOARD)/* unmaintained_boards/$${NEW_BOARD}/; \
856+
rmdir boards/$(BOARD); \
857+
echo "Updating .circleci/config.yml"; \
858+
sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml; \
859+
echo "Operation completed for $(BOARD) -> $${NEW_BOARD}"; \
860+
echo "Please manually review and remove any unnecessary entries in .circleci/config.yml"
861+
840862
# Inject a GPG key into the image - this is most useful when testing in qemu,
841863
# since we can't reflash the firmware in qemu to update the keychain. Instead,
842864
# inject the public key ahead of time. Specify the location of the key with

boards/x230-hotp-legacy/x230-hotp-legacy.config renamed to unmaintained_boards/UNMAINTAINED_x230-hotp-legacy/UNMAINTAINED_x230-hotp-legacy.config

File renamed without changes.

boards/x230-legacy-flash/x230-legacy-flash.config renamed to unmaintained_boards/UNMAINTAINED_x230-legacy-flash/UNMAINTAINED_x230-legacy-flash.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT=y
77
export CONFIG_COREBOOT_VERSION=24.02.01
88
export CONFIG_LINUX_VERSION=6.1.8
99

10-
CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy-flash.config
10+
CONFIG_COREBOOT_CONFIG=config/coreboot-UNMAINTAINED_x230-legacy-flash.config
1111
CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
1212

1313
#Add bare minimal tools for flashing boards

boards/x230-legacy/x230-legacy.config renamed to unmaintained_boards/UNMAINTAINED_x230-legacy/UNMAINTAINED_x230-legacy.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export CONFIG_COREBOOT=y
77
export CONFIG_COREBOOT_VERSION=24.02.01
88
export CONFIG_LINUX_VERSION=6.1.8
99

10-
CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy.config
11-
CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config
10+
CONFIG_COREBOOT_CONFIG=config/coreboot-UNMAINTAINED_x230-legacy.config
11+
CONFIG_LINUX_CONFIG=config/linux-UNMAINTAINED_x230-legacy.config
1212

1313
#Additional hardware support
1414
CONFIG_LINUX_USB=y

0 commit comments

Comments
 (0)