[v4] Set Firmware Version from build command line

[edk2-devel] [PATCH v4 0/2] Set Firmware Version from build command line

Posted by Oliver Steffen 1 year ago

ArmVirtXen.dsc allows setting the firmware version
string in gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
via FIRMWARE_VER variable conveniently on the build command line.

These two patches add this behavior to all .dsc files in ArmVirtPkg
and OvmfPkg.

PR: https://github.com/tianocore/edk2/pull/4268

v4:
- Actually use the include file

v3:
- Introduce common include file for OVMF .dsc files
https://edk2.groups.io/g/devel/message/102952

v2:
Address comments by Sami and Gerd:
- Only set PCD if FIRMWARE_VER is defined
- ArmVirt: move logic to ArmVirt.dsc.inc
https://edk2.groups.io/g/devel/message/95208

v1:
https://edk2.groups.io/g/devel/message/95057

Oliver Steffen (2):
  OvmfPkg: allow setting Firmware Version from build command line
  ArmVirtPkg: allow setting Firmware Version from build command line

 ArmVirtPkg/ArmVirt.dsc.inc          | 4 ++++
 OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc | 9 +++++++++
 ArmVirtPkg/ArmVirtXen.dsc           | 1 -
 OvmfPkg/OvmfPkgIa32.dsc             | 2 ++
 OvmfPkg/OvmfPkgIa32X64.dsc          | 2 ++
 OvmfPkg/OvmfPkgX64.dsc              | 3 +++
 OvmfPkg/OvmfXen.dsc                 | 2 ++
 7 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc

-- 
2.40.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102982): https://edk2.groups.io/g/devel/message/102982
Mute This Topic: https://groups.io/mt/98258183/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v4 0/2] Set Firmware Version from build command line

Posted by Gerd Hoffmann 1 year ago

Ping.

On Fri, Apr 14, 2023 at 10:33:21AM +0200, Oliver Steffen wrote:
> ArmVirtXen.dsc allows setting the firmware version
> string in gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
> via FIRMWARE_VER variable conveniently on the build command line.
> 
> These two patches add this behavior to all .dsc files in ArmVirtPkg
> and OvmfPkg.
> 
> PR: https://github.com/tianocore/edk2/pull/4268
> 
> v4:
> - Actually use the include file
> 
> v3:
> - Introduce common include file for OVMF .dsc files
> https://edk2.groups.io/g/devel/message/102952
> 
> v2:
> Address comments by Sami and Gerd:
> - Only set PCD if FIRMWARE_VER is defined
> - ArmVirt: move logic to ArmVirt.dsc.inc
> https://edk2.groups.io/g/devel/message/95208
> 
> v1:
> https://edk2.groups.io/g/devel/message/95057
> 
> Oliver Steffen (2):
>   OvmfPkg: allow setting Firmware Version from build command line
>   ArmVirtPkg: allow setting Firmware Version from build command line
> 
>  ArmVirtPkg/ArmVirt.dsc.inc          | 4 ++++
>  OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc | 9 +++++++++
>  ArmVirtPkg/ArmVirtXen.dsc           | 1 -
>  OvmfPkg/OvmfPkgIa32.dsc             | 2 ++
>  OvmfPkg/OvmfPkgIa32X64.dsc          | 2 ++
>  OvmfPkg/OvmfPkgX64.dsc              | 3 +++
>  OvmfPkg/OvmfXen.dsc                 | 2 ++
>  7 files changed, 22 insertions(+), 1 deletion(-)
>  create mode 100644 OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc
> 
> -- 
> 2.40.0
> 

-- 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103985): https://edk2.groups.io/g/devel/message/103985
Mute This Topic: https://groups.io/mt/98258183/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v4 0/2] Set Firmware Version from build command line

Posted by Ard Biesheuvel 1 year ago

On Thu, 4 May 2023 at 12:13, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> Ping.
>

I'll pick these up - thanks for the reminder.


> On Fri, Apr 14, 2023 at 10:33:21AM +0200, Oliver Steffen wrote:
> > ArmVirtXen.dsc allows setting the firmware version
> > string in gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
> > via FIRMWARE_VER variable conveniently on the build command line.
> >
> > These two patches add this behavior to all .dsc files in ArmVirtPkg
> > and OvmfPkg.
> >
> > PR: https://github.com/tianocore/edk2/pull/4268
> >
> > v4:
> > - Actually use the include file
> >
> > v3:
> > - Introduce common include file for OVMF .dsc files
> > https://edk2.groups.io/g/devel/message/102952
> >
> > v2:
> > Address comments by Sami and Gerd:
> > - Only set PCD if FIRMWARE_VER is defined
> > - ArmVirt: move logic to ArmVirt.dsc.inc
> > https://edk2.groups.io/g/devel/message/95208
> >
> > v1:
> > https://edk2.groups.io/g/devel/message/95057
> >
> > Oliver Steffen (2):
> >   OvmfPkg: allow setting Firmware Version from build command line
> >   ArmVirtPkg: allow setting Firmware Version from build command line
> >
> >  ArmVirtPkg/ArmVirt.dsc.inc          | 4 ++++
> >  OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc | 9 +++++++++
> >  ArmVirtPkg/ArmVirtXen.dsc           | 1 -
> >  OvmfPkg/OvmfPkgIa32.dsc             | 2 ++
> >  OvmfPkg/OvmfPkgIa32X64.dsc          | 2 ++
> >  OvmfPkg/OvmfPkgX64.dsc              | 3 +++
> >  OvmfPkg/OvmfXen.dsc                 | 2 ++
> >  7 files changed, 22 insertions(+), 1 deletion(-)
> >  create mode 100644 OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc
> >
> > --
> > 2.40.0
> >
>
> --
>
>
>
> 
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103986): https://edk2.groups.io/g/devel/message/103986
Mute This Topic: https://groups.io/mt/98258183/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v4 0/2] Set Firmware Version from build command line

Posted by Rebecca Cran 1 year ago

Sorry for not commenting on this earlier.

Would it be better to have people use the build `--pcd` option instead? 
e.g. build 
--pcd="gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString=edk2-stable202302".


-- 

Rebecca Cran


On 4/14/23 02:33, Oliver Steffen wrote:
> ArmVirtXen.dsc allows setting the firmware version
> string in gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
> via FIRMWARE_VER variable conveniently on the build command line.
>
> These two patches add this behavior to all .dsc files in ArmVirtPkg
> and OvmfPkg.
>
> PR: https://github.com/tianocore/edk2/pull/4268
>
> v4:
> - Actually use the include file
>
> v3:
> - Introduce common include file for OVMF .dsc files
> https://edk2.groups.io/g/devel/message/102952
>
> v2:
> Address comments by Sami and Gerd:
> - Only set PCD if FIRMWARE_VER is defined
> - ArmVirt: move logic to ArmVirt.dsc.inc
> https://edk2.groups.io/g/devel/message/95208
>
> v1:
> https://edk2.groups.io/g/devel/message/95057
>
> Oliver Steffen (2):
>    OvmfPkg: allow setting Firmware Version from build command line
>    ArmVirtPkg: allow setting Firmware Version from build command line
>
>   ArmVirtPkg/ArmVirt.dsc.inc          | 4 ++++
>   OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc | 9 +++++++++
>   ArmVirtPkg/ArmVirtXen.dsc           | 1 -
>   OvmfPkg/OvmfPkgIa32.dsc             | 2 ++
>   OvmfPkg/OvmfPkgIa32X64.dsc          | 2 ++
>   OvmfPkg/OvmfPkgX64.dsc              | 3 +++
>   OvmfPkg/OvmfXen.dsc                 | 2 ++
>   7 files changed, 22 insertions(+), 1 deletion(-)
>   create mode 100644 OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102996): https://edk2.groups.io/g/devel/message/102996
Mute This Topic: https://groups.io/mt/98258183/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v4 0/2] Set Firmware Version from build command line

Posted by Gerd Hoffmann 1 year ago

On Fri, Apr 14, 2023 at 06:13:03AM -0600, Rebecca Cran wrote:
> Sorry for not commenting on this earlier.
> 
> Would it be better to have people use the build `--pcd` option instead? e.g.
> build --pcd="gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString=edk2-stable202302".

Possible, but the syntax is not that simple, you need 'L' prefix (so
CHAR16 not CHAR8 is used) and '\0' postfix (so the string is properly
terminated), i.e. --pcd=PcdFirmwareVersionString="L${version}\\0".

Providing a shorter and less error prone way to specify the version
looks sensible to me.

take care,
  Gerd

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103081): https://edk2.groups.io/g/devel/message/103081
Mute This Topic: https://groups.io/mt/98258183/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v4 0/2] Set Firmware Version from build command line

Posted by Rebecca Cran 1 year ago

On 4/17/23 4:17 AM, Gerd Hoffmann wrote:
> On Fri, Apr 14, 2023 at 06:13:03AM -0600, Rebecca Cran wrote:
>> Sorry for not commenting on this earlier.
>>
>> Would it be better to have people use the build `--pcd` option instead? e.g.
>> build --pcd="gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString=edk2-stable202302".
> Possible, but the syntax is not that simple, you need 'L' prefix (so
> CHAR16 not CHAR8 is used) and '\0' postfix (so the string is properly
> terminated), i.e. --pcd=PcdFirmwareVersionString="L${version}\\0".
>
> Providing a shorter and less error prone way to specify the version
> looks sensible to me.

Agreed. Thanks.


-- 
Rebecca Cran



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103097): https://edk2.groups.io/g/devel/message/103097
Mute This Topic: https://groups.io/mt/98258183/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-