Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ovmf for openSUSE:Factory checked in
at 2021-04-22 18:03:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ovmf (Old)
and /work/SRC/openSUSE:Factory/.ovmf.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovmf"
Thu Apr 22 18:03:38 2021 rev:61 rq:886614 version:202102
Changes:
--------
--- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes 2021-04-08
21:03:04.249959305 +0200
+++ /work/SRC/openSUSE:Factory/.ovmf.new.12324/ovmf.changes 2021-04-22
18:04:02.618513928 +0200
@@ -1,0 +2,7 @@
+Mon Apr 19 06:10:39 UTC 2021 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Build ovmf-x86_64-smm against Ia32X64 to enable S3 support
+ (bsc#1184938)
+- Update ovmf-add-exclude-shell-flag.patch to include Ia32X64
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ovmf.spec ++++++
--- /var/tmp/diff_new_pack.13eigu/_old 2021-04-22 18:04:03.306514992 +0200
+++ /var/tmp/diff_new_pack.13eigu/_new 2021-04-22 18:04:03.306514992 +0200
@@ -226,7 +226,6 @@
BUILD_OPTIONS_X64=" \
$OVMF_FLAGS \
-a X64 \
- -p OvmfPkg/OvmfPkgX64.dsc \
-b DEBUG \
-t $TOOL_CHAIN \
"
@@ -303,19 +302,26 @@
declare -A EXTRA_FLAGS_X64
EXTRA_FLAGS_X64=(
- [ovmf-x86_64]="-D FD_SIZE_2MB"
- [ovmf-x86_64-4m]="-D FD_SIZE_4MB -D NETWORK_TLS_ENABLE"
- [ovmf-x86_64-smm]="-D FD_SIZE_4MB -D NETWORK_TLS_ENABLE -D SMM_REQUIRE
-D EXCLUDE_SHELL"
+ [ovmf-x86_64]="-p OvmfPkg/OvmfPkgX64.dsc -D FD_SIZE_2MB"
+ [ovmf-x86_64-4m]="-p OvmfPkg/OvmfPkgX64.dsc -D FD_SIZE_4MB -D
NETWORK_TLS_ENABLE"
+ [ovmf-x86_64-smm]="-a IA32 -p OvmfPkg/OvmfPkgIa32X64.dsc -D FD_SIZE_4MB
-D NETWORK_TLS_ENABLE -D SMM_REQUIRE -D EXCLUDE_SHELL"
)
+declare -A OUTDIR_X64
+OUTDIR_X64=(
+ [ovmf-x86_64]="OvmfX64"
+ [ovmf-x86_64-4m]="OvmfX64"
+ [ovmf-x86_64-smm]="Ovmf3264"
+)
+
%ifnarch x86_64
# Assign the cross-compiler prefix
export ${TOOL_CHAIN}_BIN="x86_64-suse-linux-"
%endif
for flavor in ${FLAVORS_X64[@]}; do
build $BUILD_OPTIONS_X64 ${EXTRA_FLAGS_X64[$flavor]}
- cp Build/OvmfX64/DEBUG_*/FV/OVMF.fd $flavor.bin
- cp Build/OvmfX64/DEBUG_*/FV/OVMF_CODE.fd $flavor-code.bin
- cp Build/OvmfX64/DEBUG_*/FV/OVMF_VARS.fd $flavor-vars.bin
+ cp Build/${OUTDIR_X64[$flavor]}/DEBUG_*/FV/OVMF.fd $flavor.bin
+ cp Build/${OUTDIR_X64[$flavor]}/DEBUG_*/FV/OVMF_CODE.fd $flavor-code.bin
+ cp Build/${OUTDIR_X64[$flavor]}/DEBUG_*/FV/OVMF_VARS.fd $flavor-vars.bin
%ifarch x86_64
collect_x86_64_debug_files $flavor
++++++ ovmf-add-exclude-shell-flag.patch ++++++
--- /var/tmp/diff_new_pack.13eigu/_old 2021-04-22 18:04:03.422515171 +0200
+++ /var/tmp/diff_new_pack.13eigu/_new 2021-04-22 18:04:03.422515171 +0200
@@ -1,8 +1,22 @@
-Index: edk2-edk2-stable202011/OvmfPkg/OvmfPkgX64.fdf
+Index: edk2-edk2-stable202102/OvmfPkg/OvmfPkgX64.fdf
===================================================================
---- edk2-edk2-stable202011.orig/OvmfPkg/OvmfPkgX64.fdf
-+++ edk2-edk2-stable202011/OvmfPkg/OvmfPkgX64.fdf
-@@ -306,7 +306,9 @@ INF ShellPkg/DynamicCommand/TftpDynamic
+--- edk2-edk2-stable202102.orig/OvmfPkg/OvmfPkgX64.fdf
++++ edk2-edk2-stable202102/OvmfPkg/OvmfPkgX64.fdf
+@@ -310,7 +310,9 @@ INF ShellPkg/DynamicCommand/TftpDynamic
+ INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
+ INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
+ !endif
++!ifndef $(EXCLUDE_SHELL)
+ INF ShellPkg/Application/Shell/Shell.inf
++!endif
+
+ INF MdeModulePkg/Logo/LogoDxe.inf
+
+Index: edk2-edk2-stable202102/OvmfPkg/OvmfPkgIa32X64.fdf
+===================================================================
+--- edk2-edk2-stable202102.orig/OvmfPkg/OvmfPkgIa32X64.fdf
++++ edk2-edk2-stable202102/OvmfPkg/OvmfPkgIa32X64.fdf
+@@ -298,7 +298,9 @@ INF ShellPkg/DynamicCommand/TftpDynamic
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
!endif
