Stuart Henderson <[email protected]> writes:
> On 2023/04/06 15:49, Klemens Nanni wrote:
>> bios0: vendor SeaBIOS version
>> "1.14.0-20230330_133212-symphytum.spacehopper.orgp2-OpenBSD-vmm" date
>> 01/01/2011
>>
>> in dmesg is a weird concat of port version, datetime, hostname,
>> port revision, uname(?) and a fixed string(?) in that order.
>
> oh yeuch, yeah that is not supposed to be there.
>
>> I don't fully understand their messy buildversion.py script, but can make
>> it produce more sensible
>> bios0: vendor SeaBIOS version "1.14.0p3-OpenBSD-vmm" date 01/01/2011
>>
>> Feedback? Objection? OK?
>
> that is how it used to look in the 1.11.0 days. going by that result: OK.
I concur. ok dv as well.
>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/firmware/vmm/Makefile,v
>> retrieving revision 1.28
>> diff -u -p -r1.28 Makefile
>> --- Makefile 4 Feb 2023 09:35:35 -0000 1.28
>> +++ Makefile 5 Apr 2023 19:50:12 -0000
>> @@ -17,7 +17,7 @@ FW_DRIVER= vmm
>> FW_VER= 1.14.0
>> SB_VER= 20180715
>> DISTNAME= seabios-${FW_VER}
>> -REVISION= 2
>> +REVISION= 3
>> DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
>> sgabios-${SB_VER}{72f39d48bedf044e202fd51fecf3e2218fc2ae66}.tar.gz:0
>>
>> Index: patches/patch-scripts_buildversion_py
>> ===================================================================
>> RCS file:
>> /cvs/ports/sysutils/firmware/vmm/patches/patch-scripts_buildversion_py,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 patch-scripts_buildversion_py
>> --- patches/patch-scripts_buildversion_py 7 Mar 2022 22:03:32 -0000
>> 1.3
>> +++ patches/patch-scripts_buildversion_py 6 Apr 2023 15:40:40 -0000
>> @@ -3,6 +3,8 @@ a consistent version number detected for
>> detection is too simplistic to cope with older binutils (mix of
>> "GNU assembler 2.17" and "GNU ld version 2.17" etc).
>>
>> +Omit datetime and hostname from dmesg visible version string.
>> +
>> Index: scripts/buildversion.py
>> --- scripts/buildversion.py.orig
>> +++ scripts/buildversion.py
>> @@ -24,3 +26,11 @@ Index: scripts/buildversion.py
>> if verstr.startswith('GNU '):
>> isbinutils = 1
>> verstr = verstr[4:]
>> +@@ -124,6 +126,7 @@ def main():
>> + cleanbuild = cleanbuild and ver and options.extra != ""
>> + if not ver:
>> + ver = "?"
>> ++ cleanbuild = True # XXX omit useless information
>> + if not cleanbuild:
>> + btime = time.strftime("%Y%m%d_%H%M%S")
>> + hostname = socket.gethostname()
>>
