Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cryptsetup toolstack version bump + reencryption cleanup (LUKSv2+Luksv1 proper support + reencryption on Q4.2 + BTRFS dul LUKS containers install) #1541

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
21 changes: 0 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,27 +306,6 @@ workflows:
requires:
- x230-hotp-maximized

- build:
name: x230-legacy-flash
target: x230-legacy-flash
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: x230-legacy
target: x230-legacy
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: x230-hotp-legacy
target: x230-hotp-legacy
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: x230-hotp-maximized_usb-kb
target: x230-hotp-maximized_usb-kb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.11
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# - Please support https://github.com/osresearch/heads/issues/719
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.11
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.11
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.11
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
Expand Down
2 changes: 1 addition & 1 deletion boards/librem_l1um/librem_l1um.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_l1um.config

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.11
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214
export CONFIG_PURISM_BLOBS=y

CONFIG_CRYPTSETUP2=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the VM.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# TPM can be used with a qemu software TPM (TIS, 1.2).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm2.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# TPM can be used with a qemu software TPM (TIS, 2.0).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm2.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# TPM can be used with a qemu software TPM (TIS, 2.0).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm2.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the VM.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# TPM can be used with a qemu software TPM (TIS, 1.2).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# TPM can be used with a qemu software TPM (TIS, 2.0).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm2.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# TPM can be used with a qemu software TPM (TIS, 2.0).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm2.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config
Expand Down
2 changes: 1 addition & 1 deletion boards/t420-hotp-maximized/t420-hotp-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/t420-maximized/t420-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# - dropbear
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/t430-hotp-maximized/t430-hotp-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# - Includes Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/t430-maximized/t430-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# - DOES NOT INCLUDE Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/t440p-maximized/t440p-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CONFIG_LINUX_CONFIG=config/linux-t440p.config

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-hotp-maximized/t530-hotp-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# This board is designed for a t530 without a dGPU. It will work just fine for a board with a dGPU, except you will not be able to use an external monitor via the mini-displayport or the dock's displayport, though external monitors will work via VGA ports. To initialize the dGPU please use one of the dgpu boards.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-t530-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-maximized/t530-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# This board is designed for a t530 without a dGPU. It will work just fine for a board with a dGPU, except you will not be able to use an external monitor via the mini-displayport or the dock's displayport, though external monitors will work via VGA ports. To initialize the dGPU please use one of the dgpu boards.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-t530-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-hotp-maximized/w530-hotp-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# This board ignores the in-built dGPU that comes with all w530's. In doing so the dGPU will not be initialized. This has some benefits in terms of reduced complexity in working with OS's with poor support for NVIDIA, better battery life and lower heat (making use of the thicker heatsink from a dGPU). Conversely, if you do not initialize the dGPU you will be unable to use an external monitor. To initialize the dGPU please use the dGPU boards that corresponds with the model of dGPU included with your device.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-w530-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-maximized/w530-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# This board ignores the in-built dGPU that comes with all w530's. In doing so the dGPU will not be initialized. This has some benefits in terms of reduced complexity in working with OS's with poor support for NVIDIA, better battery life and lower heat (making use of the thicker heatsink from a dGPU). Conversely, if you do not initialize the dGPU you will be unable to use an external monitor. To initialize the dGPU please use the dGPU boards that corresponds with the model of dGPU included with your device.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-w530-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/w541-maximized/w541-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CONFIG_LINUX_CONFIG=config/linux-w541.config

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
Expand Down
2 changes: 1 addition & 1 deletion boards/x220-hotp-maximized/x220-hotp-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-x220-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/x220-maximized/x220-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-x220-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# - Includes: Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized-fhd_edp.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/x230-hotp-maximized/x230-hotp-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# - Includes: Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# USB Keyboard support
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# - DOES NOT INCLUDE Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized-fhd_edp.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
2 changes: 1 addition & 1 deletion boards/x230-maximized/x230-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# - DOES NOT INCLUDE Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
4 changes: 2 additions & 2 deletions boards/z220-cmt-maximized/z220-cmt-maximized.config
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-z220-cmt.config

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=24.02.01
export CONFIG_LINUX_VERSION=5.10.5
export CONFIG_LINUX_VERSION=5.10.214

CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
Expand Down Expand Up @@ -73,4 +73,4 @@ $(pwd)/blobs/z220/me.bin:

$(pwd)/blobs/z220/ifd.bin:
COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
$(pwd)/blobs/z220/download_BIOS_clean.sh
$(pwd)/blobs/z220/download_BIOS_clean.sh
Loading