0bde85a20e
- Rebase to edk2-stable202211 tag Resolves: RHEL-119 (rebase edk2 to edk2-stable202211) - Resolves: RHEL-75 (edk2 builds should show the build version) - Resolves: bz#2132951 (edk2: Sort traditional virtualization builds before Confidential Computing builds)
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 2bbe51e3b55e6860d4607c6627866ed6b7c858af Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Thu, 1 Jul 2021 20:29:46 +0200
|
|
Subject: ArmVirtPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
RH-MergeRequest: 3: Disable features for RHEL9
|
|
RH-Commit: [18/19] 8f4e4007108462533e3d2050b84d8830073a7c0d
|
|
RH-Bugzilla: 1967747
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
Remove the command to register a file in the shell as the initial
|
|
ramdisk for a UEFI stubbed kernel, to be booted next.
|
|
|
|
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
ArmVirtPkg/ArmVirt.dsc.inc | 4 ----
|
|
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 -
|
|
2 files changed, 5 deletions(-)
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
index 49d2ef381c..1f0f8d44cd 100644
|
|
--- a/ArmVirtPkg/ArmVirt.dsc.inc
|
|
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
@@ -379,10 +379,6 @@
|
|
#
|
|
# UEFI application (Shell Embedded Boot Loader)
|
|
#
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
- <PcdsFixedAtBuild>
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
- }
|
|
ShellPkg/Application/Shell/Shell.inf {
|
|
<LibraryClasses>
|
|
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
|
|
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
index 46978cc76c..7bcb152c7c 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
@@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE
|
|
INF OvmfPkg/VirtioRngDxe/VirtioRng.inf
|
|
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
|
- INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
#
|
|
# Bds
|
|
--
|
|
2.38.1
|
|
|