From cd92619363c1c10794e9c171f189c4f0f129d83f Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 3 Apr 2018 12:29:38 +0200 Subject: Revert "Fix minor ovmf compilation bug only present in pyro." This reverts commit 2dbeaf315ff9cf8cce1d0a3276fd561163db6237. It has since been added to poky (dd44b2c92f40d0b010336c8af8ea337763e55cf9), so it is no longer necessary to include it here. --- ...e-c-string-with-NULL-instead-of-a-literal.patch | 25 ---------------------- recipes-core/ovmf/ovmf_%.bbappend | 3 --- 2 files changed, 28 deletions(-) delete mode 100644 recipes-core/ovmf/files/0001-Compare-c-string-with-NULL-instead-of-a-literal.patch delete 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 deleted file mode 100644 index 6bdaf7e..0000000 --- a/recipes-core/ovmf/files/0001-Compare-c-string-with-NULL-instead-of-a-literal.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 142fc53..0000000 --- a/recipes-core/ovmf/ovmf_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -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