summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-04-03 12:29:38 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2018-04-03 12:29:38 +0200
commitcd92619363c1c10794e9c171f189c4f0f129d83f (patch)
treea8adf61067b1507d29d1f4051e95c53e4865f0ac
parent505a7c8570ab7182372bef66032eac4786d83595 (diff)
downloadmeta-updater-cd92619363c1c10794e9c171f189c4f0f129d83f.tar.gz
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.
-rw-r--r--recipes-core/ovmf/files/0001-Compare-c-string-with-NULL-instead-of-a-literal.patch25
-rw-r--r--recipes-core/ovmf/ovmf_%.bbappend3
2 files changed, 0 insertions, 28 deletions
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 @@
1From 6c730f3da7490ffbba5ad17af29ca44ed167cbfc Mon Sep 17 00:00:00 2001
2From: Patrick Vacek <patrickvacek@gmail.com>
3Date: Tue, 13 Feb 2018 16:38:15 +0100
4Subject: [PATCH] Compare c-string with NULL instead of a literal.
5
6---
7 BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
11index 3ca57ed741..4fa066dd9f 100644
12--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
13+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
14@@ -3372,7 +3372,7 @@ CVfrStringDB::GetVarStoreNameFormStringId (
15 UINT8 BlockType;
16 EFI_HII_STRING_PACKAGE_HDR *PkgHeader;
17
18- if (mStringFileName == '\0' ) {
19+ if (mStringFileName == NULL ) {
20 return NULL;
21 }
22
23--
242.14.1
25
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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
2
3SRC_URI_append = "file://0001-Compare-c-string-with-NULL-instead-of-a-literal.patch"