From 41f74d2802b95635670c6e25312828baa14e43b5 Mon Sep 17 00:00:00 2001 From: Viswanath Kraleti Date: Thu, 18 Jan 2024 22:20:22 +0530 Subject: [PATCH 1/2] initramfs-*: Set empty IMAGE_NAME_SUFFIX initramfs images aren't used for rootfs, so the default '.rootfs' suffix isn't valid. Just set the suffix to empty to override the default Signed-off-by: Viswanath Kraleti --- recipes-bsp/images/initramfs-firmware-image.inc | 1 + recipes-kernel/images/initramfs-rootfs-image.bb | 1 + recipes-test/images/initramfs-tiny-image.bb | 1 + 3 files changed, 3 insertions(+) diff --git a/recipes-bsp/images/initramfs-firmware-image.inc b/recipes-bsp/images/initramfs-firmware-image.inc index c8b05c3..2ce4f36 100644 --- a/recipes-bsp/images/initramfs-firmware-image.inc +++ b/recipes-bsp/images/initramfs-firmware-image.inc @@ -7,6 +7,7 @@ IMAGE_LINGUAS = "" LICENSE = "MIT" IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +IMAGE_NAME_SUFFIX ?= "" inherit core-image IMAGE_ROOTFS_SIZE = "8192" diff --git a/recipes-kernel/images/initramfs-rootfs-image.bb b/recipes-kernel/images/initramfs-rootfs-image.bb index 9bc9dc5..028f212 100644 --- a/recipes-kernel/images/initramfs-rootfs-image.bb +++ b/recipes-kernel/images/initramfs-rootfs-image.bb @@ -17,6 +17,7 @@ IMAGE_LINGUAS = "" LICENSE = "MIT" IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +IMAGE_NAME_SUFFIX ?= "" inherit core-image IMAGE_ROOTFS_SIZE = "8192" diff --git a/recipes-test/images/initramfs-tiny-image.bb b/recipes-test/images/initramfs-tiny-image.bb index 2f72dc4..e9f185b 100644 --- a/recipes-test/images/initramfs-tiny-image.bb +++ b/recipes-test/images/initramfs-tiny-image.bb @@ -15,6 +15,7 @@ IMAGE_LINGUAS = "" LICENSE = "MIT" IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +IMAGE_NAME_SUFFIX ?= "" inherit core-image IMAGE_ROOTFS_SIZE = "8192" From 239eac4a3245d03ff9607bada00f7f75d75fd869 Mon Sep 17 00:00:00 2001 From: Viswanath Kraleti Date: Thu, 18 Jan 2024 22:59:37 +0530 Subject: [PATCH 2/2] linux-qcom-bootimg: Don't look for initramfs image with IMAGE_NAME_SUFFIX initramfs images are no longer appended with '.rootfs' suffix. Adjust baseinitrd lookup accordingly. Signed-off-by: Viswanath Kraleti --- classes/linux-qcom-bootimg.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/linux-qcom-bootimg.bbclass b/classes/linux-qcom-bootimg.bbclass index c787fb2..bc8a54f 100644 --- a/classes/linux-qcom-bootimg.bbclass +++ b/classes/linux-qcom-bootimg.bbclass @@ -27,8 +27,7 @@ python do_qcom_img_deploy() { initrd = None if d.getVar('INITRAMFS_IMAGE') != '': initrd_image_name = d.getVar("INITRAMFS_IMAGE_NAME") - initrd_image_suffix = d.getVar("IMAGE_NAME_SUFFIX") - baseinitrd = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), initrd_image_name + initrd_image_suffix) + baseinitrd = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), initrd_image_name) for img in (".cpio.gz", ".cpio.lz4", ".cpio.lzo", ".cpio.lzma", ".cpio.xz", ".cpio"): if os.path.exists(baseinitrd + img): initrd = baseinitrd + img