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

trivial: Remove useless config.h defines

Browse Source 
The HAVE_UEFI_UNLOCK and HAVE_UEFI_GUID defines are always present for the
libfwup version we require.
This commit is contained in:
Richard Hughes 2017-09-06 16:17:03 +01:00
parent 54237e276d
commit 7ac92109eb
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@ -180,9 +180,6 @@ endif
if get_option('enable-uefi') if get_option('enable-uefi')
fwup = dependency('fwup', version : '>= 5') fwup = dependency('fwup', version : '>= 5')
conf.set('HAVE_UEFI', '1')
conf.set('HAVE_UEFI_UNLOCK', '1')
conf.set('HAVE_UEFI_GUID', '1')
endif endif
if get_option('enable-dell') if get_option('enable-dell')

5
plugins/dell/fu-plugin-dell.c
View File

@ -712,10 +712,8 @@ fu_plugin_update (FuPlugin *plugin,
const gchar *name = NULL; const gchar *name = NULL;
gint rc; gint rc;
guint flashes_left; guint flashes_left;
#ifdef HAVE_UEFI_GUID
const gchar *guidstr = NULL; const gchar *guidstr = NULL;
efi_guid_t guid; efi_guid_t guid;
#endif
/* test the flash counter /* test the flash counter
* - devices with 0 left at setup aren't allowed offline updates * - devices with 0 left at setup aren't allowed offline updates
@ -752,7 +750,6 @@ fu_plugin_update (FuPlugin *plugin,
*/ */
fwup_resource_iter_create (&iter); fwup_resource_iter_create (&iter);
fwup_resource_iter_next (iter, &re); fwup_resource_iter_next (iter, &re);
#ifdef HAVE_UEFI_GUID
guidstr = fu_device_get_guid_default (device); guidstr = fu_device_get_guid_default (device);
rc = efi_str_to_guid (guidstr, &guid); rc = efi_str_to_guid (guidstr, &guid);
if (rc < 0) { if (rc < 0) {
@ -771,7 +768,7 @@ fu_plugin_update (FuPlugin *plugin,
strerror (rc)); strerror (rc));
return FALSE; return FALSE;
} }
#endif
/* NOTE: if there are problems with this working, adjust the /* NOTE: if there are problems with this working, adjust the
* GUID in the capsule header to match something in ESRT. * GUID in the capsule header to match something in ESRT.
* This won't actually cause any bad behavior because the real * This won't actually cause any bad behavior because the real

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

@ -227,7 +227,6 @@ fu_plugin_unlock (FuPlugin *plugin,
FuDevice *device, FuDevice *device,
GError **error) GError **error)
{ {
#ifdef HAVE_UEFI_UNLOCK
gint rc; gint rc;
g_debug ("unlocking UEFI device %s", fu_device_get_id (device)); g_debug ("unlocking UEFI device %s", fu_device_get_id (device));
rc = fwup_enable_esrt(); rc = fwup_enable_esrt();
@ -244,13 +243,6 @@ fu_plugin_unlock (FuPlugin *plugin,
else if (rc == 3) else if (rc == 3)
g_debug ("UEFI device will be unlocked on next reboot"); g_debug ("UEFI device will be unlocked on next reboot");
return TRUE; return TRUE;
#else
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_INTERNAL,
"Not supported, update libfwupdate!");
return FALSE;
#endif
} }
static const gchar * static const gchar *