[PATCH v2 1/2] rootfs: clean rootfs dir before unpack from sstate

[PATCH v2 1/2] rootfs: clean rootfs dir before unpack from sstate

[Aliaksei Karpovich]

In case when rootfs is restored (unpacked) from sstate, we have to clean
rootfs dir because it can contain files from previous build which should
not be included in current rootfs and will not be deleted during unpack.
---
 meta/classes-recipe/rootfs.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass
index 4fd627c2..11b69d2f 100644
--- a/meta/classes-recipe/rootfs.bbclass
+++ b/meta/classes-recipe/rootfs.bbclass
@@ -776,6 +776,7 @@ rootfs_install_sstate_finalize() {
     # - after restoring from cache, there will be a tar which we unpack and then delete
     if [ -f rootfs.tar ]; then
         run_privileged_heredoc <<'EOF'
+        rm -rf ${ROOTFSDIR}
         mkdir -p ${ROOTFSDIR}
         tar -C ${ROOTFSDIR} -xp ${SSTATE_TAR_ATTR_FLAGS} -f rootfs.tar
 EOF
-- 
2.53.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/20261027161524.129118-1-akarpovich%40ilbers.de.

[PATCH v2 2/2] testsuite: add test for rootfs sstate

[Aliaksei Karpovich]

This test should catch the bug when user builds the same image
multiple times, adds and removes some package in image, but this
package is stayed on rootfs after removing.
The root cause is in sstate for rootfs.

Test conatins 3 build steps:
 1. Build the target
 2. Add some package in image and build the same target
 3. Remove package from image (return back to state in step 1) and
build the target again.

After each step, the test checks for the presence or absence of
the package on the rootfs.
---
 testsuite/citest.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 0cedcc2c..b701ed13 100644
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -1563,6 +1563,42 @@ class SstateTest(CIBaseTest):
         self.perform_sstate_test(image_target, package_target)
 
 
+class RootfsSstateTest(CIBaseTest):
+    """
+    Test for correct behavior of sstate for rootfs.
+    Contains 3 steps:
+     - Step 1: build isar-image-base without any package.
+     - Step 2: build isar-image-base with hello-isar package only.
+     - Step 3: build again isar-image-base without any package.
+
+    :avocado: tags=sstate,fast
+    """
+
+    def test_rootfs_sstate(self):
+        import glob
+
+        image = 'isar-image-base'
+        arch = 'amd64'
+        distro = 'trixie'
+
+        self.init()
+
+        image_target = f'mc:qemu{arch}-{distro}:{image}'
+        hello_bin_file = f'{self.build_dir}/tmp/work/*-{distro}-{arch}/{image}-qemu{arch}/*/rootfs/usr/bin/hello-isar'
+
+        self.perform_build_test(image_target, image_install='', sstate=True)
+        if glob.glob(hello_bin_file):
+            self.fail("Step 1: hello-isar shouldn't be on rootfs")
+
+        self.perform_build_test(image_target, image_install='hello-isar', sstate=True)
+        if not glob.glob(hello_bin_file):
+            self.fail("Step 2: hello-isar should be on rootfs")
+
+        self.perform_build_test(image_target, image_install='', sstate=True)
+        if glob.glob(hello_bin_file):
+            self.fail("Step 3: hello-isar shouldn't be on rootfs")
+
+
 class SingleTest(CIBaseTest):
 
     """
-- 
2.53.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/20261027161524.129118-2-akarpovich%40ilbers.de.

Re: [PATCH v2 1/2] rootfs: clean rootfs dir before unpack from sstate

[Zhihang Wei]

Applied to next, thanks.

Zhihang

On 10/27/26 17:15, Aliaksei Karpovich wrote:
> In case when rootfs is restored (unpacked) from sstate, we have to clean
> rootfs dir because it can contain files from previous build which should
> not be included in current rootfs and will not be deleted during unpack.
> ---
>   meta/classes-recipe/rootfs.bbclass | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass
> index 4fd627c2..11b69d2f 100644
> --- a/meta/classes-recipe/rootfs.bbclass
> +++ b/meta/classes-recipe/rootfs.bbclass
> @@ -776,6 +776,7 @@ rootfs_install_sstate_finalize() {
>       # - after restoring from cache, there will be a tar which we unpack and then delete
>       if [ -f rootfs.tar ]; then
>           run_privileged_heredoc <<'EOF'
> +        rm -rf ${ROOTFSDIR}
>           mkdir -p ${ROOTFSDIR}
>           tar -C ${ROOTFSDIR} -xp ${SSTATE_TAR_ATTR_FLAGS} -f rootfs.tar
>   EOF

-- 
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/1d3ce5f2-3f1f-4297-beee-219d38ddfa32%40ilbers.de.