From 5c5ca9f1fbf876a6ff68887b1508063e1d4fb60c Mon Sep 17 00:00:00 2001 From: "Carsey, Jaben" Date: Thu, 17 Jan 2019 23:35:07 +0800 Subject: [PATCH] BaseTools/GenFds/Capsule: move function logic Move PackRegistryFormatGuid logic from Common.Misc to this file. There were no other consumers of the function. As it is one line, just replace the logic without the separate function. v2 - change to fix the import statement Cc: Bob Feng Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey Reviewed-by: Bob Feng --- BaseTools/Source/Python/Common/Misc.py | 6 ------ BaseTools/Source/Python/GenFds/Capsule.py | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index d2cbece894..8e4217a4f6 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1904,12 +1904,6 @@ class SkuClass(): else: return 'DEFAULT' -# -# Pack a registry format GUID -# -def PackRegistryFormatGuid(Guid): - return PackGUID(Guid.split('-')) - ## Get the integer value from string like "14U" or integer like 2 # # @param Input The object that may be either a integer value or a string diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/Python/GenFds/Capsule.py index df29c40dbd..1cdbdcf7ba 100644 --- a/BaseTools/Source/Python/GenFds/Capsule.py +++ b/BaseTools/Source/Python/GenFds/Capsule.py @@ -20,7 +20,7 @@ from .GenFdsGlobalVariable import GenFdsGlobalVariable, FindExtendTool from CommonDataClass.FdfClass import CapsuleClassObject import Common.LongFilePathOs as os from io import BytesIO -from Common.Misc import SaveFileOnChange, PackRegistryFormatGuid +from Common.Misc import SaveFileOnChange, PackGUID import uuid from struct import pack from Common import EdkLogger @@ -66,7 +66,7 @@ class Capsule (CapsuleClassObject): # # Use FMP capsule GUID: 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A # - Header.write(PackRegistryFormatGuid('6DCBD5ED-E82D-4C44-BDA1-7194199AD92A')) + Header.write(PackGUID('6DCBD5ED-E82D-4C44-BDA1-7194199AD92A'.split('-'))) HdrSize = 0 if 'CAPSULE_HEADER_SIZE' in self.TokensDict: Header.write(pack('=I', int(self.TokensDict['CAPSULE_HEADER_SIZE'], 16)))