Sync with qefivar v0.3.1

Inokinoki · Nov 12, 2024 · 7284c15 · 7284c15
1 parent f9d5a25
commit 7284c15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,7 +66,7 @@ if(PkgConfig_FOUND)
         if(EFIVAR_FOUND)
             # Consider it as an old lib (without mode and return non-zero)
             # TODO(Inoki): to check https://github.com/rhboot/efivar/commit/7bd2e309aeec210509d215c803a762725591ccc7
-            add_definitions(-DEFIVAR_OLD_API)
+            add_definitions(-DEFIVAR_WITHOUT_MODE)
         endif()
     endif()
 endif()
@@ -85,6 +85,10 @@ else()
     message(FATAL_ERROR "No EFI utility found, please make sure you have libefivar installed")
 endif()
 
+if(USE_EFIVAR_OLD_API)
+    add_definitions(-DEFIVAR_OLD_API)
+endif()
+
 target_include_directories(QEFIEntryManager PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/qefivar)
 if(PATCH_FREEBSD_EFIVAR)
     # Patch efivar 0.15 build for FreeBSD

diff --git a/main.cpp b/main.cpp
@@ -5,14 +5,6 @@
 #include <qefientrystaticlist.h>
 #include <qefi.h>
 
-#ifdef EFIVAR_FREEBSD_PATCH
-extern "C" {
-#include <efivar.h>
-// Temporarilly patch for FreeBSD
-efi_guid_t efi_guid_zero = {0};
-}
-#endif
-
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);