Skip to content

Commit

Permalink
webos: image.bbclass: do_webos_deploy_fixup: drop IMAGE_NAME_SUFFIX
Browse files Browse the repository at this point in the history 
:Release Notes:
Adjust to
https://git.openembedded.org/openembedded-core/commit/?id=26d97acc71379ab6702fa54a23b6542a3f51779c

:Detailed Notes:
* ${IMAGE_NAME}${IMAGE_NAME_SUFFIX} is almost always used together already
  and when they aren't it's usually because of hardcoded '.rootfs' suffix

* it's a bit strange, because ${IMAGE_NAME_SUFFIX} is applied after the
  version from ${IMAGE_VERSION_SUFFIX}, if we move it to ${IMAGE_LINK_NAME}
  then it will be applied before the version and ${IMAGE_LINK_NAME}
  will be just the version-less symlink to latest built version.

* it's not added to INITRAMFS_IMAGE_NAME as it assumes that all
  images used as initramfs will set IMAGE_NAME_SUFFIX to empty.
  Many already do as shown bellow, but you might need to extend
  this list in your layer.

* unfortunately this whole build artifact naming changes were rejected upstream in:
  https://lists.openembedded.org/g/openembedded-core/topic/102747718#191102
  https://patchwork.yoctoproject.org/project/oe-core/list/?series=19541
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=12937

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-691] Create GPVB with Yocto 4.3 Nanbield

Change-Id: I84b110d97eb8396151e746813e04b97c263f6da6
  • Loading branch information
@shr-project
shr-project committed Mar 10, 2024
1 parent ab06f7e commit dddab5b
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions meta-webos/classes-recipe/image.bbclass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@ do_image_wic[depends] += "virtual/kernel:do_webos_deploy_fixup"
do_image_ostree[depends] += "virtual/kernel:do_webos_deploy_fixup"

do_webos_deploy_fixup:prepend() {
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ext3 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ext3 \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ext3 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ext3 \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext3

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ext4 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ext4 \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ext4 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ext4 \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.manifest ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.manifest \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.gz ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.gz \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.tar.gz ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.tar.gz \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.bz2 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.bz2 \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.tar.bz2 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.tar.bz2 \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.bz2

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio.gz ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio.gz \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.cpio.gz ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.cpio.gz \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.cpio.gz

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dbg${IMAGE_NAME_SUFFIX}.tar.gz ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dbg${IMAGE_NAME_SUFFIX}.tar.gz \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dbg.tar.gz ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dbg.tar.gz \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}-dbg.tar.gz

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk ] && \
Expand All @@ -61,32 +61,32 @@ do_webos_deploy_fixup:prepend() {
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.qemuboot.conf \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.qemuboot.conf

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rpi-sdimg ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rpi-sdimg \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rpi-sdimg

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ostree ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ostree \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ostree ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ostree \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ostree

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ostree.tar.bz2 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ostree.tar.bz2 \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ostree.tar.bz2 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ostree.tar.bz2 \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ostree.tar.bz2

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ota-ext4 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ota-ext4 \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ota-ext4

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.wic ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.wic \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.wic

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.bmap ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.bmap \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.wic.bmap ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.wic.bmap \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.wic.bmap

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.bz2 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.bz2 \
[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.wic.bz2 ] && \
ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.wic.bz2 \
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.wic.bz2

[ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.testdata.json ] && \
Expand Down

0 comments on commit dddab5b

Please sign in to comment.