Merge 314c7f7 into 7a3ae63

microsoft · Jun 7, 2024 · eac7498 · eac7498
2 parents 7a3ae63 + 314c7f7
commit eac7498
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 359 deletions.
diff --git a/SetupDataPkg/Tools/ReadUefiVarsToConfVarList.py b/SetupDataPkg/Tools/ReadUefiVarsToConfVarList.py
@@ -12,10 +12,7 @@
 import struct
 import uuid
 import ctypes
-if os.name == 'nt':
-    from SettingSupport.UefiVariablesSupportLib import UefiVariable
-else:
-    from SettingSupport.UefiVariablesSupportLinuxLib import UefiVariable
+from edk2toollib.os.uefivariablesupport import UefiVariable
 from VariableList import Schema, UEFIVariable, create_vlist_buffer
 
 

diff --git a/SetupDataPkg/Tools/SettingSupport/PyRobotRemote.py b/SetupDataPkg/Tools/SettingSupport/PyRobotRemote.py
@@ -55,18 +55,17 @@ def Run_Command_And_Return_Output(self, cmdline):
     def GetUefiVariable(self, name, guid, trim):
         UefiVar = UefiVariable()
         logging.info("Calling GetUefiVar(name='%s', GUID='%s')" % (name, "{%s}" % guid))
-        (rc, var, error_string) = UefiVar.GetUefiVar(name, guid)
+        (rc, var) = UefiVar.GetUefiVar(name, guid)
         var2 = var
         if (var is not None) and (trim == 'trim'):
             varlen = len(var)
             if varlen > 1:
                 var2 = var[0: varlen - 1]
-        return (rc, var2, error_string)
+        return (rc, var2, "")
 
     def SetUefiVariable(self, name, guid, attrs=None, contents=None):
         UefiVar = UefiVariable()
-        (rc, err, error_string) = UefiVar.SetUefiVar(name, guid, contents, attrs)
-        return rc
+        return UefiVar.SetUefiVar(name, guid, contents, attrs)
 
     def remote_ack(self):
         return True

diff --git a/SetupDataPkg/Tools/SettingSupport/UefiVariablesSupportLib.py b/SetupDataPkg/Tools/SettingSupport/UefiVariablesSupportLib.py
diff --git a/SetupDataPkg/Tools/SettingSupport/UefiVariablesSupportLinuxLib.py b/SetupDataPkg/Tools/SettingSupport/UefiVariablesSupportLinuxLib.py