Skip to contentSkip to conversation

rm_work: Keep do_populate_lic_deploy stamps

PATCH New Alper Ak 1 participant 1 message Sep 17

lore
Share & tools
lore

Alper Ak

author
#0 lore raw

PATCH 1/1 rm_work: Keep do_populate_lic_deploy stamps

Fixes [YOCTO #14946]

rm_work removes the do_populate_lic_deploy stamp of an image and the task runs again on every build. Because IMAGE_NAME contains DATETIME, it writes image_license.manifest to a new directory and moves the IMAGE_LINK_NAME symlink there. license.manifest and package.manifest are written by do_rootfs, which does not run again, so they are missing from the new directory.

do_populate_lic_deploy does not use WORKDIR, so keep its stamp like the other image task stamps.

Rebuild of core-image-minimal with INHERIT += "rm_work":

Before:
NOTE: Tasks Summary: Attempted 6025 tasks of which 6021 didn't need to be rerun and all succeeded. ./licenses/qemux86_64/core-image-minimal-qemux86-64.rootfs-20260917071112/image_license.manifest ./licenses/qemux86_64/core-image-minimal-qemux86-64.rootfs-20260917071112/license.manifest ./licenses/qemux86_64/core-image-minimal-qemux86-64.rootfs-20260917071112/package.manifest ./licenses/qemux86_64/core-image-minimal-qemux86-64.rootfs-20260917074853/image_license.manifest

After:
NOTE: Tasks Summary: Attempted 6025 tasks of which 6025 didn't need to be rerun and all succeeded. ./licenses/qemux86_64/core-image-minimal-qemux86-64.rootfs-20260917075639/image_license.manifest ./licenses/qemux86_64/core-image-minimal-qemux86-64.rootfs-20260917075639/license.manifest ./licenses/qemux86_64/core-image-minimal-qemux86-64.rootfs-20260917075639/package.manifest

---
 meta/classes/rm_work.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/rm_work.bbclass +1 -1
index 52ecfafb72..7cb8a325b2 100644
@@ -77,7 +77,7 @@ do_rm_work () {
                 # Promote do_image_qa stamps to setscene versions (ahead of *do_image* below)
                 mv $i `echo $i | sed -e "s#do_image_qa#do_image_qa_setscene#"`
                 ;;
-            *do_package_write*|*do_rootfs*|*do_image*|*do_bootimg*|*do_write_qemuboot_conf*|*do_build*)
+            *do_package_write*|*do_rootfs*|*do_image*|*do_bootimg*|*do_write_qemuboot_conf*|*do_populate_lic_deploy*|*do_build*)
                 ;;
             *do_addto_recipe_sysroot*)
                 # Preserve recipe-sysroot-native if do_addto_recipe_sysroot has been used
Signature · 1 line
2.43.0