diff options
10 files changed, 150 insertions, 3 deletions
diff --git a/sysutils/ovmf/distinfo b/sysutils/ovmf/distinfo index 07cbaaf751e..655756a4268 100644 --- a/sysutils/ovmf/distinfo +++ b/sysutils/ovmf/distinfo @@ -1,9 +1,17 @@ -$NetBSD: distinfo,v 1.1 2017/10/23 14:21:57 maya Exp $ +$NetBSD: distinfo,v 1.2 2018/12/27 15:12:36 joerg Exp $ SHA1 (edk2/vUDK2017.tar.gz) = 5bfb90aedb958d747eb8803b2a60d416842a39d6 RMD160 (edk2/vUDK2017.tar.gz) = f8260ec115b2db0816cd9eb012b7ded77b151840 SHA512 (edk2/vUDK2017.tar.gz) = d941a661d570b0f69962105920b3524c4aac1f4883468914305eb68015148d70f6593c52872a79a6143cf87dc44e9ce2b8957834b4524cb8a04b12473c6d7d81 Size (edk2/vUDK2017.tar.gz) = 38737483 bytes -SHA1 (patch-BaseTools_Conf_tools__def.template) = a6486b74d0e9e39738e2979a6940a051e9d4521a +SHA1 (patch-BaseTools_Conf_tools__def.template) = 4d89f44d4b952bbbef17e544532bb17e972bed83 +SHA1 (patch-BaseTools_Source_C_Common_CommonLib.c) = a0728ef64f805587566c8cd7929798e337dbe02a SHA1 (patch-EmulatorPkg_build.sh) = 3ad9cc36a05d5763b1b6eba75ae58ac16751a6fe +SHA1 (patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h) = 6ef1e77f59cad6a25906c2cc01be2998e5992925 +SHA1 (patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c) = 3df87f9cd05f7c0751b7d4c3b6653995093dce74 +SHA1 (patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c) = c9338ed699679cf3aa5e0a1940612b2a410c2c82 +SHA1 (patch-MdePkg_Include_Library_UefiLib.h) = 72a8ec0ffe3ba4c29540c62f972bf63ee6dea5d9 +SHA1 (patch-MdePkg_Include_Protocol_S3SaveState.h) = 7e57635ff6690b605ba1539bdb09ef650fca6a6f +SHA1 (patch-MdePkg_Library_UefiLib_UefiLib.c) = 780edf9fd4b9c343f380046d6e9f8b4623c03127 SHA1 (patch-OvmfPkg_build.sh) = 7555880aaadfda4954b0bf8beab9a5441cc8374c +SHA1 (patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c) = cfc2430249f1af7a1d91b3248fba42fdbb2fd6fb diff --git a/sysutils/ovmf/patches/patch-BaseTools_Conf_tools__def.template b/sysutils/ovmf/patches/patch-BaseTools_Conf_tools__def.template index d9756e81045..47be839cfb5 100644 --- a/sysutils/ovmf/patches/patch-BaseTools_Conf_tools__def.template +++ b/sysutils/ovmf/patches/patch-BaseTools_Conf_tools__def.template @@ -1,4 +1,4 @@ -$NetBSD: patch-BaseTools_Conf_tools__def.template,v 1.1 2017/10/23 14:21:57 maya Exp $ +$NetBSD: patch-BaseTools_Conf_tools__def.template,v 1.2 2018/12/27 15:12:36 joerg Exp $ Avoid -flto (causes issues on netbsd) invoke 'gmake' rather than 'make' @@ -7,6 +7,15 @@ call 'ar' rather than 'gcc-ar' --- BaseTools/Conf/tools_def.template.orig 2017-06-13 08:26:05.000000000 +0000 +++ BaseTools/Conf/tools_def.template +@@ -4370,7 +4370,7 @@ DEFINE GCC_AARCH64_RC_FLAGS = -I +
+ DEFINE GCC44_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
+ DEFINE GCC44_IA32_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables
+-DEFINE GCC44_X64_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables
++DEFINE GCC44_X64_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables
+ DEFINE GCC44_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20
+ DEFINE GCC44_IA32_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
+ DEFINE GCC44_IA32_X64_DLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
@@ -4503,7 +4503,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = D *_UNIXGCC_*_*_FAMILY = GCC
*_UNIXGCC_*_*_BUILDRULEFAMILY = GCCLD
diff --git a/sysutils/ovmf/patches/patch-BaseTools_Source_C_Common_CommonLib.c b/sysutils/ovmf/patches/patch-BaseTools_Source_C_Common_CommonLib.c new file mode 100644 index 00000000000..2c09e6d305a --- /dev/null +++ b/sysutils/ovmf/patches/patch-BaseTools_Source_C_Common_CommonLib.c @@ -0,0 +1,13 @@ +$NetBSD: patch-BaseTools_Source_C_Common_CommonLib.c,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- BaseTools/Source/C/Common/CommonLib.c.orig 2018-12-25 23:50:04.866006429 +0000 ++++ BaseTools/Source/C/Common/CommonLib.c +@@ -574,7 +574,7 @@ char *strlwr(char *s)
+ {
+ char *p = s;
+ for(;*s;s++) {
+- *s = tolower(*s);
++ *s = tolower((unsigned char)*s);
+ }
+ return p;
+ }
diff --git a/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h b/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h new file mode 100644 index 00000000000..bebc0f8d079 --- /dev/null +++ b/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h @@ -0,0 +1,22 @@ +$NetBSD: patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h.orig 2018-12-26 00:09:51.626759961 +0000 ++++ MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h +@@ -75,7 +75,7 @@ EFI_STATUS
+ EFIAPI
+ BootScriptWrite (
+ IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
+- IN UINT16 OpCode,
++ IN int OpCode,
+ ...
+ );
+ /**
+@@ -112,7 +112,7 @@ BootScriptInsert (
+ IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
+ IN BOOLEAN BeforeOrAfter,
+ IN OUT EFI_S3_BOOT_SCRIPT_POSITION *Position OPTIONAL,
+- IN UINT16 OpCode,
++ IN int OpCode,
+ ...
+ );
+ /**
diff --git a/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c b/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c new file mode 100644 index 00000000000..9f432e9234e --- /dev/null +++ b/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c @@ -0,0 +1,22 @@ +$NetBSD: patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c.orig 2018-12-26 00:07:03.569298328 +0000 ++++ MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c +@@ -542,7 +542,7 @@ EFI_STATUS
+ EFIAPI
+ BootScriptWrite (
+ IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
+- IN UINT16 OpCode,
++ IN int OpCode,
+ ...
+ )
+ {
+@@ -697,7 +697,7 @@ BootScriptInsert (
+ IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
+ IN BOOLEAN BeforeOrAfter,
+ IN OUT EFI_S3_BOOT_SCRIPT_POSITION *Position OPTIONAL,
+- IN UINT16 OpCode,
++ IN int OpCode,
+ ...
+ )
+ {
diff --git a/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c b/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c new file mode 100644 index 00000000000..14496790462 --- /dev/null +++ b/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c @@ -0,0 +1,13 @@ +$NetBSD: patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c.orig 2018-12-26 00:13:45.733084228 +0000 ++++ MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c +@@ -1611,7 +1611,7 @@ CHAR8 *
+ EFIAPI
+ VariableGetBestLanguage (
+ IN CONST CHAR8 *SupportedLanguages,
+- IN BOOLEAN Iso639Language,
++ IN int Iso639Language,
+ ...
+ )
+ {
diff --git a/sysutils/ovmf/patches/patch-MdePkg_Include_Library_UefiLib.h b/sysutils/ovmf/patches/patch-MdePkg_Include_Library_UefiLib.h new file mode 100644 index 00000000000..c2084a1d75c --- /dev/null +++ b/sysutils/ovmf/patches/patch-MdePkg_Include_Library_UefiLib.h @@ -0,0 +1,13 @@ +$NetBSD: patch-MdePkg_Include_Library_UefiLib.h,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- MdePkg/Include/Library/UefiLib.h.orig 2018-12-26 00:00:48.975229808 +0000 ++++ MdePkg/Include/Library/UefiLib.h +@@ -818,7 +818,7 @@ CHAR8 *
+ EFIAPI
+ GetBestLanguage (
+ IN CONST CHAR8 *SupportedLanguages,
+- IN BOOLEAN Iso639Language,
++ IN int Iso639Language,
+ ...
+ );
+
diff --git a/sysutils/ovmf/patches/patch-MdePkg_Include_Protocol_S3SaveState.h b/sysutils/ovmf/patches/patch-MdePkg_Include_Protocol_S3SaveState.h new file mode 100644 index 00000000000..09ec480ba4e --- /dev/null +++ b/sysutils/ovmf/patches/patch-MdePkg_Include_Protocol_S3SaveState.h @@ -0,0 +1,22 @@ +$NetBSD: patch-MdePkg_Include_Protocol_S3SaveState.h,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- MdePkg/Include/Protocol/S3SaveState.h.orig 2018-12-26 00:12:22.128940406 +0000 ++++ MdePkg/Include/Protocol/S3SaveState.h +@@ -52,7 +52,7 @@ typedef
+ EFI_STATUS
+ (EFIAPI *EFI_S3_SAVE_STATE_WRITE)(
+ IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
+- IN UINT16 OpCode,
++ IN int OpCode,
+ ...
+ );
+
+@@ -98,7 +98,7 @@ EFI_STATUS
+ IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
+ IN BOOLEAN BeforeOrAfter,
+ IN OUT EFI_S3_BOOT_SCRIPT_POSITION *Position OPTIONAL,
+- IN UINT16 OpCode,
++ IN int OpCode,
+ ...
+ );
+
diff --git a/sysutils/ovmf/patches/patch-MdePkg_Library_UefiLib_UefiLib.c b/sysutils/ovmf/patches/patch-MdePkg_Library_UefiLib_UefiLib.c new file mode 100644 index 00000000000..90ee5aedfd3 --- /dev/null +++ b/sysutils/ovmf/patches/patch-MdePkg_Library_UefiLib_UefiLib.c @@ -0,0 +1,13 @@ +$NetBSD: patch-MdePkg_Library_UefiLib_UefiLib.c,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- MdePkg/Library/UefiLib/UefiLib.c.orig 2018-12-25 23:59:03.914734061 +0000 ++++ MdePkg/Library/UefiLib/UefiLib.c +@@ -1514,7 +1514,7 @@ CHAR8 *
+ EFIAPI
+ GetBestLanguage (
+ IN CONST CHAR8 *SupportedLanguages,
+- IN BOOLEAN Iso639Language,
++ IN int Iso639Language,
+ ...
+ )
+ {
diff --git a/sysutils/ovmf/patches/patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c b/sysutils/ovmf/patches/patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c new file mode 100644 index 00000000000..e0ba9037c15 --- /dev/null +++ b/sysutils/ovmf/patches/patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c @@ -0,0 +1,12 @@ +$NetBSD: patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c,v 1.1 2018/12/27 15:12:36 joerg Exp $ + +--- UefiCpuPkg/Library/MpInitLib/DxeMpLib.c.orig 2018-12-26 00:02:30.198168128 +0000 ++++ UefiCpuPkg/Library/MpInitLib/DxeMpLib.c +@@ -244,7 +244,6 @@ GetProtectedModeCS (
+ }
+ GdtEntry++;
+ }
+- ASSERT (Index != -1);
+ return Index * 8;
+ }
+
|