|
 |
cc9195 |
From 02ed2c501cdd56e9c404bdc8eac0abb9dfd5a04c Mon Sep 17 00:00:00 2001
|
|
|
cc9195 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
cc9195 |
Date: Wed, 18 Jul 2018 00:18:20 +0200
|
|
|
cc9195 |
Subject: [PATCH 4/6] advertise OpenSSL due to IPv6 enablement too (RHEL only)
|
|
|
cc9195 |
|
|
|
cc9195 |
Message-id: <20180717221822.13110-4-lersek@redhat.com>
|
|
|
cc9195 |
Patchwork-id: 81378
|
|
|
cc9195 |
O-Subject: [RHEL8/virt212 edk2 PATCH 3/5] advertise OpenSSL due to IPv6
|
|
|
cc9195 |
enablement too (RHEL only)
|
|
|
cc9195 |
Bugzilla: 1536627
|
|
|
cc9195 |
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
cc9195 |
Acked-by: Wei Huang <wei@redhat.com>
|
|
|
cc9195 |
|
|
|
cc9195 |
With "-D NETWORK_IP6_ENABLE", we pull the IPv6-enabled IScsiDxe driver
|
|
|
cc9195 |
into the edk2-ovmf and edk2-aarch64 builds. That driver depends on OpenSSL
|
|
|
cc9195 |
(the crypto part only, not the ssl part). Accordingly, extend our
|
|
|
cc9195 |
(downstream-only) OpenSSL advertisment to NETWORK_IP6_ENABLE.
|
|
|
cc9195 |
|
|
|
cc9195 |
(At the next rebase, this patch will be squashed into commit "advertise
|
|
|
cc9195 |
OpenSSL on TianoCore splash screen / boot logo (RHEL only)".)
|
|
|
cc9195 |
|
|
|
cc9195 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
cc9195 |
---
|
|
|
cc9195 |
ArmVirtPkg/ArmVirtQemu.dsc | 2 +-
|
|
|
cc9195 |
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +-
|
|
|
cc9195 |
ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +-
|
|
|
cc9195 |
OvmfPkg/OvmfPkgIa32.dsc | 2 +-
|
|
|
cc9195 |
OvmfPkg/OvmfPkgIa32.fdf | 2 +-
|
|
|
cc9195 |
OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
|
|
|
cc9195 |
OvmfPkg/OvmfPkgIa32X64.fdf | 2 +-
|
|
|
cc9195 |
OvmfPkg/OvmfPkgX64.dsc | 2 +-
|
|
|
cc9195 |
OvmfPkg/OvmfPkgX64.fdf | 2 +-
|
|
|
cc9195 |
9 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
cc9195 |
|
|
|
cc9195 |
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
|
cc9195 |
index 41ff17d..7091b6c 100644
|
|
|
cc9195 |
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
|
|
cc9195 |
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
|
cc9195 |
@@ -332,7 +332,7 @@
|
|
|
cc9195 |
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
|
|
cc9195 |
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
|
|
cc9195 |
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
|
|
cc9195 |
-!if $(SECURE_BOOT_ENABLE) == TRUE
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE)
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
|
cc9195 |
index 82d9cbd..a3f5fa9 100644
|
|
|
cc9195 |
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
|
cc9195 |
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
|
cc9195 |
@@ -201,7 +201,7 @@ READ_LOCK_STATUS = TRUE
|
|
|
cc9195 |
#
|
|
|
cc9195 |
# TianoCore logo (splash screen)
|
|
|
cc9195 |
#
|
|
|
cc9195 |
-!if $(SECURE_BOOT_ENABLE) == TRUE
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE)
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
|
cc9195 |
index 83fc12f..5730633 100644
|
|
|
cc9195 |
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
|
cc9195 |
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
|
cc9195 |
@@ -315,7 +315,7 @@
|
|
|
cc9195 |
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
|
|
cc9195 |
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
|
|
cc9195 |
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
|
|
cc9195 |
-!if $(SECURE_BOOT_ENABLE) == TRUE
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE)
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
cc9195 |
index f6d7833..bef8df9 100644
|
|
|
cc9195 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
cc9195 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
cc9195 |
@@ -688,7 +688,7 @@
|
|
|
cc9195 |
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
}
|
|
|
cc9195 |
-!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
cc9195 |
index 73007dd..43f80cd 100644
|
|
|
cc9195 |
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
cc9195 |
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
cc9195 |
@@ -297,7 +297,7 @@ INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
|
|
|
cc9195 |
-!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
cc9195 |
index d6e628b..2085848 100644
|
|
|
cc9195 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
cc9195 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
cc9195 |
@@ -697,7 +697,7 @@
|
|
|
cc9195 |
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
}
|
|
|
cc9195 |
-!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
cc9195 |
index 116b3c6..d858012 100644
|
|
|
cc9195 |
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
cc9195 |
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
cc9195 |
@@ -298,7 +298,7 @@ INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
|
|
|
cc9195 |
-!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
cc9195 |
index a9fe89c..7bcb9fa 100644
|
|
|
cc9195 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
cc9195 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
cc9195 |
@@ -695,7 +695,7 @@
|
|
|
cc9195 |
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
}
|
|
|
cc9195 |
-!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
cc9195 |
index 84d5845..41ce2d0 100644
|
|
|
cc9195 |
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
cc9195 |
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
cc9195 |
@@ -298,7 +298,7 @@ INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
!endif
|
|
|
cc9195 |
|
|
|
cc9195 |
-!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
|
|
cc9195 |
!else
|
|
|
cc9195 |
INF MdeModulePkg/Logo/LogoDxe.inf
|
|
|
cc9195 |
--
|
|
|
cc9195 |
1.8.3.1
|
|
|
cc9195 |
|