From 53f69d671c024698d5911a984ef8888ad4523fc1 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 30 Sep 2021 12:51:32 +0200 Subject: sd-boot: Require gnu-efi 3.0.5 This version is from 2017 and should be stale enough to not cause an outrage. All the relevant distros have it or a newer version. We also already depend on some symbols defined in 3.0.5 anyway, so let's take the opportunity to reduce our missing_efi.h baggage. --- src/boot/efi/util.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/boot/efi/util.c') diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c index bbde2d8702..9128c507c8 100644 --- a/src/boot/efi/util.c +++ b/src/boot/efi/util.c @@ -570,7 +570,6 @@ EFI_STATUS get_file_info_harder( EFI_FILE_INFO **ret, UINTN *ret_size) { - static const EFI_GUID EfiFileInfoGuid = EFI_FILE_INFO_ID; UINTN size = OFFSETOF(EFI_FILE_INFO, FileName) + 256; _cleanup_freepool_ EFI_FILE_INFO *fi = NULL; EFI_STATUS err; @@ -584,14 +583,14 @@ EFI_STATUS get_file_info_harder( if (!fi) return EFI_OUT_OF_RESOURCES; - err = handle->GetInfo(handle, (EFI_GUID*) &EfiFileInfoGuid, &size, fi); + err = handle->GetInfo(handle, &GenericFileInfo, &size, fi); if (err == EFI_BUFFER_TOO_SMALL) { FreePool(fi); fi = AllocatePool(size); /* GetInfo tells us the required size, let's use that now */ if (!fi) return EFI_OUT_OF_RESOURCES; - err = handle->GetInfo(handle, (EFI_GUID*) &EfiFileInfoGuid, &size, fi); + err = handle->GetInfo(handle, &GenericFileInfo, &size, fi); } if (EFI_ERROR(err)) -- cgit v1.2.1