Hi Sean, Appreciate the review since the change was based on your suggestions.
I agree. I can split out the Readme.rst changes into its own commit. Mike > -----Original Message----- > From: Sean Brogan <spbro...@outlook.com> > Sent: Friday, September 25, 2020 1:46 PM > To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kin...@intel.com> > Cc: Justen, Jordan L <jordan.l.jus...@intel.com>; Andrew Fish > <af...@apple.com>; Ni, Ray <ray...@intel.com>; Wadhawan, Divneil R > <divneil.r.wadha...@intel.com>; Sean Brogan <sean.bro...@microsoft.com> > Subject: Re: [edk2-devel] [Patch V2] EmulatorPkg: Add CI build for > SECURE_BOOT_ENABLE > > > I give my reviewed by for all changes for what it is worth. > > One question: Should the EmulatorPkg change be in its own commit just to > keep sereration. I know in Mu we split the edk2 repository and it is > nice that nearly all commits only touch a single "package". > > Reviewed-by: Sean Brogan <sean.bro...@microsoft.com> > > Thanks > Sean > > > > > > On 9/25/2020 1:20 PM, Michael D Kinney wrote: > > https://bugzilla.tianocore.org/show_bug.cgi?id=2979 > > > > Add EmulatorPkg CI builds for SECURE_BOOT_ENABLE=TRUE > > for IA32/X64 and DEBUG/RELEASE/NOOPT. Label these as > > FULL builds, so if additional build options are added > > in the future, they can be added to these FULL builds. > > > > Cc: Jordan Justen <jordan.l.jus...@intel.com> > > Cc: Andrew Fish <af...@apple.com> > > Cc: Ray Ni <ray...@intel.com> > > Cc: Divneil Rai Wadhawan <divneil.r.wadha...@intel.com> > > Cc: Sean Brogan <sean.bro...@microsoft.com> > > Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> > > --- > > .../.azurepipelines/Ubuntu-GCC5.yml | 43 +++++++++++++++++++ > > .../.azurepipelines/Windows-VS2019.yml | 43 +++++++++++++++++++ > > EmulatorPkg/PlatformCI/ReadMe.md | 4 +- > > ReadMe.rst | 18 ++++++++ > > 4 files changed, 107 insertions(+), 1 deletion(-) > > > > diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > > b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > > index 12ef8226ff..0e5f4d9961 100644 > > --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > > +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > > @@ -6,6 +6,7 @@ > > # Toolchain: GCC5 > > # > > # Copyright (c) Microsoft Corporation. > > +# Copyright (c) 2020, Intel Corporation. All rights reserved. > > # SPDX-License-Identifier: BSD-2-Clause-Patent > > ## > > trigger: > > @@ -65,6 +66,48 @@ jobs: > > Build.Target: "NOOPT" > > Run.Flags: $(run_flags) > > Run: $(should_run) > > + EmulatorPkg_X64_FULL_DEBUG: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "X64" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "DEBUG" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_X64_FULL_RELEASE: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "X64" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "RELEASE" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_X64_FULL_NOOPT: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "X64" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "NOOPT" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_IA32_FULL_DEBUG: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "IA32" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "DEBUG" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_IA32_FULL_RELEASE: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "IA32" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "RELEASE" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_IA32_FULL_NOOPT: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "IA32" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "NOOPT" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > > > workspace: > > clean: all > > diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml > > b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml > > index a5baf4b606..2bfce4e0af 100644 > > --- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml > > +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml > > @@ -6,6 +6,7 @@ > > # Toolchain: VS2019 > > # > > # Copyright (c) Microsoft Corporation. > > +# Copyright (c) 2020, Intel Corporation. All rights reserved. > > # SPDX-License-Identifier: BSD-2-Clause-Patent > > ## > > trigger: > > @@ -66,6 +67,48 @@ jobs: > > Build.Target: "NOOPT" > > Run.Flags: $(run_flags) > > Run: $(should_run) > > + EmulatorPkg_X64_FULL_DEBUG: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "X64" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "DEBUG" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_X64_FULL_RELEASE: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "X64" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "RELEASE" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_X64_FULL_NOOPT: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "X64" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "NOOPT" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_IA32_FULL_DEBUG: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "IA32" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "DEBUG" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_IA32_FULL_RELEASE: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "IA32" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "RELEASE" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > + EmulatorPkg_IA32_FULL_NOOPT: > > + Build.File: "$(package)/PlatformCI/PlatformBuild.py" > > + Build.Arch: "IA32" > > + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" > > + Build.Target: "NOOPT" > > + Run.Flags: $(run_flags) > > + Run: $(should_run) > > > > workspace: > > clean: all > > diff --git a/EmulatorPkg/PlatformCI/ReadMe.md > > b/EmulatorPkg/PlatformCI/ReadMe.md > > index c51838ec1a..91c40b2093 100644 > > --- a/EmulatorPkg/PlatformCI/ReadMe.md > > +++ b/EmulatorPkg/PlatformCI/ReadMe.md > > @@ -6,13 +6,15 @@ to use the same Pytools based build infrastructure > > locally. > > ## Supported Configuration Details > > > > This solution for building and running EmulatorPkg has only been > > validated with Windows 10 > > -with VS2019 and Ubuntu 18.04 with GCC5 toolchain. Two different firmware > > builds are > > +with VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware > > builds are > > supported and are described below. > > > > | Configuration name | Architectures | DSC File > > |Additional Flags | > > | :---- | :----- | :---- | :---- > > | > > | IA32 | IA32 | EmulatorPkg.dsc | None > > | > > | X64 | X64 | EmulatorPkg.dsc | None > > | > > +| IA32 Full | IA32 | EmulatorPkg.dsc | > > SECURE_BOOT_ENABLE=TRUE | > > +| X64 Full | X64 | EmulatorPkg.dsc | > > SECURE_BOOT_ENABLE=TRUE | > > > > ## EDK2 Developer environment > > > > diff --git a/ReadMe.rst b/ReadMe.rst > > index a16e13547f..c3c8178373 100644 > > --- a/ReadMe.rst > > +++ b/ReadMe.rst > > @@ -28,6 +28,8 @@ Microsoft Windows VS2019 > > ============================= ================= ============= > > ============= ============== > > EmulatorPkg_Win_VS2019_ | IA32 |em32d| |em32r| > > |em32n| > > | | X64 |em64d| |em64r| > > |em64n| > > +| | IA32 FULL |em32fd| |em32fr| > > |em32fn| > > +| | X64 FULL |em64fd| |em64fr| > > |em64fn| > > OvmfPkg_Win_VS2019_ | IA32 |op32d| |op32r| > > |op32n| > > | | X64 |op64d| |op64r| > > |op64n| > > | | IA32 X64 |op3264d| |op3264r| > > |op3264n| > > @@ -44,6 +46,8 @@ ArmVirtPkg_Ubuntu_GCC5_ | AARCH64 > > |avAArch64du| |avAArch64ru| |avA > > | | ARM |avArmdu| |avArmru| > > |avArmnu| > > EmulatorPkg_Ubuntu_GCC5_ | IA32 |em32du| |em32ru| > > |em32nu| > > | | X64 |em64du| |em64ru| > > |em64nu| > > +| | IA32 FULL |em32fdu| |em32fru| > > |em32fnu| > > +| | X64 FULL |em64fdu| |em64fru| > > |em64fnu| > > OvmfPkg_Ubuntu_GCC5_ | IA32 |op32du| |op32ru| > > |op32nu| > > | | X64 |op64du| |op64ru| > > |op64nu| > > | | IA32 X64 |op3264du| |op3264ru| > > |op3264nu| > > @@ -319,6 +323,13 @@ use. > > .. |em32n| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_IA32_NOOPT > > .. |em32nu| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_IA32_NOOPT > > > > +.. |em32fd| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_IA32_FULL_DEBUG > > +.. |em32fdu| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_IA32_FULL_DEBUG > > +.. |em32fr| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_IA32_FULL_RELEASE > > +.. |em32fru| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_IA32_FULL_RELEASE > > +.. |em32fn| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_IA32_FULL_NOOPT > > +.. |em32fnu| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_IA32_FULL_NOOPT > > + > > .. |em64d| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_X64_DEBUG > > .. |em64du| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_X64_DEBUG > > .. |em64r| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_X64_RELEASE > > @@ -326,6 +337,13 @@ use. > > .. |em64n| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_X64_NOOPT > > .. |em64nu| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_X64_NOOPT > > > > +.. |em64fd| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_X64_FULL_DEBUG > > +.. |em64fdu| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_X64_FULL_DEBUG > > +.. |em64fr| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_X64_FULL_RELEASE > > +.. |em64fru| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_X64_FULL_RELEASE > > +.. |em64fn| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emu > latorPkg_X64_FULL_NOOPT > > +.. |em64fnu| image:: https://dev.azure.com/tianocore/edk2- > ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20Emulat > orPkg_X64_FULL_NOOPT > > + > > .. OvmfPkg > > > > .. |TCBZ_2661| image:: > > https://img.shields.io/bugzilla/2661?baseUrl=https%3A%2F%2Fbugzilla.tianocore.org > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#65636): https://edk2.groups.io/g/devel/message/65636 Mute This Topic: https://groups.io/mt/77124626/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
