proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-16 08:02:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update the fwupdate minimum version to 10.

Browse Source 
Similar logic as previous commit with versions in Ubuntu and Fedora.
This commit is contained in:
Mario Limonciello 2018-04-19 13:15:23 -05:00 committed by Mario Limonciello
parent f781015607
commit 16d72a23ba
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -196,14 +196,10 @@ if get_option('plugin_altos')
endif endif
if get_option('plugin_uefi') if get_option('plugin_uefi')
fwup = dependency('fwup', version : '>= 5') fwup = dependency('fwup', version : '>= 10')
if fwup.version().version_compare('>= 11') if fwup.version().version_compare('>= 11')
conf.set('HAVE_FWUP_GET_ESP_MOUNTPOINT', '1') conf.set('HAVE_FWUP_GET_ESP_MOUNTPOINT', '1')
endif endif
if fwup.version().version_compare('>= 10')
conf.set('HAVE_FWUP_GET_BGRT_INFO', '1')
conf.set('HAVE_FWUP_CUSTOM_ESP', '1')
endif
efivar = dependency('efivar') efivar = dependency('efivar')
conf.set_quoted('EFIVAR_LIBRARY_VERSION', efivar.version()) conf.set_quoted('EFIVAR_LIBRARY_VERSION', efivar.version())
conf.set_quoted('LIBFWUP_LIBRARY_VERSION', fwup.version()) conf.set_quoted('LIBFWUP_LIBRARY_VERSION', fwup.version())

6
plugins/uefi/fu-plugin-uefi.c
View File

@ -306,9 +306,7 @@ fu_plugin_uefi_update_splash (GError **error)
fwup_resource *re = NULL; fwup_resource *re = NULL;
guint best_idx = G_MAXUINT; guint best_idx = G_MAXUINT;
guint32 lowest_border_pixels = G_MAXUINT; guint32 lowest_border_pixels = G_MAXUINT;
#ifdef HAVE_FWUP_GET_BGRT_INFO
int rc; int rc;
#endif
guint32 screen_height = 768; guint32 screen_height = 768;
guint32 screen_width = 1024; guint32 screen_width = 1024;
g_autoptr(GBytes) image_bmp = NULL; g_autoptr(GBytes) image_bmp = NULL;
@ -329,7 +327,6 @@ fu_plugin_uefi_update_splash (GError **error)
}; };
/* get the boot graphics resource table data */ /* get the boot graphics resource table data */
#ifdef HAVE_FWUP_GET_BGRT_INFO
rc = fwup_get_ux_capsule_info (&screen_width, &screen_height); rc = fwup_get_ux_capsule_info (&screen_width, &screen_height);
if (rc < 0) { if (rc < 0) {
g_set_error_literal (error, g_set_error_literal (error,
@ -340,7 +337,6 @@ fu_plugin_uefi_update_splash (GError **error)
} }
g_debug ("BGRT screen size %" G_GUINT32_FORMAT " x%" G_GUINT32_FORMAT, g_debug ("BGRT screen size %" G_GUINT32_FORMAT " x%" G_GUINT32_FORMAT,
screen_width, screen_height); screen_width, screen_height);
#endif
/* find the 'best sized' pre-generated image */ /* find the 'best sized' pre-generated image */
for (guint i = 0; sizes[i].width != 0; i++) { for (guint i = 0; sizes[i].width != 0; i++) {
@ -651,9 +647,7 @@ fu_plugin_uefi_set_custom_mountpoint (FuPlugin *plugin, GError **error)
return FALSE; return FALSE;
} }
#ifdef HAVE_FWUP_CUSTOM_ESP
fwup_set_esp_mountpoint (data->esp_path); fwup_set_esp_mountpoint (data->esp_path);
#endif
} }
return TRUE; return TRUE;
} }