From a9a9129e1046d883f61369fcc64d168843c81515 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 14 Sep 2020 09:41:20 -0400 Subject: [PATCH 1/4] CircleCI: readd librem_mini while making sure that if a board build fails, all logfile modified in the last minute are outputted on the screen prior to really failing and exiting --- .circleci/config.yml | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b73fea41b..c0945da5f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 + command: | + rm -rf build/librem_mini/* build/log/* && make --load 2 \ + V=1 \ + BOARD=librem_mini || (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 hashes + command: | + cat build/librem_mini/hashes.txt \ + - run: + name: Archiving build logs for librem_mini + command: | + tar zcvf build/librem_mini/logs.tar.gz build/log/* + - store-artifacts: + path: build/librem_mini + - 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 From 330129ca7159ca847373a53c40008016b8de749f Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 14 Sep 2020 14:02:51 -0400 Subject: [PATCH 2/4] librem_mini : remove TPM support --- boards/librem_mini/librem_mini.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config index a68773c0c..5a0b255b6 100644 --- a/boards/librem_mini/librem_mini.config +++ b/boards/librem_mini/librem_mini.config @@ -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 From 3db72147474f9728fd3ada329ac4e3823fd0fcac Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 14 Sep 2020 14:10:49 -0400 Subject: [PATCH 3/4] librem_mini-NoTPM: addition of board config, distinctive coreboot config (required per Heads build system) to construct a ROM without TPM requirement. --- .circleci/config.yml | 18 ++++++++ .../librem_mini-NoTPM.config | 42 +++++++++++++++++++ boards/librem_mini-NoTPM/librem_mini.config | 42 +++++++++++++++++++ boards/librem_mini/librem_mini.config | 2 +- config/coreboot-librem_mini-NoTPM.config | 14 +++++++ 5 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 boards/librem_mini-NoTPM/librem_mini-NoTPM.config create mode 100644 boards/librem_mini-NoTPM/librem_mini.config create mode 100644 config/coreboot-librem_mini-NoTPM.config diff --git a/.circleci/config.yml b/.circleci/config.yml index c0945da5f..08f5d1907 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -168,6 +168,24 @@ jobs: - store-artifacts: path: build/librem_mini + - 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: | diff --git a/boards/librem_mini-NoTPM/librem_mini-NoTPM.config b/boards/librem_mini-NoTPM/librem_mini-NoTPM.config new file mode 100644 index 000000000..0005270fc --- /dev/null +++ b/boards/librem_mini-NoTPM/librem_mini-NoTPM.config @@ -0,0 +1,42 @@ +# Configuration for a librem mini +CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini-NoTPM.config + +export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.12 +export CONFIG_LINUX_VERSION=4.19.139 +export CONFIG_PURISM_BLOBS=y + +CONFIG_CRYPTSETUP=y +CONFIG_FLASHROM=y +CONFIG_FLASHTOOLS=y +CONFIG_GPG2=y +CONFIG_KEXEC=y +CONFIG_UTIL_LINUX=y +CONFIG_LVM2=y +CONFIG_MBEDTLS=y +CONFIG_PCIUTILS=y +CONFIG_POPT=y +CONFIG_QRENCODE=y +CONFIG_TPMTOTP=y + +CONFIG_CAIRO=y +CONFIG_FBWHIPTAIL=y +CONFIG_HOTPKEY=y + +CONFIG_LINUX_USB=y + +export CONFIG_TPM=n +export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y + +export CONFIG_BOOTSCRIPT=/bin/gui-init +export CONFIG_BOOT_REQ_HASH=n +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 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" +export CONFIG_USB_KEYBOARD=y diff --git a/boards/librem_mini-NoTPM/librem_mini.config b/boards/librem_mini-NoTPM/librem_mini.config new file mode 100644 index 000000000..0005270fc --- /dev/null +++ b/boards/librem_mini-NoTPM/librem_mini.config @@ -0,0 +1,42 @@ +# Configuration for a librem mini +CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini-NoTPM.config + +export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.12 +export CONFIG_LINUX_VERSION=4.19.139 +export CONFIG_PURISM_BLOBS=y + +CONFIG_CRYPTSETUP=y +CONFIG_FLASHROM=y +CONFIG_FLASHTOOLS=y +CONFIG_GPG2=y +CONFIG_KEXEC=y +CONFIG_UTIL_LINUX=y +CONFIG_LVM2=y +CONFIG_MBEDTLS=y +CONFIG_PCIUTILS=y +CONFIG_POPT=y +CONFIG_QRENCODE=y +CONFIG_TPMTOTP=y + +CONFIG_CAIRO=y +CONFIG_FBWHIPTAIL=y +CONFIG_HOTPKEY=y + +CONFIG_LINUX_USB=y + +export CONFIG_TPM=n +export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y + +export CONFIG_BOOTSCRIPT=/bin/gui-init +export CONFIG_BOOT_REQ_HASH=n +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 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" +export CONFIG_USB_KEYBOARD=y diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config index 5a0b255b6..a68773c0c 100644 --- a/boards/librem_mini/librem_mini.config +++ b/boards/librem_mini/librem_mini.config @@ -26,7 +26,7 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y -export CONFIG_TPM=n +export CONFIG_TPM=y export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y export CONFIG_BOOTSCRIPT=/bin/gui-init diff --git a/config/coreboot-librem_mini-NoTPM.config b/config/coreboot-librem_mini-NoTPM.config new file mode 100644 index 000000000..047386503 --- /dev/null +++ b/config/coreboot-librem_mini-NoTPM.config @@ -0,0 +1,14 @@ +CONFIG_LOCALVERSION="PureBoot-beta" +CONFIG_VENDOR_PURISM=y +CONFIG_INTEL_GMA_VBT_FILE="3rdparty/purism-blobs/mainboard/purism/librem_whl/vbt.bin" +CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_whl/flashdescriptor.bin" +CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_whl/me.bin" +CONFIG_HAVE_IFD_BIN=y +CONFIG_BOARD_PURISM_LIBREM_MINI=y +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-NoTPM/bzImage" +CONFIG_LINUX_INITRD="../../build/librem_mini-NoTPM/initrd.cpio.xz" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" From a4cefc38c7556b67f2546a800d3dbc508e628dc3 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 15 Sep 2020 10:00:43 -0400 Subject: [PATCH 4/4] 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 --- .circleci/config.yml | 18 --------- boards/librem_mini-NoTPM/librem_mini.config | 42 --------------------- boards/librem_mini/librem_mini.config | 42 --------------------- config/coreboot-librem_mini.config | 14 ------- 4 files changed, 116 deletions(-) delete mode 100644 boards/librem_mini-NoTPM/librem_mini.config delete mode 100644 boards/librem_mini/librem_mini.config delete mode 100644 config/coreboot-librem_mini.config diff --git a/.circleci/config.yml b/.circleci/config.yml index 08f5d1907..6ba440d46 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -150,24 +150,6 @@ jobs: - store-artifacts: path: build/x230-hotp-verification - - run: - name: librem_mini - command: | - rm -rf build/librem_mini/* build/log/* && make --load 2 \ - V=1 \ - BOARD=librem_mini || (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 hashes - command: | - cat build/librem_mini/hashes.txt \ - - run: - name: Archiving build logs for librem_mini - command: | - tar zcvf build/librem_mini/logs.tar.gz build/log/* - - store-artifacts: - path: build/librem_mini - - run: name: librem_mini-NoTPM command: | diff --git a/boards/librem_mini-NoTPM/librem_mini.config b/boards/librem_mini-NoTPM/librem_mini.config deleted file mode 100644 index 0005270fc..000000000 --- a/boards/librem_mini-NoTPM/librem_mini.config +++ /dev/null @@ -1,42 +0,0 @@ -# Configuration for a librem mini -CONFIG_LINUX_CONFIG=config/linux-librem_common.config -CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini-NoTPM.config - -export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.12 -export CONFIG_LINUX_VERSION=4.19.139 -export CONFIG_PURISM_BLOBS=y - -CONFIG_CRYPTSETUP=y -CONFIG_FLASHROM=y -CONFIG_FLASHTOOLS=y -CONFIG_GPG2=y -CONFIG_KEXEC=y -CONFIG_UTIL_LINUX=y -CONFIG_LVM2=y -CONFIG_MBEDTLS=y -CONFIG_PCIUTILS=y -CONFIG_POPT=y -CONFIG_QRENCODE=y -CONFIG_TPMTOTP=y - -CONFIG_CAIRO=y -CONFIG_FBWHIPTAIL=y -CONFIG_HOTPKEY=y - -CONFIG_LINUX_USB=y - -export CONFIG_TPM=n -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y - -export CONFIG_BOOTSCRIPT=/bin/gui-init -export CONFIG_BOOT_REQ_HASH=n -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 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" -export CONFIG_USB_KEYBOARD=y diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config deleted file mode 100644 index a68773c0c..000000000 --- a/boards/librem_mini/librem_mini.config +++ /dev/null @@ -1,42 +0,0 @@ -# Configuration for a librem mini -CONFIG_LINUX_CONFIG=config/linux-librem_common.config -CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config - -export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.12 -export CONFIG_LINUX_VERSION=4.19.139 -export CONFIG_PURISM_BLOBS=y - -CONFIG_CRYPTSETUP=y -CONFIG_FLASHROM=y -CONFIG_FLASHTOOLS=y -CONFIG_GPG2=y -CONFIG_KEXEC=y -CONFIG_UTIL_LINUX=y -CONFIG_LVM2=y -CONFIG_MBEDTLS=y -CONFIG_PCIUTILS=y -CONFIG_POPT=y -CONFIG_QRENCODE=y -CONFIG_TPMTOTP=y - -CONFIG_CAIRO=y -CONFIG_FBWHIPTAIL=y -CONFIG_HOTPKEY=y - -CONFIG_LINUX_USB=y - -export CONFIG_TPM=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y - -export CONFIG_BOOTSCRIPT=/bin/gui-init -export CONFIG_BOOT_REQ_HASH=n -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_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" -export CONFIG_USB_KEYBOARD=y diff --git a/config/coreboot-librem_mini.config b/config/coreboot-librem_mini.config deleted file mode 100644 index ced1b4d24..000000000 --- a/config/coreboot-librem_mini.config +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG_LOCALVERSION="PureBoot-beta" -CONFIG_VENDOR_PURISM=y -CONFIG_INTEL_GMA_VBT_FILE="3rdparty/purism-blobs/mainboard/purism/librem_whl/vbt.bin" -CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_whl/flashdescriptor.bin" -CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_whl/me.bin" -CONFIG_HAVE_IFD_BIN=y -CONFIG_BOARD_PURISM_LIBREM_MINI=y -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_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"