From ab07add28ff4c8acf68157de49ff29f59238e4e0 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 21 Nov 2024 14:47:49 -0600 Subject: various: Fix variable usage Remove most direct references to WORKDIR. S = "${WORKDIR}" is no longer allowed, adjust this to refer to UNPACKDIR ${WORKDIR}/package is also incorrect, adjust to ${PKGD}. Signed-off-by: Mark Hatle --- meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-xilinx-core/classes') diff --git a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass index b4de5ee1..71b8b9b8 100644 --- a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass +++ b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass @@ -39,18 +39,18 @@ CONVERSION_CMD:qemu-sd-fatimg () { parted -s ${QEMU_IMG} set 1 boot on parted ${QEMU_IMG} print BOOT_BLOCKS=$(LC_ALL=C parted -s ${QEMU_IMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') - rm -f ${WORKDIR}/${BOOT_VOLUME_ID}.img - mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${WORKDIR}/${BOOT_VOLUME_ID}.img $BOOT_BLOCKS + rm -f ${BOOT_VOLUME_ID}.img + mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${BOOT_VOLUME_ID}.img $BOOT_BLOCKS if [ -e ${DEPLOY_DIR_IMAGE}/boot.bin ]; then - mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.bin ::/ + mcopy -i ${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.bin ::/ fi if [ -e ${DEPLOY_DIR_IMAGE}/boot.scr ]; then - mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::/ + mcopy -i ${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::/ fi if [ ${INITRAMFS_IMAGE} = ${IMAGE_BASENAME} ] && [ x"${INITRAMFS_IMAGE_BUNDLE}" != "x1" ]; then - mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot + mcopy -i ${BOOT_VOLUME_ID}.img -s ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot fi - dd if=${WORKDIR}/${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024) + dd if=${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024) } CONVERSION_DEPENDS_qemu-sd = "qemu-system-native" -- cgit v1.2.3-54-g00ecf