diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-21 16:56:34 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-22 15:03:37 +0000 |
| commit | 5ea1d03935da72460401ec000a8be0334100d19e (patch) | |
| tree | 40d36d5e45b353f003839357b9c35935190f3519 /meta-intel-extras/recipes | |
| parent | 160bd85916f723ecdde8b0514c8a67fdeb4dfe73 (diff) | |
| download | meta-boot2qt-5ea1d03935da72460401ec000a8be0334100d19e.tar.gz | |
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>
Diffstat (limited to 'meta-intel-extras/recipes')
| -rw-r--r-- | meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
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() { | |||
| 50 | install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/ | 50 | install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/ |
| 51 | 51 | ||
| 52 | # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt | 52 | # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt |
| 53 | microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${IMGDEPLOYDIR}/microcode.cpio ', '', d)}" | 53 | microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" |
| 54 | cat ${microcode} ${IMGDEPLOYDIR}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs | 54 | cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs |
| 55 | chmod 0644 ${D}/boot/initramfs | 55 | chmod 0644 ${D}/boot/initramfs |
| 56 | } | 56 | } |
| 57 | 57 | ||