summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLans Zhang <jia.zhang@windriver.com>2017-07-24 09:32:55 +0800
committerLans Zhang <jia.zhang@windriver.com>2017-07-24 09:32:55 +0800
commit189b6e56ab20dc05b4221ed804fd85c69b614b51 (patch)
treee581a9b5c829524ea6cbe1cf41434b3374c8b378
parent1212f2c97402c8960a28f19b3b06ac1fe4744768 (diff)
downloadmeta-secure-core-189b6e56ab20dc05b4221ed804fd85c69b614b51.tar.gz
shim: update to the latest
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
-rw-r--r--meta-efi-secure-boot/recipes-bsp/shim/shim/0013-httpboot-fix-OVMF-crash.patch32
-rw-r--r--meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb5
2 files changed, 2 insertions, 35 deletions
diff --git a/meta-efi-secure-boot/recipes-bsp/shim/shim/0013-httpboot-fix-OVMF-crash.patch b/meta-efi-secure-boot/recipes-bsp/shim/shim/0013-httpboot-fix-OVMF-crash.patch
deleted file mode 100644
index 539dc36..0000000
--- a/meta-efi-secure-boot/recipes-bsp/shim/shim/0013-httpboot-fix-OVMF-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 9c1636249d1bb8e0e7d108309b2747c6ede62cbb Mon Sep 17 00:00:00 2001
2From: Lans Zhang <jia.zhang@windriver.com>
3Date: Fri, 30 Jun 2017 15:50:24 +0800
4Subject: [PATCH] httpboot: fix OVMF crash
5
6This is a typical typo. The free operation should be done if uri
7was allocated.
8
9Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
10---
11 httpboot.c | 4 +++-
12 1 file changed, 3 insertions(+), 1 deletion(-)
13
14diff --git a/httpboot.c b/httpboot.c
15index f8fbc73..e4657c1 100644
16--- a/httpboot.c
17+++ b/httpboot.c
18@@ -110,8 +110,10 @@ find_httpboot (EFI_HANDLE device)
19 URI_DEVICE_PATH *UriNode;
20 UINTN uri_size;
21
22- if (!uri)
23+ if (uri) {
24 FreePool(uri);
25+ uri = NULL;
26+ }
27
28 devpath = DevicePathFromHandle(device);
29 if (!devpath) {
30--
312.7.5
32
diff --git a/meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb b/meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb
index 4863843..36e691f 100644
--- a/meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb
+++ b/meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb
@@ -9,6 +9,7 @@ and if the binary or signing key are not blacklisted then shim will \
9relocate and execute the binary." 9relocate and execute the binary."
10HOMEPAGE = "https://github.com/rhinstaller/shim.git" 10HOMEPAGE = "https://github.com/rhinstaller/shim.git"
11SECTION = "bootloaders" 11SECTION = "bootloaders"
12
12LICENSE = "BSD-2-Clause" 13LICENSE = "BSD-2-Clause"
13LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b92e63892681ee4e8d27e7a7e87ef2bc" 14LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b92e63892681ee4e8d27e7a7e87ef2bc"
14 15
@@ -28,15 +29,13 @@ SRC_URI = "\
28 file://0010-Makefile-do-not-sign-the-efi-file.patch \ 29 file://0010-Makefile-do-not-sign-the-efi-file.patch \
29 file://0011-Update-verification_method-if-the-loaded-image-is-si.patch;apply=0 \ 30 file://0011-Update-verification_method-if-the-loaded-image-is-si.patch;apply=0 \
30 file://0012-netboot-replace-the-depreciated-EFI_PXE_BASE_CODE.patch \ 31 file://0012-netboot-replace-the-depreciated-EFI_PXE_BASE_CODE.patch \
31 file://0013-httpboot-fix-OVMF-crash.patch \
32" 32"
33SRC_URI_append_x86-64 = "\ 33SRC_URI_append_x86-64 = "\
34 ${@bb.utils.contains('DISTRO_FEATURES', 'msft', \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'msft', \
35 'file://shim' + d.expand('EFI_ARCH') + '.efi.signed file://LICENSE' \ 35 'file://shim' + d.expand('EFI_ARCH') + '.efi.signed file://LICENSE' \
36 if uks_signing_model(d) == 'sample' else '', '', d)} \ 36 if uks_signing_model(d) == 'sample' else '', '', d)} \
37" 37"
38 38SRCREV = "7d745e49c02146bae75027d53f24c04175f6e848"
39SRCREV = "919c17a45fe722dcc2b9bdaba538c738f97f88cd"
40 39
41S = "${WORKDIR}/git" 40S = "${WORKDIR}/git"
42 41