From 8f23a8620f7d412268ac12f8f62a60ceeba2c14d Mon Sep 17 00:00:00 2001 From: Diorcet Yann Date: Fri, 21 Feb 2025 09:28:00 +0100 Subject: [PATCH] Fix grub-efi image when prefix is used --- .../recipes-bsp/grub/grub-efi-efi-secure-boot.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc index 58144616..5722346b 100644 --- a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc +++ b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc @@ -138,10 +138,10 @@ do_install:append:class-target() { install -d "${D}${EFI_BOOT_PATH}/${GRUB_TARGET}-efi" grub-mkimage -c ../cfg -p "${GRUB_PREFIX_DIR}" -d "./grub-core" \ - -O "${GRUB_TARGET}-efi" -o "${B}/${GRUB_IMAGE}" \ + -O "${GRUB_TARGET}-efi" -o "${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}" \ ${GRUB_BUILDIN} ${GRUB_SECURE_BUILDIN} - install -m 0644 "${B}/${GRUB_IMAGE}" "${D}${EFI_BOOT_PATH}/${GRUB_IMAGE}" + install -m 0644 "${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}" "${D}${EFI_BOOT_PATH}/${GRUB_IMAGE}" # Install the modules to grub-efi's search path make -C grub-core install DESTDIR="${D}${EFI_BOOT_PATH}" pkglibdir="" @@ -195,7 +195,7 @@ addtask chownboot after do_deploy before do_package # Append the do_deploy() in oe-core. do_deploy:append:class-target() { - install -m 0644 "${D}${EFI_BOOT_PATH}/${GRUB_IMAGE}" "${DEPLOYDIR}" + install -m 0644 "${D}${EFI_BOOT_PATH}/${GRUB_IMAGE}" "${DEPLOYDIR}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}" # Deploy the stacked grub configs. install -m 0600 "${D}${EFI_BOOT_PATH}/grubenv" "${DEPLOYDIR}" @@ -211,7 +211,7 @@ do_deploy:append:class-target() { } install -d "${DEPLOYDIR}/efi-unsigned" - install -m 0644 "${B}/${GRUB_IMAGE}" "${DEPLOYDIR}/efi-unsigned" + install -m 0644 "${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}" "${DEPLOYDIR}/efi-unsigned" PSEUDO_DISABLED=1 cp -af "${D}${EFI_BOOT_PATH}/${GRUB_TARGET}-efi" "${DEPLOYDIR}/efi-unsigned" }