[PATCH v2 0/2] Sparse tar generation

[PATCH v2 0/2] Sparse tar generation

[Adriaan Schmidt]

Sorry it took me so long to review!

Just some small optimization: Consistently use tar -S when generating
archives to avoid expanding sparse files.

Changes since v1:
- dropped p3
- rebased p2 to fit with new imagetypes

Jan Kiszka (2):
  sstate: Generate image packages using sparse
  targz-img: Handle sparse files efficiently

 meta/classes/imagetypes.bbclass                     | 2 +-
 meta/classes/rootfs.bbclass                         | 2 +-
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.30.2

[PATCH v2 1/2] sstate: Generate image packages using sparse

[Adriaan Schmidt]

From: Jan Kiszka <jan.kiszka@siemens.com>

Avoids needless expansion of sparse files while filling the sstate
cache.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
---
 meta/classes/rootfs.bbclass                         | 2 +-
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index f3272c07..bbb5ac0a 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -307,7 +307,7 @@ rootfs_install_sstate_prepare() {
     # so we use some mount magic to prevent that
     mkdir -p ${WORKDIR}/mnt/rootfs
     sudo mount --bind ${WORKDIR}/rootfs ${WORKDIR}/mnt/rootfs -o ro
-    sudo tar -C ${WORKDIR}/mnt -cpf rootfs.tar --one-file-system rootfs
+    sudo tar -C ${WORKDIR}/mnt -cpSf rootfs.tar --one-file-system rootfs
     sudo umount ${WORKDIR}/mnt/rootfs
     sudo chown $(id -u):$(id -g) rootfs.tar
 }
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index a453b36c..604cd24c 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -412,7 +412,7 @@ SSTATEPOSTINSTFUNCS += "bootstrap_sstate_finalize"
 
 bootstrap_sstate_prepare() {
     # this runs in SSTATE_BUILDDIR, which will be deleted automatically
-    sudo tar -C $(dirname "${ROOTFSDIR}") -cpf bootstrap.tar --one-file-system $(basename "${ROOTFSDIR}")
+    sudo tar -C $(dirname "${ROOTFSDIR}") -cpSf bootstrap.tar --one-file-system $(basename "${ROOTFSDIR}")
     sudo chown $(id -u):$(id -g) bootstrap.tar
 }
 
-- 
2.30.2

[PATCH v2 2/2] targz-img: Handle sparse files efficiently

[Adriaan Schmidt]

From: Jan Kiszka <jan.kiszka@siemens.com>

Saves space in case the image contains any sparse files.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
---
 meta/classes/imagetypes.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass
index bea5af53..1e8e223d 100644
--- a/meta/classes/imagetypes.bbclass
+++ b/meta/classes/imagetypes.bbclass
@@ -8,7 +8,7 @@ IMAGER_INSTALL_tar = "tar"
 TAR_OPTIIONS ?= ""
 
 IMAGE_CMD_tar() {
-    ${SUDO_CHROOT} tar ${TAR_OPTIONS} -cvf \
+    ${SUDO_CHROOT} tar ${TAR_OPTIONS} -cvSf \
                  ${IMAGE_FILE_CHROOT} --one-file-system -C ${PP_ROOTFS} .
 }
 
-- 
2.30.2

Re: [PATCH v2 0/2] Sparse tar generation

[Anton Mikanovich]

11.07.2022 10:11, Adriaan Schmidt wrote:
> Sorry it took me so long to review!
>
> Just some small optimization: Consistently use tar -S when generating
> archives to avoid expanding sparse files.
>
> Changes since v1:
> - dropped p3
> - rebased p2 to fit with new imagetypes
>
> Jan Kiszka (2):
>    sstate: Generate image packages using sparse
>    targz-img: Handle sparse files efficiently
>
>   meta/classes/imagetypes.bbclass                     | 2 +-
>   meta/classes/rootfs.bbclass                         | 2 +-
>   meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
Applied to next, thanks.