diff options
author | Ming Liu <liu.ming50@gmail.com> | 2022-03-28 16:15:50 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-29 15:59:29 +0100 |
commit | dbedfdeed269d7f8d4a02d1d7e6eb0c4955a628f (patch) | |
tree | b4e5236137f0990d0e477ba49d1df97aa89140e8 /meta/classes | |
parent | c80a6a6e663a3fe017a3fdee65c63c99402ebd19 (diff) | |
download | poky-dbedfdeed269d7f8d4a02d1d7e6eb0c4955a628f.tar.gz |
kernel-fitimage.bbclass: change 'echo' to 'bbnote'
Change 'echo' usages to 'bbnote' for better logging.
(From OE-Core rev: 3d05ba04824c7f08e42b1972bc0de538164b61ea)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index df5de0427b..13af4daafc 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
@@ -568,13 +568,12 @@ fitimage_assemble() { | |||
568 | # Find and use the first initramfs image archive type we find | 568 | # Find and use the first initramfs image archive type we find |
569 | for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio; do | 569 | for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio; do |
570 | initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" | 570 | initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" |
571 | echo -n "Searching for $initramfs_path..." | ||
572 | if [ -e "$initramfs_path" ]; then | 571 | if [ -e "$initramfs_path" ]; then |
573 | echo "found" | 572 | bbnote "Found initramfs image: $initramfs_path" |
574 | fitimage_emit_section_ramdisk $1 "$ramdiskcount" "$initramfs_path" | 573 | fitimage_emit_section_ramdisk $1 "$ramdiskcount" "$initramfs_path" |
575 | break | 574 | break |
576 | else | 575 | else |
577 | echo "not found" | 576 | bbnote "Did not find initramfs image: $initramfs_path" |
578 | fi | 577 | fi |
579 | done | 578 | done |
580 | fi | 579 | fi |
@@ -686,12 +685,12 @@ do_kernel_generate_rsa_keys() { | |||
686 | # make directory if it does not already exist | 685 | # make directory if it does not already exist |
687 | mkdir -p "${UBOOT_SIGN_KEYDIR}" | 686 | mkdir -p "${UBOOT_SIGN_KEYDIR}" |
688 | 687 | ||
689 | echo "Generating RSA private key for signing fitImage" | 688 | bbnote "Generating RSA private key for signing fitImage" |
690 | openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \ | 689 | openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \ |
691 | "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \ | 690 | "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \ |
692 | "${FIT_SIGN_NUMBITS}" | 691 | "${FIT_SIGN_NUMBITS}" |
693 | 692 | ||
694 | echo "Generating certificate for signing fitImage" | 693 | bbnote "Generating certificate for signing fitImage" |
695 | openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \ | 694 | openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \ |
696 | -key "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \ | 695 | -key "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \ |
697 | -out "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt | 696 | -out "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt |
@@ -704,12 +703,12 @@ do_kernel_generate_rsa_keys() { | |||
704 | # make directory if it does not already exist | 703 | # make directory if it does not already exist |
705 | mkdir -p "${UBOOT_SIGN_KEYDIR}" | 704 | mkdir -p "${UBOOT_SIGN_KEYDIR}" |
706 | 705 | ||
707 | echo "Generating RSA private key for signing fitImage" | 706 | bbnote "Generating RSA private key for signing fitImage" |
708 | openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \ | 707 | openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \ |
709 | "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \ | 708 | "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \ |
710 | "${FIT_SIGN_NUMBITS}" | 709 | "${FIT_SIGN_NUMBITS}" |
711 | 710 | ||
712 | echo "Generating certificate for signing fitImage" | 711 | bbnote "Generating certificate for signing fitImage" |
713 | openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \ | 712 | openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \ |
714 | -key "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \ | 713 | -key "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \ |
715 | -out "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt | 714 | -out "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt |
@@ -725,13 +724,13 @@ kernel_do_deploy:append() { | |||
725 | if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then | 724 | if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then |
726 | 725 | ||
727 | if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then | 726 | if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then |
728 | echo "Copying fit-image.its source file..." | 727 | bbnote "Copying fit-image.its source file..." |
729 | install -m 0644 ${B}/fit-image.its "$deployDir/fitImage-its-${KERNEL_FIT_NAME}.its" | 728 | install -m 0644 ${B}/fit-image.its "$deployDir/fitImage-its-${KERNEL_FIT_NAME}.its" |
730 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then | 729 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then |
731 | ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}" | 730 | ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}" |
732 | fi | 731 | fi |
733 | 732 | ||
734 | echo "Copying linux.bin file..." | 733 | bbnote "Copying linux.bin file..." |
735 | install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} | 734 | install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} |
736 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then | 735 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then |
737 | ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}" | 736 | ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}" |
@@ -739,14 +738,14 @@ kernel_do_deploy:append() { | |||
739 | fi | 738 | fi |
740 | 739 | ||
741 | if [ -n "${INITRAMFS_IMAGE}" ]; then | 740 | if [ -n "${INITRAMFS_IMAGE}" ]; then |
742 | echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." | 741 | bbnote "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." |
743 | install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its" | 742 | install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its" |
744 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then | 743 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then |
745 | ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}" | 744 | ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}" |
746 | fi | 745 | fi |
747 | 746 | ||
748 | if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then | 747 | if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then |
749 | echo "Copying fitImage-${INITRAMFS_IMAGE} file..." | 748 | bbnote "Copying fitImage-${INITRAMFS_IMAGE} file..." |
750 | install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}" | 749 | install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}" |
751 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then | 750 | if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then |
752 | ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}" | 751 | ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}" |
@@ -765,9 +764,9 @@ kernel_do_deploy:append() { | |||
765 | # If we're also creating and/or signing the uboot fit, now we need to | 764 | # If we're also creating and/or signing the uboot fit, now we need to |
766 | # deploy it, it's its file, as well as u-boot-spl.dtb | 765 | # deploy it, it's its file, as well as u-boot-spl.dtb |
767 | install -m 0644 ${B}/u-boot-spl-${MACHINE}*.dtb "$deployDir/" | 766 | install -m 0644 ${B}/u-boot-spl-${MACHINE}*.dtb "$deployDir/" |
768 | echo "Copying u-boot-fitImage file..." | 767 | bbnote "Copying u-boot-fitImage file..." |
769 | install -m 0644 ${B}/u-boot-fitImage-* "$deployDir/" | 768 | install -m 0644 ${B}/u-boot-fitImage-* "$deployDir/" |
770 | echo "Copying u-boot-its file..." | 769 | bbnote "Copying u-boot-its file..." |
771 | install -m 0644 ${B}/u-boot-its-* "$deployDir/" | 770 | install -m 0644 ${B}/u-boot-its-* "$deployDir/" |
772 | fi | 771 | fi |
773 | } | 772 | } |