mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-06-02 15:19:53 +00:00
Code Issues Projects Releases Wiki Activity

grub-efi-efi-secure-boot.inc: use task_prepend instead of prefuncs for do_sign

Browse Source 
The grub-efi-native build doesn't need to run do_sign task but there are
two prefuncs for do_sign still run in native build. This will cause a
build error when there is no gpg command on the host. Move the functions
to do_sign_prepend_class-target to make sure they only run in target
build.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
This commit is contained in:
Yi Zhao
2019-12-13 17:09:13 +08:00
committed by Jia Zhang
parent f59b77b257
commit c0e7d60718
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc
+6 -2
View File
@@ -142,6 +142,12 @@ do_install_append_class-target() {
rm -f ${D}${EFI_BOOT_PATH}/${GRUB_TARGET}-efi/*.module
}
python do_sign_prepend_class-target() {
bb.build.exec_func("check_deploy_keys", d)
if d.getVar('GRUB_SIGN_VERIFY') == '1':
bb.build.exec_func("check_boot_public_key", d)
}
fakeroot python do_sign_class-target() {
image_dir = d.getVar('D', True)
efi_boot_path = d.getVar('EFI_BOOT_PATH', True)
@@ -160,8 +166,6 @@ fakeroot python do_sign_class-target() {
python do_sign() {
}
addtask sign after do_install before do_deploy do_package
do_sign[prefuncs] += "check_deploy_keys"
do_sign[prefuncs] += "${@'check_boot_public_key' if d.getVar('GRUB_SIGN_VERIFY', True) == '1' else ''}"
fakeroot do_chownboot() {
chown root:root -R "${D}${EFI_BOOT_PATH}/grub.cfg${SB_FILE_EXT}"