From 2dbeaf315ff9cf8cce1d0a3276fd561163db6237 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 13 Feb 2018 17:06:51 +0100 Subject: Fix minor ovmf compilation bug only present in pyro. This does not appear to be a problem on rocko, and it wasn't a problem for me on pyro when I last checked less than a month ago. It actually only broke the native build. This has been fixed upstream at some point, anyway. --- ...e-c-string-with-NULL-instead-of-a-literal.patch | 25 ++++++++++++++++++++++ recipes-core/ovmf/ovmf_%.bbappend | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 recipes-core/ovmf/files/0001-Compare-c-string-with-NULL-instead-of-a-literal.patch create mode 100644 recipes-core/ovmf/ovmf_%.bbappend diff --git a/recipes-core/ovmf/files/0001-Compare-c-string-with-NULL-instead-of-a-literal.patch b/recipes-core/ovmf/files/0001-Compare-c-string-with-NULL-instead-of-a-literal.patch new file mode 100644 index 0000000..6bdaf7e --- /dev/null +++ b/recipes-core/ovmf/files/0001-Compare-c-string-with-NULL-instead-of-a-literal.patch @@ -0,0 +1,25 @@ +From 6c730f3da7490ffbba5ad17af29ca44ed167cbfc Mon Sep 17 00:00:00 2001 +From: Patrick Vacek +Date: Tue, 13 Feb 2018 16:38:15 +0100 +Subject: [PATCH] Compare c-string with NULL instead of a literal. + +--- + BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp +index 3ca57ed741..4fa066dd9f 100644 +--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp ++++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp +@@ -3372,7 +3372,7 @@ CVfrStringDB::GetVarStoreNameFormStringId ( + UINT8 BlockType; + EFI_HII_STRING_PACKAGE_HDR *PkgHeader; + +- if (mStringFileName == '\0' ) { ++ if (mStringFileName == NULL ) { + return NULL; + } + +-- +2.14.1 + diff --git a/recipes-core/ovmf/ovmf_%.bbappend b/recipes-core/ovmf/ovmf_%.bbappend new file mode 100644 index 0000000..142fc53 --- /dev/null +++ b/recipes-core/ovmf/ovmf_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append = "file://0001-Compare-c-string-with-NULL-instead-of-a-literal.patch" -- cgit v1.2.3-54-g00ecf