[edk2-devel] [Patch V2] GenBiosId: Enable GenBiosId to set timestamp as zero

[Liming Gao via Groups.Io]

Reviewed-by: Liming Gao <liming.gao at intel.com>

>-----Original Message-----
>From: Philippe Mathieu-Daudé [mailto:philmd at redhat.com]
>Sent: Tuesday, November 26, 2019 6:47 PM
>To: Feng, Bob C <bob.c.feng at intel.com>; devel at edk2.groups.io
>Cc: Gao, Liming <liming.gao at intel.com>; Shi, Steven <steven.shi at intel.com>
>Subject: Re: [Patch V2] GenBiosId: Enable GenBiosId to set timestamp as zero
>
>On 11/26/19 11:00 AM, Bob Feng wrote:
>> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2384
>>
>> We need eliminate the effect of timestamp to verify
>> the reproducible build.
>>
>> This patch is to add the support for GenBiosId to set
>> timestamp as zero.
>>
>> Cc: Liming Gao <liming.gao at intel.com>
>> Cc: Steven Shi <steven.shi at intel.com>
>> Cc: Philippe Mathieu-Daude <philmd at redhat.com>
>> Signed-off-by: Bob Feng <bob.c.feng at intel.com>
>> ---
>> V2:
>> 1. Change command line argument to lowercase.
>> 2. Add white space before NoTimestamp
>
>Thanks for the cleanup.
>
>Reviewed-by: Philippe Mathieu-Daude <philmd at redhat.com>
>
>>   Platform/Intel/Tools/GenBiosId/GenBiosId.py | 18 +++++++++++-------
>>   1 file changed, 11 insertions(+), 7 deletions(-)
>>
>> diff --git a/Platform/Intel/Tools/GenBiosId/GenBiosId.py
>b/Platform/Intel/Tools/GenBiosId/GenBiosId.py
>> index 31abb24d31..8cecb1c76f 100644
>> --- a/Platform/Intel/Tools/GenBiosId/GenBiosId.py
>> +++ b/Platform/Intel/Tools/GenBiosId/GenBiosId.py
>> @@ -100,26 +100,28 @@ def MyOptionParser():
>>       parser.add_argument('-v', '--version', action='version',
>version=__version__,
>>                           help="show program's version number and exit")
>>       parser.add_argument('-i', '--int', metavar='FILENAME', dest='InputFile',
>help="Input Config file")
>>       parser.add_argument('-o', '--out', metavar='FILENAME',
>dest='OutputFile', help="Output file")
>>       parser.add_argument('-ot', '--text', metavar='FILENAME',
>dest='OutputTextFile', help="Output Text file")
>> +    parser.add_argument('-nt', '--notimestamp', dest='NoTimestamp',
>action='store_true', default=False, help="Set timestamp to zero")
>>       Options = parser.parse_args()
>>       return Options
>>
>>
>>   # Check the Tool for missing variables
>>   def CheckOptions(Options):
>> -    if len(sys.argv) != 5 and not (len(sys.argv) == 7 and
>Options.OutputTextFile):
>> +    if len(sys.argv) not in [5,6] and not (len(sys.argv) not in [7,8] and
>Options.OutputTextFile):
>>           EdkLogger("GenBiosId", OPTION_MISSING, ExtraData=_Usage)
>>       elif not Options.InputFile or not Options.OutputFile:
>>           EdkLogger("GenBiosId", OPTION_MISSING, ExtraData=_Usage)
>>       InputFile = Options.InputFile
>>       OutputFile = Options.OutputFile
>>       OutputTextFile = Options.OutputTextFile
>> +    NoTimestamp = Options.NoTimestamp
>>       if not os.path.exists(InputFile):
>>           EdkLogger("GenBiosId", FILE_NOT_FOUND, ExtraData="Input file not
>found")
>> -    return InputFile, OutputFile, OutputTextFile
>> +    return InputFile, OutputFile, OutputTextFile, NoTimestamp
>>
>>   # Read input file and get config
>>   def ReadInputFile(InputFile):
>>       InputDict = OrderedDict()
>>       with open(InputFile) as File:
>> @@ -132,23 +134,25 @@ def ReadInputFile(InputFile):
>>               InputDict[Key.strip()] = Value.strip()
>>       return InputDict
>>
>>
>>   # Parse the input file and extract the information
>> -def ParserInputFile(InputDict):
>> +def ParserInputFile(InputDict, NoTimestamp):
>>       for Item in InputDict:
>>           if Item not in _ConfigItem:
>>               EdkLogger("GenBiosId", FORMAT_INVALID,
>ExtraData=_ConfigItemInvalid % Item)
>>           _ConfigItem[Item]['Value'] = InputDict[Item]
>>           if len(_ConfigItem[Item]['Value']) != _ConfigItem[Item]['Length']:
>>               EdkLogger("GenBiosId", FORMAT_INVALID,
>ExtraData=_ConfigLenInvalid % Item)
>>       for Item in _ConfigItem:
>>           if not _ConfigItem[Item]['Value']:
>>               EdkLogger("GenBiosId", FORMAT_UNKNOWN_ERROR,
>ExtraData="Item %s is missing" % Item)
>>       utcnow = datetime.datetime.utcnow()
>> -    TimeStamp = time.strftime("%y%m%d%H%M", utcnow.timetuple())
>> -
>> +    if NoTimestamp:
>> +        TimeStamp = "\0\0\0\0\0\0\0\0\0\0"
>> +    else:
>> +        TimeStamp = time.strftime("%y%m%d%H%M", utcnow.timetuple())
>>       Id_Str = _ConfigItem['BOARD_ID']['Value'] +
>_ConfigItem['BOARD_REV']['Value'] + '.' + _ConfigItem['BOARD_EXT'][
>>           'Value'] + '.' + _ConfigItem['VERSION_MAJOR']['Value'] + \
>>                '.' + _ConfigItem["BUILD_TYPE"]['Value'] +
>_ConfigItem['VERSION_MINOR']['Value'] + '.' + TimeStamp
>>       return Id_Str
>>
>> @@ -169,13 +173,13 @@ def PrintOutputFile(OutputFile, OutputTextFile,
>Id_Str):
>>
>>
>>   # Tool entrance method
>>   def Main():
>>       Options = MyOptionParser()
>> -    InputFile, OutputFile, OutputTextFile = CheckOptions(Options)
>> +    InputFile, OutputFile, OutputTextFile, NoTimestamp =
>CheckOptions(Options)
>>       InputDict = ReadInputFile(InputFile)
>> -    Id_Str = ParserInputFile(InputDict)
>> +    Id_Str = ParserInputFile(InputDict, NoTimestamp)
>>       PrintOutputFile(OutputFile, OutputTextFile, Id_Str)
>>       return 0
>>
>>
>>   if __name__ == '__main__':
>>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#51584): https://edk2.groups.io/g/devel/message/51584
Mute This Topic: https://groups.io/mt/61956815/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-