Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable additional network components when most are disabled, in all platforms in OvmfPkg and ArmVirtPkg #6092

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Disable additional network components when most are disabled, in all platforms in OvmfPkg and ArmVirtPkg #6092

wants to merge 5 commits into from

Commits on Sep 13, 2024

  1. OvmfPkg: Include no network components with -D NETWORK_ENABLE=0 

    This issue showed up when addressing
https://bugzilla.tianocore.org/show_bug.cgi?id=4829
in tianocore#6087 .

Various OvmfPkg and ArmVirtPkg platforms include some residual NetworkPkg
components when compiled with -D NETWORK_ENABLE=0, even though they use
NetworkPkg includes intended to allow all NetworkPkg components to be
disabled on this flag.

For the OvmfPkg Intel platforms only, commit
d933ec1 started
the change of not including these residual NetworkPkg
components, and commit
7f17a15 completed it.

This commit rolls these changes out to the remaining OvmfPkg platforms
where they make sense in the same way.

Signed-off-by: Mike Beaton <[email protected]>
    @mikebeaton
    mikebeaton committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    691c47e View commit details
    Browse the repository at this point in the history

  2. ArmVirtPkg: Include no network components with -D NETWORK_ENABLE=0 

    This issue showed up when addressing
https://bugzilla.tianocore.org/show_bug.cgi?id=4829
in tianocore#6087 .

Various OvmfPkg and ArmVirtPkg platforms include some residual NetworkPkg
components when compiled with -D NETWORK_ENABLE=0, even though they use
NetworkPkg includes intended to allow all NetworkPkg components to be
disabled on this flag.

For the OvmfPkg Intel platforms only, commit
d933ec1 started
the change of not including these residual NetworkPkg
components, and commit
7f17a15 completed it.

This commit rolls these changes out to the ArmVirtPkg platforms where
they make sense in the same way.

Signed-off-by: Mike Beaton <[email protected]>
    @mikebeaton
    mikebeaton committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    39540df View commit details
    Browse the repository at this point in the history

  3. ArmVirtPkg/CI: Copy shell to virtual drive 

    Place the EFI shell as EFI/BOOT/BOOT{ARCH}.EFI on the virtual drive.
This allows the "Run to shell" CI test case to work even in case the
shell is not included in the firmware image.

This is needed because a follow up patch will exclude the shell from
secure boot enabled firmware images.

The same update was previously applied to OvmfPkg by
6862b9d.

Signed-off-by: Gerd Hoffmann <[email protected]>
Signed-off-by: Mike Beaton <[email protected]>
    @mikebeaton
    mikebeaton committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    683df08 View commit details
    Browse the repository at this point in the history

  4. OvmfPkg: Use OvmfPkg/Include/*/Shell*.inc throughout 

    While fixing tianocore#6092 (the
fact that some OvmfPkg and ArmVirtPkg platforms included residual
NetworkPkg components even when compiled with -D NETWORK_ENABLE=0),
it was noted that OvmfPkg/Include/*/Shell*.inc files which apply
the required fix logic are available and already used in some
OvmfPkg platforms.

This commit applies these files consistently within OvmfPkg.

This has the side effect that some platforms now include one or
more of HttpDynamicCommand, VariablePolicyDynamicCommand and
LinuxInitrdDynamicShellCommand when they previously did not.
It is believed that in all cases these changes are neutral (i.e.
not necessarily needed, but not harmful, and with the benefit of
now using shared code) or positive (i.e. they fix unintentional
drift between platforms, and provide additional shell commands
which may be useful in some cases).

Signed-off-by: Mike Beaton <[email protected]>
    @mikebeaton
    mikebeaton committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    a24b0ec View commit details
    Browse the repository at this point in the history

  5. ArmVirtPkg: Use OvmfPkg/Include/*/Shell*.inc 

    While fixing tianocore#6092 (the
fact that some OvmfPkg and ArmVirtPkg platforms included residual
NetworkPkg components even when compiled with -D NETWORK_ENABLE=0),
it was noted that OvmfPkg/Include/*/Shell*.inc files which apply
the required fix logic are available and already used in some
OvmfPkg platforms.

A previous commit applied these files consistently within OvmfPkg.
This commit applies these files within ArmVirtPkg.

This has the side effect that some platforms now include one or
more of HttpDynamicCommand, VariablePolicyDynamicCommand and
LinuxInitrdDynamicShellCommand when they previously did not.
It is believed that in all cases these changes are neutral (i.e.
not necessarily needed, but not harmful, and with the benefit of
now using shared code) or positive (i.e. they fix unintentional
drift between platforms, and provide additional shell commands
which may be useful in some cases).

Signed-off-by: Mike Beaton <[email protected]>
    @mikebeaton
    mikebeaton committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    a784f93 View commit details
    Browse the repository at this point in the history