CircleCI: readd librem_mini (#832)

* CircleCI: readd librem_mini while making sure that if a board build fails, all logfile modified in the last minute are outputted on the CircleCI console prior to really failing and exiting

* librem_mini-NoTPM: addition of board config, distinctive coreboot config (required per Heads build system) to construct a ROM without TPM requirement.

* librem_mini: deletion of board and coreboot relative config, keeping librem_mini-NoTPM and coreboot config only. Removed librem_mini board build under CircleCI, keeping only librem_mini-NoTPM
This commit is contained in:
tlaurion 2020-09-15 10:51:37 -04:00 committed by GitHub
parent 51fd3b3546
commit 53c74fa02a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 11 deletions

View File

@ -65,7 +65,7 @@ jobs:
command: |
rm -rf build/x230-flash/* build/log/* && make --load 2 \
V=1 \
BOARD=x230-flash || (find ./build/log/ -cmin 1|xargs tail; exit 1) \
BOARD=x230-flash || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput x230-flash hashes
@ -83,7 +83,7 @@ jobs:
command: |
rm -rf build/t430-flash/* build/log/* && make --load 2 \
V=1 \
BOARD=t430-flash || (find ./build/log/ -cmin 1|xargs tail; exit 1) \
BOARD=t430-flash || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput t430-flash hashes
@ -101,7 +101,7 @@ jobs:
command: |
rm -rf build/t430/* build/log/* && make --load 2 \
V=1 \
BOARD=t430 || (find ./build/log/ -cmin 1|xargs tail; exit 1) \
BOARD=t430 || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput t430 hashes
@ -119,7 +119,7 @@ jobs:
command: |
rm -rf build/x230/* build/log/* && make --load 2 \
V=1 \
BOARD=x230 || (find ./build/log/ -cmin 1|xargs tail; exit 1) \
BOARD=x230 || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput x230 hashes
@ -137,7 +137,7 @@ jobs:
command: |
rm -rf build/x230-hotp-verification/* build/log/* && make --load 2 \
V=1 \
BOARD=x230-hotp-verification || (find ./build/log/ -cmin 1|xargs tail; exit 1) \
BOARD=x230-hotp-verification || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput x230-hotp-verification hashes
@ -150,12 +150,30 @@ jobs:
- store-artifacts:
path: build/x230-hotp-verification
- run:
name: librem_mini-NoTPM
command: |
rm -rf build/librem_mini-NoTPM/* build/log/* && make --load 2 \
V=1 \
BOARD=librem_mini-NoTPM || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput librem_mini-NoTPM hashes
command: |
cat build/librem_mini-NoTPM/hashes.txt \
- run:
name: Archiving build logs for librem_mini-NoTPM
command: |
tar zcvf build/librem_mini-NoTPM/logs.tar.gz build/log/*
- store-artifacts:
path: build/librem_mini-NoTPM
- run:
name: qemu-coreboot
command: |
rm -rf build/qemu-coreboot/* build/log/* && make --load 2 \
V=1 \
BOARD=qemu-coreboot || (find ./build/log/ -cmin 1|xargs tail; exit 1) \
BOARD=qemu-coreboot || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Output qemu-coreboot hashes

View File

@ -1,6 +1,6 @@
# Configuration for a librem mini
CONFIG_LINUX_CONFIG=config/linux-librem_common.config
CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config
CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini-NoTPM.config
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.12
@ -26,7 +26,7 @@ CONFIG_HOTPKEY=y
CONFIG_LINUX_USB=y
export CONFIG_TPM=y
export CONFIG_TPM=n
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
export CONFIG_BOOTSCRIPT=/bin/gui-init
@ -35,7 +35,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
export CONFIG_BOOT_KERNEL_REMOVE=""
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem Mini Heads Boot Menu"
export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem Mini NoTPM Heads Boot Menu"
export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
export CONFIG_FLASHROM_OPTIONS="-p internal"

View File

@ -9,6 +9,6 @@ CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_whl/cpu_microcode_blob.bin"
CONFIG_HAVE_ME_BIN=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/librem_mini/bzImage"
CONFIG_LINUX_INITRD="../../build/librem_mini/initrd.cpio.xz"
CONFIG_PAYLOAD_FILE="../../build/librem_mini-NoTPM/bzImage"
CONFIG_LINUX_INITRD="../../build/librem_mini-NoTPM/initrd.cpio.xz"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"