summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-fitimage.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-11-30 10:26:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-08 17:17:01 +0000
commit67628ea66b7d04ed2a726fe58e5fd3ecc314b8da (patch)
tree71b2119246a8e257ec9e54230e4f76135380b6ce /meta/classes/kernel-fitimage.bbclass
parent3eda00b42e3f0bacedba5bd6e8fbe01b8994b80d (diff)
downloadpoky-67628ea66b7d04ed2a726fe58e5fd3ecc314b8da.tar.gz
uboot-sign.bbclass: fix signature and deployment
Fixed: MACHINE = "beaglebone-yocto" KERNEL_CLASSES += "kernel-fitimage" KERNEL_IMAGETYPE_beaglebone-yocto = "fitImage" UBOOT_MACHINE_beaglebone-yocto = "am335x_boneblack_vboot_config" UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000" UBOOT_SIGN_KEYDIR = "${TOPDIR}/conf" UBOOT_SIGN_KEYNAME = "dev" UBOOT_SIGN_ENABLE = "1" IMAGE_INSTALL_remove = "kernel-image-zimage" $ cd conf $ openssl genrsa -F4 -out dev.key 2048 $ openssl req -batch -new -x509 -key dev.key -out dev.crt $ cd ../ $ bitbake u-boot linux-yocto $ grep signature tmp/deploy/images/beaglebone-yocto/*.dtb Binary file tmp/deploy/images/beaglebone-yocto/u-boot-beaglebone-yocto-2018.07-r0.dtb matches Binary file tmp/deploy/images/beaglebone-yocto/u-boot-beaglebone-yocto.dtb matches Binary file tmp/deploy/images/beaglebone-yocto/u-boot.dtb matches And there would be no signature info when rebuild from sstate: $ bitbake u-boot linux-yocto -cclean $ bitbake u-boot linux-yocto $ grep signature tmp/deploy/images/beaglebone-yocto/*.dtb No result This s because kernel directly edit ${DEPLOY_DIR_IMAGE}/u-boot.dtb, (Note, it is global ${DEPLOY_DIR_IMAGE}, not recipe's DEPLOYDIR), so that the modified info is not in sstate, and would be lost when rebuild from sstate. There are other problems in previouse code: - The u-boot.dtb is provided by u-boot, but edited by kernel during signing, so it should be deployed by kernel rather than u-boot. - The u-boot.do_concat_dtb directly install files to global ${DEPLOY_DIR_IMAGE}, this is incorrect, the ${DEPLOY_DIR_IMAGE} should be installed by do_deploy. - It seems that it assumes do_deploy depends on do_install according the comments, but they have no relationships: # do_concat_dtb is scheduled _before_ do_install as it overwrite the # u-boot.bin in both DEPLOYDIR and DEPLOY_IMAGE_DIR. - The do_concat_dtb should be run after do_compile, but it doesn't have this dependency. Make u-boot install u-boot.dtb to ${datadir}, kernel copies u-boot.dtb from ${STAGING_DATADIR} to ${B} and deploy it can fix the problem. [YOCTO #12112] Reported-by: Christian Andersen <c.andersen@kostal.com> (From OE-Core rev: 493f70cfb177f1d452a13329647a38642bf2b161) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-fitimage.bbclass')
-rw-r--r--meta/classes/kernel-fitimage.bbclass17
1 files changed, 15 insertions, 2 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 548699e978..718162a861 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -35,7 +35,7 @@ python __anonymous () {
35 # the fitImage: 35 # the fitImage:
36 if d.getVar('UBOOT_SIGN_ENABLE') == "1": 36 if d.getVar('UBOOT_SIGN_ENABLE') == "1":
37 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot' 37 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
38 d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' % uboot_pn) 38 d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_populate_sysroot' % uboot_pn)
39} 39}
40 40
41# Options for the device tree compiler passed to mkimage '-D' feature: 41# Options for the device tree compiler passed to mkimage '-D' feature:
@@ -456,10 +456,17 @@ fitimage_assemble() {
456 # Step 7: Sign the image and add public key to U-Boot dtb 456 # Step 7: Sign the image and add public key to U-Boot dtb
457 # 457 #
458 if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then 458 if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
459 add_key_to_u_boot=""
460 if [ -n "${UBOOT_DTB_BINARY}" ]; then
461 # The u-boot.dtb is a symlink to UBOOT_DTB_IMAGE, so we need copy
462 # both of them, and don't dereference the symlink.
463 cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B}
464 add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}"
465 fi
459 uboot-mkimage \ 466 uboot-mkimage \
460 ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ 467 ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
461 -F -k "${UBOOT_SIGN_KEYDIR}" \ 468 -F -k "${UBOOT_SIGN_KEYDIR}" \
462 ${@'-K "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}"' if len('${UBOOT_DTB_BINARY}') else ''} \ 469 $add_key_to_u_boot \
463 -r arch/${ARCH}/boot/${2} 470 -r arch/${ARCH}/boot/${2}
464 fi 471 fi
465} 472}
@@ -505,5 +512,11 @@ kernel_do_deploy_append() {
505 install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin 512 install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin
506 ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME} 513 ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}
507 fi 514 fi
515 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then
516 # UBOOT_DTB_IMAGE is a realfile, but we can't use
517 # ${UBOOT_DTB_IMAGE} since it contains ${PV} which is aimed
518 # for u-boot, but we are in kernel env now.
519 install -m 0644 ${B}/u-boot-${MACHINE}*.dtb ${DEPLOYDIR}/
520 fi
508 fi 521 fi
509} 522}