shim: sync up with upstream

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/meta-efi-secure-boot/recipes-bsp/shim/shim/0008-Fix-the-world-build-failure-due-to-the-missing-rule-.patch b/meta-efi-secure-boot/recipes-bsp/shim/shim/0008-Fix-the-world-build-failure-due-to-the-missing-rule-.patch
index ddaa9f9..c53a52f 100644
--- a/meta-efi-secure-boot/recipes-bsp/shim/shim/0008-Fix-the-world-build-failure-due-to-the-missing-rule-.patch
+++ b/meta-efi-secure-boot/recipes-bsp/shim/shim/0008-Fix-the-world-build-failure-due-to-the-missing-rule-.patch
@@ -1,7 +1,7 @@
-From 508a31905aff2d271f1b82a5a36a614113b7fe85 Mon Sep 17 00:00:00 2001
+From 3b4fe6b2eda92c78c80a2c0c1ab5625fd0920811 Mon Sep 17 00:00:00 2001
 From: Lans Zhang <jia.zhang@windriver.com>
-Date: Mon, 6 Jun 2016 16:28:09 +0800
-Subject: [PATCH 08/11] Fix the world build failure due to the missing rule of
+Date: Thu, 3 Aug 2017 09:53:37 +0800
+Subject: [PATCH] Fix the world build failure due to the missing rule of
  generating shim.key
 
 Upstream-Status: Pending
@@ -18,18 +18,18 @@ Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 58b4b4c..0da5e6c 100644
+index 063578a..96bdf14 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -110,7 +110,7 @@ endif
+@@ -125,7 +125,7 @@ FALLBACK_SRCS = $(foreach source,$(ORIG_FALLBACK_SRCS),$(TOPDIR)/$(source))
  
  all: $(TARGET)
  
 -shim.crt:
 +shim.crt shim.key:
-        ./make-certs shim shim@xn--u4h.net all codesign 1.3.6.1.4.1.311.10.3.1 </dev/null
+        $(TOPDIR)/make-certs shim shim@xn--u4h.net all codesign 1.3.6.1.4.1.311.10.3.1 </dev/null
  
  shim.cer: shim.crt
 -- 
-2.11.0
+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 3c34b7b..3fe02a0 100644
--- a/meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb
+++ b/meta-efi-secure-boot/recipes-bsp/shim/shim_git.bb
@@ -39,7 +39,7 @@ SRC_URI_append_x86-64 = "\
                          'file://shim' + d.expand('EFI_ARCH') + '.efi.signed file://LICENSE' \
                          if uks_signing_model(d) == 'sample' else '', '', d)} \
 "
-SRCREV = "7d745e49c02146bae75027d53f24c04175f6e848"
+SRCREV = "a8f3dc82be8e16d24ceab416c1b0af897c083f56"
 
 S = "${WORKDIR}/git"