ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'osresearch/master' into key-init_fix-time_give-warning-on-gpg-errors

Browse Source
This commit is contained in:
Thierry Laurion 2024-09-06 09:27:23 -04:00
commit cbd1f285c6
No known key found for this signature in database
GPG Key ID: 9A53E1BB3FF00461
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/config.yml
View File

@ -491,6 +491,13 @@ workflows:
requires: requires:
- librem_14 - librem_14
- build:
name: librem_11
target: librem_11
subcommand: ""
requires:
- librem_14
# dasharo release # dasharo release
- build: - build:
name: nitropad-ns50 name: nitropad-ns50

3
config/coreboot-librem_11.config
View File

@ -140,7 +140,7 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x30400
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
# CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_jsl/librem_11/flashdescriptor.bin" CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_jsl/librem_11/flashdescriptor.bin"
CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_jsl/librem_11/me.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_jsl/librem_11/me.bin"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@ -563,6 +563,7 @@ CONFIG_USE_PC_CMOS_ALTCENTURY=y
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70 CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
# CONFIG_DRIVERS_MTK_WIFI is not set # CONFIG_DRIVERS_MTK_WIFI is not set
CONFIG_MP_SERVICES_PPI=y CONFIG_MP_SERVICES_PPI=y
CONFIG_MP_SERVICES_PPI_V1=y CONFIG_MP_SERVICES_PPI_V1=y

2
initrd/bin/gui-init
View File

@ -363,7 +363,7 @@ check_gpg_key()
option=$(cat /tmp/whiptail) option=$(cat /tmp/whiptail)
case "$option" in case "$option" in
g ) g )
gpg-gui.sh && BG_COLOR_MAIN_MENU="normnal" gpg-gui.sh && BG_COLOR_MAIN_MENU="normal"
;; ;;
i ) i )
skip_to_menu="true" skip_to_menu="true"

6
initrd/bin/oem-factory-reset
View File

@ -62,7 +62,7 @@ die() {
exit 1 exit 1
} }
whiptail_error() { local_whiptail_error() {
local msg=$1 local msg=$1
if [ "$msg" = "" ]; then if [ "$msg" = "" ]; then
die "whiptail error: An error msg is required" die "whiptail error: An error msg is required"
@ -71,7 +71,7 @@ whiptail_error() {
} }
whiptail_error_die() { whiptail_error_die() {
whiptail_error "$@" local_whiptail_error "$@"
die die
} }
@ -1111,7 +1111,7 @@ if [ "$GPG_GEN_KEY_IN_MEMORY" = "n" -o "$GPG_GEN_KEY_IN_MEMORY_COPY_TO_SMARTCARD
echo -e "\nChecking for USB Security Dongle...\n" echo -e "\nChecking for USB Security Dongle...\n"
enable_usb enable_usb
if ! gpg --card-status >/dev/null 2>&1; then if ! gpg --card-status >/dev/null 2>&1; then
whiptail_error "Can't access USB Security Dongle; \nPlease remove and reinsert, then press Enter." local_whiptail_error "Can't access USB Security Dongle; \nPlease remove and reinsert, then press Enter."
if ! gpg --card-status >/dev/null 2>/tmp/error; then if ! gpg --card-status >/dev/null 2>/tmp/error; then
ERROR=$(tail -n 1 /tmp/error | fold -s) ERROR=$(tail -n 1 /tmp/error | fold -s)
whiptail_error_die "Unable to detect USB Security Dongle:\n\n${ERROR}" whiptail_error_die "Unable to detect USB Security Dongle:\n\n${ERROR}"

4
initrd/etc/gui_functions
View File

@ -6,8 +6,8 @@
# continue with automatic boot, nonzero if user interrupted. # continue with automatic boot, nonzero if user interrupted.
pause_automatic_boot() pause_automatic_boot()
{ {
if IFS= read -t "$CONFIG_AUTO_BOOT_TIMEOUT" -s -n 1 -p \ if IFS= read -t "$CONFIG_AUTO_BOOT_TIMEOUT" -s -n 1 -r -p \
"Automatic boot in $CONFIG_AUTO_BOOT_TIMEOUT seconds unless interrupted by keypress... "; then $'Automatic boot in '"$CONFIG_AUTO_BOOT_TIMEOUT"$' seconds unless interrupted by keypress...\n'; then
return 1 # Interrupt automatic boot return 1 # Interrupt automatic boot
fi fi
return 0 # Continue with automatic boot return 0 # Continue with automatic boot