Export FWUPDATE_GUID

This is duplicated in two places internally, and is also required in fwupd too.
rhboot · Apr 9, 2018 · 0dc8c02 · 0dc8c02
1 parent 24a3a4b
commit 0dc8c02
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/linux/fwupdate.c b/linux/fwupdate.c
@@ -25,8 +25,6 @@
 #include "error.h"
 #include "ucs2.h"
 
-#define FWUPDATE_GUID EFI_GUID(0x0abba7dc,0xe516,0x4167,0xbbf5,0x4d,0x9d,0x1c,0x73,0x94,0x16)
-
 int verbose = 0;
 int quiet = 0;
 

diff --git a/linux/include/fwup.h b/linux/include/fwup.h
@@ -44,6 +44,8 @@ extern int fwup_enable_esrt(void);
 #define FWUP_LAST_ATTEMPT_STATUS_ERROR_PWR_EVT_AC		0x00000006
 #define FWUP_LAST_ATTEMPT_STATUS_ERROR_PWR_EVT_BATT		0x00000007
 
+#define FWUPDATE_GUID EFI_GUID(0x0abba7dc,0xe516,0x4167,0xbbf5,0x4d,0x9d,0x1c,0x73,0x94,0x16)
+
 typedef struct fwup_resource_s fwup_resource;
 typedef struct fwup_resource_iter_s fwup_resource_iter;
 

diff --git a/linux/libfwup.c b/linux/libfwup.c
@@ -448,8 +448,6 @@ free_info(update_info *info)
 	}
 }
 
-#define FWUPDATE_GUID EFI_GUID(0x0abba7dc,0xe516,0x4167,0xbbf5,0x4d,0x9d,0x1c,0x73,0x94,0x16)
-
 static int
 get_info(efi_guid_t *guid, uint64_t hw_inst, update_info **info)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -448,8 +448,6 @@ free_info(update_info *info) @@
     	}
     }
-    #define FWUPDATE_GUID EFI_GUID(0x0abba7dc,0xe516,0x4167,0xbbf5,0x4d,0x9d,0x1c,0x73,0x94,0x16)
     static int
     get_info(efi_guid_t *guid, uint64_t hw_inst, update_info **info)
     {
@@ Expand Down @@