This patch as committed is breaking CI. It was not captured in PR because the PR optimizes to detect packages impacted by the commits and the BhyvePkg addition is not depended on by other packages (that are in CI). BhyvePkg which is nested inside OvmfPkg ( a violation of DEC spec: see https://edk2-docs.gitbook.io/edk-ii-dec-specification/2_dec_file_overview paragraph 4) does not support CI so it is not tested but now that it is in the edk2 tree it is causing the other packages to fail.

You can see the ReadMe badge showing the broken state of edk2 master. The build with logs can be seen here https://dev.azure.com/tianocore/edk2-ci/_build/results?buildId=10494&view=logs&j=ec42d809-3c3b-54a9-276c-e54a8b9aaee9&t=596e0656-4def-5804-b10b-1585519aa2e8 and some of the relevant failures are added below.


ERROR - Error Duplicate guid:  24A2D66F-EEDD-4086-9042-F26E4797EE69 (2)
GUID: 24A2D66F-EEDD-4086-9042-F26E4797EE69 NAME: gRootBridgesConnectedEventGroupGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: 24A2D66F-EEDD-4086-9042-F26E4797EE69 NAME: gRootBridgesConnectedEventGroupGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

ERROR - Error Duplicate name:  gEfiLegacyBiosProtocolGuid (2)
GUID: DB9A1E3D-45CB-4ABB-853B-E5387FDB2E2D NAME: gEfiLegacyBiosProtocolGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: DB9A1E3D-45CB-4ABB-853B-E5387FDB2E2D NAME: gEfiLegacyBiosProtocolGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

ERROR - Error Duplicate name:  gIoMmuAbsentProtocolGuid (2)
GUID: F8775D50-8ABD-4ADF-92AC-853E51F6C8DC NAME: gIoMmuAbsentProtocolGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: F8775D50-8ABD-4ADF-92AC-853E51F6C8DC NAME: gIoMmuAbsentProtocolGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

ERROR - Error Duplicate name:  gOvmfPlatformConfigGuid (2)
GUID: 7235C51C-0C80-4CAB-87AC-3B084A6304B1 NAME: gOvmfPlatformConfigGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: 7235C51C-0C80-4CAB-87AC-3B084A6304B1 NAME: gOvmfPlatformConfigGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

ERROR - Error Duplicate name:  gRootBridgesConnectedEventGroupGuid (2)
GUID: 24A2D66F-EEDD-4086-9042-F26E4797EE69 NAME: gRootBridgesConnectedEventGroupGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: 24A2D66F-EEDD-4086-9042-F26E4797EE69 NAME: gRootBridgesConnectedEventGroupGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

ERROR - Error Duplicate name:  gUefiOvmfPkgTokenSpaceGuid (2)
GUID: 93BB96AF-B9F2-4EB8-9462-E0BA74564236 NAME: gUefiOvmfPkgTokenSpaceGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: 93BB96AF-B9F2-4EB8-9462-E0BA74564236 NAME: gUefiOvmfPkgTokenSpaceGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

ERROR - Error Duplicate name:  gVirtioDeviceProtocolGuid (2)
GUID: FA920010-6785-4941-B6EC-498C579F160A NAME: gVirtioDeviceProtocolGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: FA920010-6785-4941-B6EC-498C579F160A NAME: gVirtioDeviceProtocolGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

ERROR - Error Duplicate name:  gVirtioMmioTransportGuid (2)
GUID: 837DCA9E-E874-4D82-B29A-23FE0E23D1E2 NAME: gVirtioMmioTransportGuid FILE: /home/vsts/work/1/s/OvmfPkg/OvmfPkg.dec GUID: 837DCA9E-E874-4D82-B29A-23FE0E23D1E2 NAME: gVirtioMmioTransportGuid FILE: /home/vsts/work/1/s/OvmfPkg/Bhyve/BhyvePkg.dec

and

ERROR - Dependency Check: Invalid Dependency INF: OvmfPkg/Bhyve/Library/BhyveFwCtlLib/BhyveFwCtlLib.inf depends on pkg OvmfPkg/Bhyve/BhyvePkg.dec ERROR - Dependency Check: Invalid Dependency INF: OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf depends on pkg OvmfPkg/Bhyve/BhyvePkg.dec ERROR - Dependency Check: Invalid Dependency INF: OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf depends on pkg OvmfPkg/Bhyve/BhyvePkg.dec


The errors can be easily resolved but the nested packages is a bigger problem.


Thanks
Sean





On 7/31/2020 6:10 AM, Laszlo Ersek wrote:
On 07/31/20 15:07, Laszlo Ersek wrote:
On 07/31/20 07:17, Rebecca Cran wrote:
On 7/13/20 2:25 PM, Rebecca Cran wrote:

On 7/13/20 12:09 PM, Laszlo Ersek wrote:

Can you please ping me when the PatchCheck.py problem has been solved,
so I can go ahead with the merge?

Will do.


Hi Laszlo,


I just rebased the bhyve commit against the latest edk2 master with no
conflicts, and all CI checks passed
(https://github.com/tianocore/edk2/pull/841).

So I think it's ready to go into the tree.

Thanks for the ping.

I've had your patch applied locally, from the list, on top of
then-master HEAD f45e3a4afa65, ready for pushing.

I've now fetched your branch (from your PR above), at commit
d6ec30afebe6. I've also rebased my local branch (see above) on top of
current master (137c2c6eff67). Your rebase and my rebase are identical
(except my version carries your original Message-Id for the patch, plus
my Acked-by given earlier).

Thus I've submitted the following PR, using my rebased branch (including
the Message-Id and Acked-by tags):

   https://github.com/tianocore/edk2/pull/842

Merged as commit 656419f922c0.

... We should have updated the subject line from

   Add BhyvePkg, to support the bhyve hypervisor

to

   OvmfPkg: add OvmfPkg/Bhyve, to support the bhyve hypervisor

I hope the rest of the community will forgive us for missing that.

My apologies.

Laszlo

Thank you for the contribution!

Please follow up with a patch for "Maintainers.txt", as discussed up-thread.

Thanks!
Laszlo






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

View/Reply Online (#63589): https://edk2.groups.io/g/devel/message/63589
Mute This Topic: https://groups.io/mt/75472166/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to