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 | |
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>
-rw-r--r-- | meta-intel-extras/classes/image_dd_efi.bbclass | 2 | ||||
-rw-r--r-- | meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend | 4 | ||||
-rw-r--r-- | 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() { | |||
38 | 38 | ||
39 | mkdir -p ${WORKDIR}/EFI/BOOT/ | 39 | mkdir -p ${WORKDIR}/EFI/BOOT/ |
40 | # Path where EFI firmware searches for EFI executable | 40 | # Path where EFI firmware searches for EFI executable |
41 | cp ${IMGDEPLOYDIR}/bootx64.efi ${WORKDIR}/EFI/BOOT/ | 41 | cp ${DEPLOY_DIR_IMAGE}/bootx64.efi ${WORKDIR}/EFI/BOOT/ |
42 | mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI | 42 | mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI |
43 | } | 43 | } |
44 | 44 | ||
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 | ||
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 @@ | |||
53 | groups="notdefault,external,fsl,smx6"/> | 53 | groups="notdefault,external,fsl,smx6"/> |
54 | <project name="meta-intel" | 54 | <project name="meta-intel" |
55 | remote="intel" | 55 | remote="intel" |
56 | revision="b8c199201ffe026485a14e1fcfc398e2b3551512" | 56 | revision="6add41510412ca196efb3e4f949d403a8b6f35d7" |
57 | path="sources/meta-intel" | 57 | path="sources/meta-intel" |
58 | groups="notdefault,external,intel"/> | 58 | groups="notdefault,external,intel"/> |
59 | <project name="meta-renesas" | 59 | <project name="meta-renesas" |