From 5ea1d03935da72460401ec000a8be0334100d19e Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 21 Mar 2017 16:56:34 +0200
Subject: meta-intel: update to morty branch

Fix grub-efi build by using correct variable for image deploy dir.

Change-Id: I1298f58dbedbaa9af9b67908a2c99d0c288cecdd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 meta-intel-extras/classes/image_dd_efi.bbclass        | 2 +-
 meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend | 4 ++--
 scripts/manifest.xml                                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 83e8153..1f5fd9f 100644
--- a/meta-intel-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -38,7 +38,7 @@ do_populate_boot() {
 
     mkdir -p ${WORKDIR}/EFI/BOOT/
     # Path where EFI firmware searches for EFI executable
-    cp ${IMGDEPLOYDIR}/bootx64.efi ${WORKDIR}/EFI/BOOT/
+    cp ${DEPLOY_DIR_IMAGE}/bootx64.efi ${WORKDIR}/EFI/BOOT/
     mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI
 }
 
diff --git a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
index 13f6c21..0104aab 100644
--- a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -50,8 +50,8 @@ do_install_append() {
     install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/
 
     # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt
-    microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${IMGDEPLOYDIR}/microcode.cpio ', '', d)}"
-    cat ${microcode} ${IMGDEPLOYDIR}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs
+    microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
+    cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs
     chmod 0644 ${D}/boot/initramfs
 }
 
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 15c2a9d..49f9ce4 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -53,7 +53,7 @@
            groups="notdefault,external,fsl,smx6"/>
   <project name="meta-intel"
            remote="intel"
-           revision="b8c199201ffe026485a14e1fcfc398e2b3551512"
+           revision="6add41510412ca196efb3e4f949d403a8b6f35d7"
            path="sources/meta-intel"
            groups="notdefault,external,intel"/>
   <project name="meta-renesas"
-- 
cgit v1.2.3-54-g00ecf