~ubuntu-core-dev/grub/+git/ubuntu:upstream

Last commit made on 2023-07-19
Get this branch:
git clone -b upstream https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu
Members of Ubuntu Core Development Team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
upstream
Repository:
lp:~ubuntu-core-dev/grub/+git/ubuntu

Recent commits

704129c... by Julian Andres Klode

New upstream version 2.12~rc1

7a994c8... by Daniel Kiper <email address hidden>

Release 2.12~rc1

Signed-off-by: Daniel Kiper <email address hidden>

6425c12... by Daniel Kiper <email address hidden>

efi: Fallback to legacy mode if shim is loaded on x86 archs

The LoadImage() provided by the shim does not consult MOK when loading
an image. So, simply signature verification fails when it should not.
This means we cannot use Linux EFI stub to start the kernel when the
shim is loaded. We have to fallback to legacy mode on x86 architectures.
This is not possible on other architectures due to lack of legacy mode.

This is workaround which should disappear when the shim provides
LoadImage() which looks up MOK during signature verification.

On the occasion align constants in include/grub/efi/sb.h.

Signed-off-by: Daniel Kiper <email address hidden>
Reviewed-by: Ard Biesheuvel <email address hidden>

7082a5c... by Daniel Kiper <email address hidden>

efi: Drop __grub_efi_api attribute from shim_lock->verify() function

... because (surprisingly) it does not use specific EFI calling convention...

Fixes: 6a080b9cd (efi: Add calling convention annotation to all prototypes)

Signed-off-by: Daniel Kiper <email address hidden>
Reviewed-by: Ard Biesheuvel <email address hidden>

d6aac78... by Samuel thibault

templates: Start pci-arbiter before acpi on Hurd

acpi actually needs to access PCI, while pci-arbiter will not be making
use of ACPI, so we need to start acpi first.

Signed-off-by: Samuel Thibault <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

b9b9705... by =?utf-8?q?Micha=C5=82_Grzelak?= <email address hidden>

configure.ac: Fix typo by adding missing $

During configuration of SDL, variable enable_grub_emu_sdl is checked
whether to throw an error message. However, error could not happen
because two unequal strings were compared. Fix this by referencing
value of enable_grub_emu_sdl, not name.

Fixes: 17d6ac1a7 (emu: Add SDL2 support)

Signed-off-by: MichaƂ Grzelak <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

11bc42b... by Glenn Washburn

docs: Minor corrections

When referring to initrd16 the link for initrd16 should be used, not a link
for initrd. Also, correct the spelling of additionally and add a comma after
it to correct its grammatical usage.

Signed-off-by: Glenn Washburn <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

6dd3857... by Glenn Washburn

kern/misc: Add space after comma in function argument list

Signed-off-by: Glenn Washburn <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

1c9c930... by Glenn Washburn

commands/regexp: Fix typo

Signed-off-by: Glenn Washburn <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

712309e... by Glenn Washburn

term/serial: Use grub_strncpy() instead of grub_snprintf() when only copying string

Using grub_strncpy() instead of grub_snprintf() is less overhead and
indicates clearly that the dest should be the same string as the source.

Also fix indentation.

Signed-off-by: Glenn Washburn <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>