Commit 78e5d6b7 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'luks-byz' into 'master'

Byzantium: Adjust to recent osk-sdl

See merge request !179
parents 766f0e0e 10a153e6
Pipeline #65314 passed with stage
in 14 seconds
# SPDX-License-Identifier: GPL-3.0+
BOARD ?= devkit
TYPE ?= current
DIST ?= buster+ci
BOARD ?= librem5r4
TYPE ?= plain
DIST ?= byzantium
SHELL := /bin/bash
......@@ -41,7 +41,7 @@ $(IMAGES): $(STAMPFILE)
$(STAMPFILE): | local.sh-link
$(STAMPFILE): $(DEPS)
./build-image -b $(BOARD) -T $(TYPE) -d $(DIST)
./build-image -b $(BOARD) -T $(TYPE) -d $(DIST) -l "$(LUKS)"
touch $@
%.img.xz: %.img
......
......@@ -106,7 +106,6 @@ case ${pureos_board} in
${board_packages}
librem5-devkit-base
"
image_size=4000
;;
qemu-x86_64)
board_type=x86
......
......@@ -90,7 +90,7 @@ EOF
chroot "${basedir}" apt install -y "${luks_pkgs[@]}"
# Hack up cryttab until askpass supports it
sed -i 's%discard%discard,keyscript=/usr/bin/osk-sdl-keyscript%' "${basedir}/etc/crypttab"
sed -i 's%discard%discard,keyscript=/usr/share/initramfs-tools/scripts/osk-sdl-keyscript%' "${basedir}/etc/crypttab"
chroot "${basedir}" update-initramfs -u
# Work around https://source.puri.sm/Librem5/librem5-devkit-tools/-/issues/32
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment