Switch to use edk2-pytool-library UefiVariableSupportLib.

.cspell.json

@@ -133,6 +133,7 @@
       "nochange",
       "headerRef",
       "modea",
-      "modeb"
+      "modeb",
+      "uefivariablesupport"
   ]
 }

SetupDataPkg/SetupDataPkg.ci.yaml

@@ -94,7 +94,8 @@
           "prettyname",
           "efivars",
           "efivarfs",
-          "chattr"
+          "chattr",
+          "uefivariablesupport"
         ],                           # words to extend to the dictionary for this package
         "IgnoreStandardPaths": [],   # Standard Plugin defined paths that should be ignore
         "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)

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
 
 

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