[PATCH v2 1/1] sstate: do not keep intermediate sstate files

[Uladzimir Bely <ubely@ilbers.de>]

This saves about 2...5 GiB of disk space per multiconfig depending
on package list, cross-build mode, etc.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta/classes/dpkg-base.bbclass                      | 7 +++++++
 meta/classes/rootfs.bbclass                         | 7 +++++++
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 928856a9..b5090d13 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -253,6 +253,7 @@ dpkg_build_sstate_finalize() {
     if [ -n "$(find ${DPKG_SSTATE} -maxdepth 1 -name '*.deb' -print -quit)" ]; then
         ln -f ${DPKG_SSTATE}/*.deb -t ${S}/..
     fi
+    do_dpkg_build_sstate_cleanup
 }
 
 python do_dpkg_build_setscene() {
@@ -263,6 +264,12 @@ python do_dpkg_build_setscene() {
 addtask dpkg_build_setscene
 do_dpkg_build_setscene[dirs] += "${S}/.."
 
+do_dpkg_build_sstate_cleanup() {
+    rm -rf ${DPKG_SSTATE}
+}
+
+addtask dpkg_build_sstate_cleanup before do_build after do_dpkg_build
+
 KEEP_INSTALLED_ON_CLEAN ?= "0"
 
 CLEANFUNCS += "deb_clean"
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 2bdb3b6d..0c7b535c 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -305,6 +305,7 @@ do_rootfs_install_sstate_prepare[lockfiles] = "${REPO_ISAR_DIR}/isar.lock"
 
 rootfs_install_sstate_finalize() {
     sudo tar -C ${WORKDIR} -xpf ${ROOTFS_SSTATE}/rootfs.tar
+    do_rootfs_install_sstate_cleanup
 }
 
 python do_rootfs_install_setscene() {
@@ -312,3 +313,9 @@ python do_rootfs_install_setscene() {
     bb.build.exec_func('rootfs_install_sstate_finalize', d)
 }
 addtask do_rootfs_install_setscene
+
+do_rootfs_install_sstate_cleanup() {
+    rm -rf ${ROOTFS_SSTATE}
+}
+
+addtask rootfs_install_sstate_cleanup before do_rootfs_postprocess after do_rootfs_install
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 2f483f5a..16c04bf8 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -408,6 +408,7 @@ bootstrap_sstate_prepare() {
 bootstrap_sstate_finalize() {
     sudo tar -C $(dirname "${ROOTFSDIR}") -xpf ${BOOTSTRAP_SSTATE}/bootstrap.tar
     sudo ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}"
+    do_bootstrap_sstate_cleanup
 }
 
 python do_bootstrap_setscene() {
@@ -418,6 +419,12 @@ python do_bootstrap_setscene() {
 addtask do_bootstrap_setscene
 do_bootstrap_setscene[dirs] = "${DEPLOY_DIR_BOOTSTRAP}"
 
+do_bootstrap_sstate_cleanup() {
+    rm -rf ${BOOTSTRAP_SSTATE}
+}
+
+addtask bootstrap_sstate_cleanup before do_build after do_bootstrap
+
 CLEANFUNCS = "clean_deploy"
 clean_deploy() {
     rm -f "${DEPLOY_ISAR_BOOTSTRAP}"
-- 
2.20.1