diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-01 11:25:25 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-14 18:43:09 +0000 |
| commit | e40cae0619e83b9cad2c4c904992697c0eb39a40 (patch) | |
| tree | 7cf96acc30835f9ec10207134c80f7ad614bd735 /meta-intel-extras/recipes | |
| parent | 9dfd6b40ffd5c371aa711ccea651e929bee63c97 (diff) | |
| download | meta-boot2qt-e40cae0619e83b9cad2c4c904992697c0eb39a40.tar.gz | |
Update image creation recipes, appends etc. to be poky 2.2 compliant
DEPLOY_DIR_IMAGE macro has been replaced with IMGDEPLOYDIR in poky 2.2.
Update all instances to make image creation work.
Change-Id: I3740730ded84650d3a3a51b85c77ed4fef863a8a
Reviewed-by: Samuli Piippo <samuli.piippo@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 0104aab..13f6c21 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', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" | 53 | microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${IMGDEPLOYDIR}/microcode.cpio ', '', d)}" |
| 54 | cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs | 54 | cat ${microcode} ${IMGDEPLOYDIR}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs |
| 55 | chmod 0644 ${D}/boot/initramfs | 55 | chmod 0644 ${D}/boot/initramfs |
| 56 | } | 56 | } |
| 57 | 57 | ||