From 189b6e56ab20dc05b4221ed804fd85c69b614b51 Mon Sep 17 00:00:00 2001 From: Lans Zhang Date: Mon, 24 Jul 2017 09:32:55 +0800 Subject: shim: update to the latest Signed-off-by: Lans Zhang --- .../shim/shim/0013-httpboot-fix-OVMF-crash.patch | 32 ---------------------- meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb | 5 ++-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 meta-efi-secure-boot/recipes-bsp/shim/shim/0013-httpboot-fix-OVMF-crash.patch (limited to 'meta-efi-secure-boot') 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 @@ -From 9c1636249d1bb8e0e7d108309b2747c6ede62cbb Mon Sep 17 00:00:00 2001 -From: Lans Zhang -Date: Fri, 30 Jun 2017 15:50:24 +0800 -Subject: [PATCH] httpboot: fix OVMF crash - -This is a typical typo. The free operation should be done if uri -was allocated. - -Signed-off-by: Lans Zhang ---- - httpboot.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/httpboot.c b/httpboot.c -index f8fbc73..e4657c1 100644 ---- a/httpboot.c -+++ b/httpboot.c -@@ -110,8 +110,10 @@ find_httpboot (EFI_HANDLE device) - URI_DEVICE_PATH *UriNode; - UINTN uri_size; - -- if (!uri) -+ if (uri) { - FreePool(uri); -+ uri = NULL; -+ } - - devpath = DevicePathFromHandle(device); - if (!devpath) { --- -2.7.5 - 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 \ relocate and execute the binary." HOMEPAGE = "https://github.com/rhinstaller/shim.git" SECTION = "bootloaders" + LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b92e63892681ee4e8d27e7a7e87ef2bc" @@ -28,15 +29,13 @@ SRC_URI = "\ file://0010-Makefile-do-not-sign-the-efi-file.patch \ file://0011-Update-verification_method-if-the-loaded-image-is-si.patch;apply=0 \ file://0012-netboot-replace-the-depreciated-EFI_PXE_BASE_CODE.patch \ - file://0013-httpboot-fix-OVMF-crash.patch \ " SRC_URI_append_x86-64 = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'msft', \ 'file://shim' + d.expand('EFI_ARCH') + '.efi.signed file://LICENSE' \ if uks_signing_model(d) == 'sample' else '', '', d)} \ " - -SRCREV = "919c17a45fe722dcc2b9bdaba538c738f97f88cd" +SRCREV = "7d745e49c02146bae75027d53f24c04175f6e848" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf