3 files changed, 13 insertions, 11 deletions

diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 9cb2075..1f5fd9f 100644
--- a/meta-intel-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -33,15 +33,6 @@ LICENSE = "CLOSED"
 inherit image_dd
 
 EXTRA_IMAGECMD_ext3 += "-L rootfs"
-IMAGE_DEPENDS_ext3 += "initramfs-basic:do_rootfs"
-
-IMAGE_CMD_ext3_prepend() {
-
-    # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt
-    microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
-    cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${IMAGE_ROOTFS}/boot/initramfs
-    chmod 0644 ${IMAGE_ROOTFS}/boot/initramfs
-}
 
 do_populate_boot() {
 
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 8a223fe..0104aab 100644
--- a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -30,6 +30,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://grub.cfg"
 
+do_install[depends] += " \
+    virtual/kernel:do_deploy \
+    ${INITRAMFS_IMAGE}:do_rootfs \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', 'intel-microcode:do_deploy', '', d)} \
+"
+
 do_deploy_prepend() {
 
 cat > ${WORKDIR}/cfg <<EOF
@@ -42,7 +48,12 @@ do_install_append() {
 
     install -d ${D}/boot/grub2/
     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', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
+    cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs
+    chmod 0644 ${D}/boot/initramfs
 }
 
 PACKAGES += "${PN}-config"
-FILES_${PN}-config = "/boot/grub2/"
+FILES_${PN}-config = "/boot/grub2/ /boot/initramfs"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 96189ea..af7e1f2 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,7 +31,7 @@
 set -x
 set -e
 
-RELEASE=5.7
+RELEASE=5.8
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
 if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then