summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-10-21 15:38:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-23 16:30:36 +0100
commit66b6ddf80cc3827ed2ae024ff26c45517bcfecec (patch)
tree05ddf14363a19231ca6b8376018415c87f37fc13 /meta
parenta94e0e14e1fd71a726b4bcdbe191cc8f7eb02271 (diff)
downloadpoky-66b6ddf80cc3827ed2ae024ff26c45517bcfecec.tar.gz
kernel-fitimage: Cope with non-standard kernel deploy subdirectory
kernel.bbclass installs non-standard kernels (where KERNEL_PACKAGE_NAME is not "kernel") in a subdirectory of ${DEPLOYDIR}. To achieve this kernel_do_deploy sets the deployDir shell variable to ${DEPLOYDIR} for the standard kernel or ${DEPLOYDIR}/${KERNEL_DEPLOYSUBDIR} for non-standard kernels. kernel-fitimage.bbclass's kernel_do_deploy_append ought to do the same and can do so by using the same shell variable. (From OE-Core rev: d324b22d32eaea9e4337c963c8b1a33b0ba6a2dd) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-fitimage.bbclass18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 1bcb09c598..e53487ee23 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -500,27 +500,27 @@ kernel_do_deploy_append() {
500 # Update deploy directory 500 # Update deploy directory
501 if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then 501 if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
502 echo "Copying fit-image.its source file..." 502 echo "Copying fit-image.its source file..."
503 install -m 0644 ${B}/fit-image.its ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_NAME}.its 503 install -m 0644 ${B}/fit-image.its "$deployDir/fitImage-its-${KERNEL_FIT_NAME}.its"
504 ln -snf fitImage-its-${KERNEL_FIT_NAME}.its ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_LINK_NAME} 504 ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}"
505 505
506 echo "Copying linux.bin file..." 506 echo "Copying linux.bin file..."
507 install -m 0644 ${B}/linux.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_NAME}.bin 507 install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}.bin
508 ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME} 508 ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}"
509 509
510 if [ -n "${INITRAMFS_IMAGE}" ]; then 510 if [ -n "${INITRAMFS_IMAGE}" ]; then
511 echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." 511 echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
512 install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its 512 install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its"
513 ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME} 513 ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
514 514
515 echo "Copying fitImage-${INITRAMFS_IMAGE} file..." 515 echo "Copying fitImage-${INITRAMFS_IMAGE} file..."
516 install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin 516 install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin"
517 ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME} 517 ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
518 fi 518 fi
519 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then 519 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then
520 # UBOOT_DTB_IMAGE is a realfile, but we can't use 520 # UBOOT_DTB_IMAGE is a realfile, but we can't use
521 # ${UBOOT_DTB_IMAGE} since it contains ${PV} which is aimed 521 # ${UBOOT_DTB_IMAGE} since it contains ${PV} which is aimed
522 # for u-boot, but we are in kernel env now. 522 # for u-boot, but we are in kernel env now.
523 install -m 0644 ${B}/u-boot-${MACHINE}*.dtb ${DEPLOYDIR}/ 523 install -m 0644 ${B}/u-boot-${MACHINE}*.dtb "$deployDir/"
524 fi 524 fi
525 fi 525 fi
526} 526}