diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2024-11-21 14:47:49 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2024-11-21 14:47:51 -0600 |
| commit | ab07add28ff4c8acf68157de49ff29f59238e4e0 (patch) | |
| tree | ccb8ed3fd1092b8015c1bec5d4d41e7713a34a05 /meta-xilinx-core/classes | |
| parent | 1241013c7bce4262a6128eb4ccb3db410831746d (diff) | |
| download | meta-xilinx-ab07add28ff4c8acf68157de49ff29f59238e4e0.tar.gz | |
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 <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/classes')
| -rw-r--r-- | meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
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 () { | |||
| 39 | parted -s ${QEMU_IMG} set 1 boot on | 39 | parted -s ${QEMU_IMG} set 1 boot on |
| 40 | parted ${QEMU_IMG} print | 40 | parted ${QEMU_IMG} print |
| 41 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${QEMU_IMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') | 41 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${QEMU_IMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') |
| 42 | rm -f ${WORKDIR}/${BOOT_VOLUME_ID}.img | 42 | rm -f ${BOOT_VOLUME_ID}.img |
| 43 | mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${WORKDIR}/${BOOT_VOLUME_ID}.img $BOOT_BLOCKS | 43 | mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${BOOT_VOLUME_ID}.img $BOOT_BLOCKS |
| 44 | if [ -e ${DEPLOY_DIR_IMAGE}/boot.bin ]; then | 44 | if [ -e ${DEPLOY_DIR_IMAGE}/boot.bin ]; then |
| 45 | mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.bin ::/ | 45 | mcopy -i ${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.bin ::/ |
| 46 | fi | 46 | fi |
| 47 | if [ -e ${DEPLOY_DIR_IMAGE}/boot.scr ]; then | 47 | if [ -e ${DEPLOY_DIR_IMAGE}/boot.scr ]; then |
| 48 | mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::/ | 48 | mcopy -i ${BOOT_VOLUME_ID}.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::/ |
| 49 | fi | 49 | fi |
| 50 | if [ ${INITRAMFS_IMAGE} = ${IMAGE_BASENAME} ] && [ x"${INITRAMFS_IMAGE_BUNDLE}" != "x1" ]; then | 50 | if [ ${INITRAMFS_IMAGE} = ${IMAGE_BASENAME} ] && [ x"${INITRAMFS_IMAGE_BUNDLE}" != "x1" ]; then |
| 51 | mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot | 51 | mcopy -i ${BOOT_VOLUME_ID}.img -s ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot |
| 52 | fi | 52 | fi |
| 53 | dd if=${WORKDIR}/${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024) | 53 | dd if=${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024) |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | CONVERSION_DEPENDS_qemu-sd = "qemu-system-native" | 56 | CONVERSION_DEPENDS_qemu-sd = "qemu-system-native" |