diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 20:55:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-07 17:07:57 +0000 |
commit | 333b79aea38385dfb52fcd24e121bca7d27e68dd (patch) | |
tree | 514de330c9a13f1f592d30cbaee2d7db1c5f6219 /meta/recipes-core/ovmf | |
parent | 5a12c6ee93df7715d6eb13c7af1e62ffa123f5f2 (diff) | |
download | poky-333b79aea38385dfb52fcd24e121bca7d27e68dd.tar.gz |
ovmf: Fix build with gcc7
backport a patch which fixing warnings with gcc7
(From OE-Core rev: 9c75151116aa293dc8567c237d7e4da5bdec90e3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 74fb6043f6d74b84f7efc282ac6cfc54fcb71882)
Fixed up patch to apply agains this version
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ovmf')
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch | 39 | ||||
-rw-r--r-- | meta/recipes-core/ovmf/ovmf_git.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch new file mode 100644 index 0000000000..fcd7a46908 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 73692710d50da1f421b0e6ddff784ca3135389b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dandan Bi <dandan.bi@intel.com> | ||
3 | Date: Sat, 1 Apr 2017 10:31:14 +0800 | ||
4 | Subject: [PATCH] MdeModulePkg/UefiHiiLib:Fix incorrect comparison expression | ||
5 | |||
6 | Fix the incorrect comparison between pointer and constant zero character. | ||
7 | |||
8 | https://bugzilla.tianocore.org/show_bug.cgi?id=416 | ||
9 | |||
10 | V2: The pointer StringPtr points to a string returned | ||
11 | by ExtractConfig/ExportConfig, if it is NULL, function | ||
12 | InternalHiiIfrValueAction will return FALSE. So in | ||
13 | current usage model, the StringPtr can not be NULL before | ||
14 | using it, so we can add ASSERT here. | ||
15 | |||
16 | Cc: Eric Dong <eric.dong@intel.com> | ||
17 | Cc: Liming Gao <liming.gao@intel.com> | ||
18 | Contributed-under: TianoCore Contribution Agreement 1.0 | ||
19 | Signed-off-by: Dandan Bi <dandan.bi@intel.com> | ||
20 | Reviewed-by: Eric Dong <eric.dong@intel.com> | ||
21 | --- | ||
22 | Upstream-Status: Backport | ||
23 | |||
24 | MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 5 +++-- | ||
25 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
26 | |||
27 | Index: git/MdeModulePkg/Library/UefiHiiLib/HiiLib.c | ||
28 | =================================================================== | ||
29 | --- git.orig/MdeModulePkg/Library/UefiHiiLib/HiiLib.c | ||
30 | +++ git/MdeModulePkg/Library/UefiHiiLib/HiiLib.c | ||
31 | @@ -2180,6 +2180,8 @@ InternalHiiIfrValueAction ( | ||
32 | } | ||
33 | |||
34 | StringPtr = ConfigAltResp; | ||
35 | + | ||
36 | + ASSERT (StringPtr != NULL); | ||
37 | |||
38 | while (StringPtr != L'\0') { | ||
39 | // | ||
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 73fdfc6239..9d988e9d41 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ | |||
14 | file://0002-ovmf-update-path-to-native-BaseTools.patch \ | 14 | file://0002-ovmf-update-path-to-native-BaseTools.patch \ |
15 | file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ | 15 | file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ |
16 | file://VfrCompile-increase-path-length-limit.patch \ | 16 | file://VfrCompile-increase-path-length-limit.patch \ |
17 | file://0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI_append_class-target = " \ | 20 | SRC_URI_append_class-target = " \ |