Skip to contentSkip to conversation

kernel-fit: Change FIT (kernel+initrd) symlinks to fitImage-*

PATCH In review Rick Altherr 2 participants 2 messages Jan 11, 2017 – Jan 17, 2017

lore
Share & tools
lore

Rick Altherr

author
#0 lore raw

PATCH 1/1 kernel-fit: Change FIT (kernel+initrd) symlinks to fitImage-*

KERNEL_IMAGETYPE only provides the first image type specified in KERNEL_IMAGETYPES which can provide surprising results. Since this class is solely for FIT images, just hardcode the names to fitImage-*.

Change-Id I58f31bc23c0fe6dc0757f26aa15a440b927fc917
Signed-off-by Rick Altherr <[email protected]>
---
 meta/classes/kernel-fitimage.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes/kernel-fitimage.bbclass +4 -4
index 2934b3a31a..6d9d8d7485 100644
@@ -410,11 +410,11 @@ kernel_do_deploy_append() {
 
 		if [ -n "${INITRAMFS_IMAGE}" ]; then
 			echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
-			its_initramfs_base_name="${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-			its_initramfs_symlink_name=${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${MACHINE}
+			its_initramfs_base_name="fitImage-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+			its_initramfs_symlink_name=fitImage-its-${INITRAMFS_IMAGE}-${MACHINE}
 			install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its
-			fit_initramfs_base_name="${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-			fit_initramfs_symlink_name=${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}
+			fit_initramfs_base_name="fitImage-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+			fit_initramfs_symlink_name=fitImage-${INITRAMFS_IMAGE}-${MACHINE}
 			install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin
 		fi
Signature · 1 line
2.11.0.390.gc69c2f50cf-goog
#1 lore raw
Quoted 4 lines · Rick Altherr

KERNEL_IMAGETYPE only provides the first image type specified in KERNEL_IMAGETYPES which can provide surprising results. Since this class is solely for FIT images, just hardcode the names to fitImage-*.

Nathan sent the identical patch earlier, so I merged his. Expect this in master shortly.

Ross