summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Panteleev2017-12-07 21:52:23 +0000
committerVladimir Panteleev2017-12-07 21:52:23 +0000
commitb2dcf9c040fb9e7088950c5adcec83c05d9bb549 (patch)
tree5f7602bfc8fd5673a6ca24b0023084a100c2b63e
parente18651684ebc94d5bfced14ff67b49bbf326b90d (diff)
downloadaur-b2dcf9c040fb9e7088950c5adcec83c05d9bb549.tar.gz
Switch to new gls-miscopt branch
-rw-r--r--.SRCINFO10
-rw-r--r--MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch43
-rw-r--r--PKGBUILD15
3 files changed, 8 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index db4501eb61e..1e2bcf19599 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Sep 8 06:03:56 UTC 2017
+# Wed Dec 6 22:29:54 UTC 2017
pkgbase = edk2-ovmf-macboot-git
- pkgdesc = edk2 UEFI firmware with macOS compatibility fixes
- pkgver = r21417.30f2b3985d
+ pkgdesc = edk2 UEFI firmware with macOS compatibility fixes (gsomlo's miscopt branch)
+ pkgver = r22749.471f6d19d7
pkgrel = 1
url = https://www.contrib.andrew.cmu.edu/~somlo/OSXKVM/
arch = any
@@ -11,10 +11,8 @@ pkgbase = edk2-ovmf-macboot-git
makedepends = nasm
makedepends = iasl
options = !makeflags
- source = git+https://github.com/gsomlo/edk2#branch=macboot
- source = MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch
+ source = git+https://github.com/gsomlo/edk2#branch=gls-miscopt
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
deleted file mode 100644
index 7008d6f4671..00000000000
--- a/MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 84203ccf385..977cc798f3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,17 @@
# Maintainer: Vladimir Panteleev <arch-pkg at thecybershadow.net>
pkgname=edk2-ovmf-macboot-git
-pkgver=r21417.30f2b3985d
+pkgver=r22749.471f6d19d7
pkgrel=1
-pkgdesc="edk2 UEFI firmware with macOS compatibility fixes"
+pkgdesc="edk2 UEFI firmware with macOS compatibility fixes (gsomlo's miscopt branch)"
arch=('any')
url="https://www.contrib.andrew.cmu.edu/~somlo/OSXKVM/"
license=('BSD')
depends=()
makedepends=('git' 'nasm' 'iasl')
optdepends=()
-source=("git+https://github.com/gsomlo/edk2#branch=macboot"
- 'MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch')
-sha256sums=('SKIP'
- '64dcc77b7e9abe219d8b82873c826077e51c26d87d5bd17407d19e1c71fca6c7')
+source=("git+https://github.com/gsomlo/edk2#branch=gls-miscopt")
+sha256sums=('SKIP')
options=('!makeflags')
pkgver() {
@@ -21,11 +19,6 @@ pkgver() {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "$srcdir/edk2"
- patch -N -p1 -i "${srcdir}/MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch"
-}
-
build() {
cd "$srcdir/edk2"
make -C BaseTools