Skip to content

Commit

Permalink
webos: webos.inc: respect IMAGE_NAME_SUFFIX and IMAGE_MACHINE_SUFFIX,…
Browse files Browse the repository at this point in the history
… drop WEBOS_IMAGE_NAME_PARTITION_SUFFIX

:Release Notes:
Drop unused WEBOS_IMAGE_NAME_PARTITION_SUFFIX, respect
IMAGE_MACHINE_SUFFIX and add IMAGE_NAME_SUFFIX

IMAGE_MACHINE_SUFFIX was added in:
https://git.openembedded.org/openembedded-core/commit/?id=6e82c394e98d57a2fe73e547922477cd6b0620f9
IMAGE_NAME_SUFFIX added to IMAGE_NAME in:
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: Id50c8047f99e65b23d57aa88b29d216f8dec004f
  • Loading branch information
shr-project committed Mar 10, 2024
1 parent f074b4e commit ab06f7e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions meta-webos/conf/distro/include/webos.inc
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,10 @@ IMAGE_VERSION_SUFFIX = "${WEBOS_IMAGE_BUILD_CODENAME}-${@oe.utils.conditional( \
# during the build which has different WEBOS_DISTRO_BUILD_ID
IMAGE_VERSION_SUFFIX[vardepsexclude] += "WEBOS_DISTRO_BUILD_ID"

WEBOS_IMAGE_NAME_PARTITION_SUFFIX ?= ""
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}${WEBOS_IMAGE_NAME_PARTITION_SUFFIX}"
IMAGE_NAME = "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}"
IMAGE_LINK_NAME = "${IMAGE_NAME}${IMAGE_VERSION_SUFFIX}"

INITRAMFS_IMAGE_NAME = "${@['${INITRAMFS_IMAGE}-${MACHINE}${WEBOS_IMAGE_NAME_PARTITION_SUFFIX}${IMAGE_VERSION_SUFFIX}', ''][d.getVar('INITRAMFS_IMAGE') == '']}"
INITRAMFS_IMAGE_NAME = "${@['${INITRAMFS_IMAGE}${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}${IMAGE_VERSION_SUFFIX}', ''][d.getVar('INITRAMFS_IMAGE') == '']}"

# Use a different naming scheme for webOS kernel images that uses the component
# name instead of the name of the image format (KERNEL_IMAGETYPE) and leaves off
Expand Down

0 comments on commit ab06f7e

Please sign in to comment.