[PATCH v1 14/16] rootfs: remove temporary sstate deploy directory after task execution

["'Felix Moessbauer' via isar-users" <isar-users@googlegroups.com>]

The rootfs_install_sstate_prepare currently leaves an empty directory
skeleton behind. As this does not have any value for debugging, we
remove it.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes-recipe/rootfs.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass
index 46cbab58..3183ee23 100644
--- a/meta/classes-recipe/rootfs.bbclass
+++ b/meta/classes-recipe/rootfs.bbclass
@@ -663,8 +663,11 @@ rootfs_install_sstate_prepare() {
     # so we use some mount magic to prevent that
     mkdir -p ${WORKDIR}/mnt/rootfs
 
+    # do not deploy to the sstate in case any error happened
+    trap 'rmdir ${WORKDIR}/mnt/rootfs ${WORKDIR}/mnt' EXIT
+
     run_privileged_heredoc <<'EOF' 3> rootfs.tar
-        mount -o bind,private '${ROOTFSDIR}' '${WORKDIR}/mnt/rootfs' -o ro
+        mount -o bind,private,ro '${ROOTFSDIR}' '${WORKDIR}/mnt/rootfs'
         lopts="--one-file-system --exclude=var/cache/apt/archives"
         tar -C ${WORKDIR}/mnt/rootfs -cpS $lopts ${SSTATE_TAR_ATTR_FLAGS} . >&3
         umount -q ${WORKDIR}/mnt/rootfs
-- 
2.51.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260226162843.1642329-15-felix.moessbauer%40siemens.com.