diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-08-04 18:41:33 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-08-10 22:22:44 +0300 |
| commit | 1dc6b4a7e957475ec2eb39353a3c8f7a003686fb (patch) | |
| tree | 5fad8af8d93271437c0144741dd7045276f756d4 | |
| parent | 8f840685fb701a268141f0fcebc1d34fcd9b01de (diff) | |
| download | openbmc-1dc6b4a7e957475ec2eb39353a3c8f7a003686fb.tar.xz | |
meta-phosphor: adjust IMAGE_NAME_SUFFIX use
OE-Core commit 26d97acc71379ab6702fa54a23b6542a3f51779c adjusted
how IMAGE_NAME_SUFFIX is used and expect it to no longer be present
in most of the image-conversion instructions. Remove it as necessary
in our image bbclasses.
Tested: Bletchley successfully compiles with latest Yocto subtree
update.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idaeff6134f2068a6671f4bf22fd0223f08963369
| -rw-r--r-- | meta-phosphor/classes/fit-image.bbclass | 4 | ||||
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 2 | ||||
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/meta-phosphor/classes/fit-image.bbclass b/meta-phosphor/classes/fit-image.bbclass index 7d23f44d0d..d0c51831ae 100644 --- a/meta-phosphor/classes/fit-image.bbclass +++ b/meta-phosphor/classes/fit-image.bbclass @@ -2,8 +2,8 @@ inherit uboot-config CONVERSIONTYPES += "fitImage" -CONVERSION_CMD:fitImage = "run_assemble_fitimage ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" -INITRAMFS_IMAGE="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio.${INITRAMFS_CTYPE}" +CONVERSION_CMD:fitImage = "run_assemble_fitimage ${IMAGE_NAME}.${type}" +INITRAMFS_IMAGE="${IMAGE_NAME}.cpio.${INITRAMFS_CTYPE}" KERNEL_OUTPUT_DIR="${DEPLOY_DIR_IMAGE}" do_image_cpio[depends] += "virtual/kernel:do_deploy" diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 70f285a675..4f93999145 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -92,6 +92,8 @@ VERSION_PURPOSE ?= "xyz.openbmc_project.Software.Version.VersionPurpose.BMC" UBOOT_SUFFIX ?= "bin" +IMAGE_NAME_SUFFIX="" + python() { # Compute rwfs LEB count and LEB size. page_size = d.getVar('FLASH_PAGE_SIZE', True) diff --git a/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass b/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass index 9262a946a6..1a4231175e 100644 --- a/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" IMAGE_INSTALL:append = " busybox packagegroup-obmc-phosphor-debugtools perf " # Override from image_types.bbclass to restrict tarball to /usr tree. -IMAGE_CMD:tar = "${IMAGE_CMD_TAR} -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS}/usr ." +IMAGE_CMD:tar = "${IMAGE_CMD_TAR} -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}.tar -C ${IMAGE_ROOTFS}/usr ." # Remove packages installed by 'extrausers'. IMAGE_INSTALL:remove = "base-passwd shadow" |