| Message ID | 20260121153028.869575-5-amikan@ilbers.de |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [v4,1/4] meta: Fix do_copy_boot_files error for different distros of same machine | expand |
On 21.01.26 16:30, Anton Mikanovich wrote: > As it was changed for fixing DTB deployment conflicts. > Than fix the patch that is changing it, or you are creating a friction point for bisection. Jan > Signed-off-by: Anton Mikanovich <amikan@ilbers.de> > --- > meta-isar/classes-recipe/installer-add-rootfs.bbclass | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/meta-isar/classes-recipe/installer-add-rootfs.bbclass b/meta-isar/classes-recipe/installer-add-rootfs.bbclass > index 2fa551bd..b79c2357 100644 > --- a/meta-isar/classes-recipe/installer-add-rootfs.bbclass > +++ b/meta-isar/classes-recipe/installer-add-rootfs.bbclass > @@ -13,7 +13,9 @@ INSTALLER_TARGET_IMAGES ??= "${INSTALLER_TARGET_IMAGE}" > INSTALLER_TARGET_MC ??= "installer-target" > INSTALLER_TARGET_DISTRO ??= "${DISTRO}" > INSTALLER_TARGET_MACHINE ??= "${MACHINE}" > -INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}" > +INSTALLER_TARGET_KERNEL_NAME ??= "${KERNEL_NAME}" > +INSTALLER_TARGET_DEPLOY_DIR_POSTFIX ??= "${@ ('-'+d.getVar('INSTALLER_TARGET_KERNEL_NAME')) if d.getVar('INSTALLER_TARGET_KERNEL_NAME') else ''}" > +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}-${INSTALLER_TARGET_DISTRO}${INSTALLER_TARGET_DEPLOY_DIR_POSTFIX}" > > IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_IMAGE}-${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" > IMAGE_DATA_POSTFIX ??= "wic.zst"
21/01/2026 20:29, Jan Kiszka wrote: > Than fix the patch that is changing it, or you are creating a friction > point for bisection. > > Jan Hello Jan, This patch is related only to installer which was never changed in the patchset before. I don't think squashing all the changes to one commit will be a good idea.
On 23.01.26 13:44, Anton Mikanovich wrote: > 21/01/2026 20:29, Jan Kiszka wrote: >> Than fix the patch that is changing it, or you are creating a friction >> point for bisection. >> >> Jan > Hello Jan, > > This patch is related only to installer which was never changed in the > patchset > before. I don't think squashing all the changes to one commit will be a > good > idea. Patch 1 changes the deployment path without updating the installer. This is what you "fix" here. That is at least how I read the description and the changes. Or does the installer still work after applying patch 1? Jan
diff --git a/meta-isar/classes-recipe/installer-add-rootfs.bbclass b/meta-isar/classes-recipe/installer-add-rootfs.bbclass index 2fa551bd..b79c2357 100644 --- a/meta-isar/classes-recipe/installer-add-rootfs.bbclass +++ b/meta-isar/classes-recipe/installer-add-rootfs.bbclass @@ -13,7 +13,9 @@ INSTALLER_TARGET_IMAGES ??= "${INSTALLER_TARGET_IMAGE}" INSTALLER_TARGET_MC ??= "installer-target" INSTALLER_TARGET_DISTRO ??= "${DISTRO}" INSTALLER_TARGET_MACHINE ??= "${MACHINE}" -INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}" +INSTALLER_TARGET_KERNEL_NAME ??= "${KERNEL_NAME}" +INSTALLER_TARGET_DEPLOY_DIR_POSTFIX ??= "${@ ('-'+d.getVar('INSTALLER_TARGET_KERNEL_NAME')) if d.getVar('INSTALLER_TARGET_KERNEL_NAME') else ''}" +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}-${INSTALLER_TARGET_DISTRO}${INSTALLER_TARGET_DEPLOY_DIR_POSTFIX}" IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_IMAGE}-${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" IMAGE_DATA_POSTFIX ??= "wic.zst"
As it was changed for fixing DTB deployment conflicts. Signed-off-by: Anton Mikanovich <amikan@ilbers.de> --- meta-isar/classes-recipe/installer-add-rootfs.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)