summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Panteleev2017-09-08 06:04:58 +0000
committerVladimir Panteleev2017-09-08 06:05:47 +0000
commite18651684ebc94d5bfced14ff67b49bbf326b90d (patch)
tree565aab1e87b43962b07bfd993b31e5610464a8d9
parent50a05a0af4a901bbf212b7ae256aef682796c4f0 (diff)
downloadaur-e18651684ebc94d5bfced14ff67b49bbf326b90d.tar.gz
Apply compilation fix patch only instead of merging master
-rw-r--r--.SRCINFO10
-rw-r--r--MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch43
-rw-r--r--PKGBUILD14
3 files changed, 56 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 38b3566d374..db4501eb61e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Aug 15 04:57:06 UTC 2017
+# Fri Sep 8 06:03:56 UTC 2017
pkgbase = edk2-ovmf-macboot-git
pkgdesc = edk2 UEFI firmware with macOS compatibility fixes
- pkgver = r22104.9bd03459f1
- pkgrel = 2
+ pkgver = r21417.30f2b3985d
+ pkgrel = 1
url = https://www.contrib.andrew.cmu.edu/~somlo/OSXKVM/
arch = any
license = BSD
@@ -12,7 +12,9 @@ pkgbase = edk2-ovmf-macboot-git
makedepends = iasl
options = !makeflags
source = git+https://github.com/gsomlo/edk2#branch=macboot
- md5sums = SKIP
+ source = MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch
+ sha256sums = SKIP
+ sha256sums = 64dcc77b7e9abe219d8b82873c826077e51c26d87d5bd17407d19e1c71fca6c7
pkgname = edk2-ovmf-macboot-git
diff --git a/MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch b/MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch
new file mode 100644
index 00000000000..7008d6f4671
--- /dev/null
+++ b/MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch
@@ -0,0 +1,43 @@
+From fe4a28ccbfd33cae9e1f56b174d46b4eb2329efd Mon Sep 17 00:00:00 2001
+From: Dandan Bi <dandan.bi@intel.com>
+Date: Sat, 1 Apr 2017 10:31:14 +0800
+Subject: [PATCH] MdeModulePkg/UefiHiiLib:Fix incorrect comparison expression
+
+Fix the incorrect comparison between pointer and constant zero character.
+
+https://bugzilla.tianocore.org/show_bug.cgi?id=416
+
+V2: The pointer StringPtr points to a string returned
+by ExtractConfig/ExportConfig, if it is NULL, function
+InternalHiiIfrValueAction will return FALSE. So in
+current usage model, the StringPtr can not be NULL before
+using it, so we can add ASSERT here.
+
+Cc: Eric Dong <eric.dong@intel.com>
+Cc: Liming Gao <liming.gao@intel.com>
+Contributed-under: TianoCore Contribution Agreement 1.0
+Signed-off-by: Dandan Bi <dandan.bi@intel.com>
+Reviewed-by: Eric Dong <eric.dong@intel.com>
+---
+ MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+index a2abf26980..cd0cd35a0f 100644
+--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
++++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+@@ -2201,8 +2201,9 @@ InternalHiiIfrValueAction (
+ }
+
+ StringPtr = ConfigAltResp;
+-
+- while (StringPtr != L'\0') {
++ ASSERT (StringPtr != NULL);
++
++ while (*StringPtr != L'\0') {
+ //
+ // 1. Find <ConfigHdr> GUID=...&NAME=...&PATH=...
+ //
+--
+2.14.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 540909779b2..84203ccf385 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Vladimir Panteleev <arch-pkg at thecybershadow.net>
pkgname=edk2-ovmf-macboot-git
-pkgver=r22104.9bd03459f1
-pkgrel=2
+pkgver=r21417.30f2b3985d
+pkgrel=1
pkgdesc="edk2 UEFI firmware with macOS compatibility fixes"
arch=('any')
url="https://www.contrib.andrew.cmu.edu/~somlo/OSXKVM/"
@@ -10,8 +10,10 @@ license=('BSD')
depends=()
makedepends=('git' 'nasm' 'iasl')
optdepends=()
-source=("git+https://github.com/gsomlo/edk2#branch=macboot")
-md5sums=('SKIP')
+source=("git+https://github.com/gsomlo/edk2#branch=macboot"
+ 'MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch')
+sha256sums=('SKIP'
+ '64dcc77b7e9abe219d8b82873c826077e51c26d87d5bd17407d19e1c71fca6c7')
options=('!makeflags')
pkgver() {
@@ -21,9 +23,7 @@ pkgver() {
prepare() {
cd "$srcdir/edk2"
- git remote add tianocore git@github.com:tianocore/edk2.git || true
- git fetch tianocore
- git merge --no-edit tianocore/master
+ patch -N -p1 -i "${srcdir}/MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch"
}
build() {