From a66a367e9656f0f4e2f9e9f8932714cf9bee1725 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 21 Mar 2021 18:15:52 +0100 Subject: classes/override_grub* sync with upstream renames While at it, replace some hardcoded p7b extenstions with ${SB_FILE_EXT} and vmlinuz references with the appropiate variable (upstream no longer renames bzImage to vmlinuz in ISO root after [1]). [1] https://git.yoctoproject.org/cgit.cgi/poky/commit/?id=b6e36c01977 Change-Id: I5ce414a2f281ff2f1aeb0e26f35608cd8750855d Signed-off-by: Alexandru Avadanii Signed-off-by: Adrian Dudau --- classes/override_grub-efi_secureboot.inc | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 classes/override_grub-efi_secureboot.inc (limited to 'classes/override_grub-efi_secureboot.inc') diff --git a/classes/override_grub-efi_secureboot.inc b/classes/override_grub-efi_secureboot.inc deleted file mode 100644 index b944ec8..0000000 --- a/classes/override_grub-efi_secureboot.inc +++ /dev/null @@ -1,31 +0,0 @@ -efi_populate() { - # DEST must be the root of the image so that EFIDIR is not - # nested under a top level directory. - DEST=$1 - - install -d ${DEST}${EFIDIR} - - GRUB_IMAGE="grub-efi-bootia32.efi" - DEST_IMAGE="bootia32.efi" - if [ "${TARGET_ARCH}" = "x86_64" ]; then - GRUB_IMAGE="grub-efi-bootx64.efi" - DEST_IMAGE="bootx64.efi" - fi - - #Install EFI binaries - install -m 0644 ${IMAGE_ROOTFS}/boot/efi${EFIDIR}/*.* ${DEST}${EFIDIR} - - #Install kernel and initramfs sig - install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}.p7b ${DEST}/vmlinuz.p7b - install -m 0644 ${INITRD_LIVE}.p7b ${DEST}/initrd.p7b - - EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') - printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_IMAGE" >${DEST}/startup.nsh - - install -m 0644 ${GRUB_CFG} ${DEST}${EFIDIR}/grub.cfg - - #Install UEFI keys - install -d ${DEST}/uefi_sb_keys - install -m 0644 ${DEPLOY_DIR_IMAGE}/user-keys/uefi_sb_keys/*.crt ${DEST}/uefi_sb_keys/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/user-keys/uefi_sb_keys/*.esl ${DEST}/uefi_sb_keys/ -} -- cgit v1.2.3-54-g00ecf