diff mbox series

[2/4] image: include rootfs manifests in sstate artifacts

Message ID 20261029102027.1974884-2-clara.kowalsky@siemens.com
State Under Review
Headers show
Series [1/4] testsuite: fix sstate test with relocated build directory | expand

Commit Message

Clara Kowalsky Oct. 29, 2026, 10:20 a.m. UTC 
do_rootfs_install writes the manifest and dpkg_status files to
DEPLOY_DIR_IMAGE, but sstate captures DEPLOYDIR. After restoring the
sstate, the files are missing from the deploy directory.
Running:

scripts/run-tests.sh testsuite/citest.py:SstateTest.test_sstate \
  -p rootless=0 --debug

fails with:

ERROR| mc:qemuamd64-bullseye:isar-image-base: files missing from deploy
dir after rebuild with sstate cache:
{'/isar/build/build-sstate/tmp/deploy/images/qemuamd64/
isar-image-base-debian-bullseye-qemuamd64.manifest',
'/isar/build/build-sstate/tmp/deploy/images/qemuamd64/
isar-image-base-debian-bullseye-qemuamd64.dpkg_status'}

This error happens independently of commit "testsuite: fix sstate test
with relocated build directory". Fix this by defaulting both output
directories to DEPLOYDIR, so sstate captures and restores the files.

Fixes: c7a637508ac6 ("rootfs: fold do_rootfs_postprocess task into do_rootfs_install")
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
 meta/classes-recipe/image.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass
index d9125d05..ce19ae1c 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -106,8 +106,8 @@  ROOTFS_FEATURES += "\
     "
 ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTALL', d)}"
 ROOTFS_VARDEPS += "IMAGE_INSTALL"
-ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}"
-ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}"
+ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOYDIR}"
+ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOYDIR}"
 ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}"
 
 CACHE_DEB_SRC = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '1', '0', d)}"