diff --git a/meson.build b/meson.build index b05fe14c4..a2589650d 100644 --- a/meson.build +++ b/meson.build @@ -180,9 +180,6 @@ endif if get_option('enable-uefi') fwup = dependency('fwup', version : '>= 5') - conf.set('HAVE_UEFI', '1') - conf.set('HAVE_UEFI_UNLOCK', '1') - conf.set('HAVE_UEFI_GUID', '1') endif if get_option('enable-dell') diff --git a/plugins/dell/fu-plugin-dell.c b/plugins/dell/fu-plugin-dell.c index 4a1959ddf..ae78775ee 100644 --- a/plugins/dell/fu-plugin-dell.c +++ b/plugins/dell/fu-plugin-dell.c @@ -712,10 +712,8 @@ fu_plugin_update (FuPlugin *plugin, const gchar *name = NULL; gint rc; guint flashes_left; -#ifdef HAVE_UEFI_GUID const gchar *guidstr = NULL; efi_guid_t guid; -#endif /* test the flash counter * - 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_next (iter, &re); -#ifdef HAVE_UEFI_GUID guidstr = fu_device_get_guid_default (device); rc = efi_str_to_guid (guidstr, &guid); if (rc < 0) { @@ -771,7 +768,7 @@ fu_plugin_update (FuPlugin *plugin, strerror (rc)); return FALSE; } -#endif + /* NOTE: if there are problems with this working, adjust the * GUID in the capsule header to match something in ESRT. * This won't actually cause any bad behavior because the real diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c index c05a04ad7..4e9eccba4 100644 --- a/plugins/uefi/fu-plugin-uefi.c +++ b/plugins/uefi/fu-plugin-uefi.c @@ -227,7 +227,6 @@ fu_plugin_unlock (FuPlugin *plugin, FuDevice *device, GError **error) { -#ifdef HAVE_UEFI_UNLOCK gint rc; g_debug ("unlocking UEFI device %s", fu_device_get_id (device)); rc = fwup_enable_esrt(); @@ -244,13 +243,6 @@ fu_plugin_unlock (FuPlugin *plugin, else if (rc == 3) g_debug ("UEFI device will be unlocked on next reboot"); return TRUE; -#else - g_set_error_literal (error, - FWUPD_ERROR, - FWUPD_ERROR_INTERNAL, - "Not supported, update libfwupdate!"); - return FALSE; -#endif } static const gchar *