From: Adriaan Schmidt <adriaan.schmidt@siemens.com>
To: isar-users@googlegroups.com
Cc: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Subject: [PATCH 08/10] sstate: add caching to isar-bootstrap
Date: Thu, 7 Oct 2021 09:56:35 +0200 [thread overview]
Message-ID: <20211007075637.590860-9-adriaan.schmidt@siemens.com> (raw)
In-Reply-To: <20211007075637.590860-1-adriaan.schmidt@siemens.com>
Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
---
.../isar-bootstrap/isar-bootstrap.inc | 39 +++++++++++++++----
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index b8af676..a1cdf19 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -263,14 +263,6 @@ def get_host_release():
rel = platform.release()
return rel
-do_bootstrap[vardeps] += " \
- DISTRO_APT_PREMIRRORS \
- ISAR_ENABLE_COMPAT_ARCH \
- ${DISTRO_VARS_PREFIX}DISTRO_APT_SOURCES \
- "
-do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}"
-do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config"
-
do_bootstrap() {
if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then
if [ -z "${COMPAT_DISTRO_ARCH}" ]; then
@@ -398,6 +390,37 @@ EOSUDO
}
addtask bootstrap before do_build after do_generate_keyrings
+do_bootstrap[vardeps] += " \
+ DISTRO_APT_PREMIRRORS \
+ ISAR_ENABLE_COMPAT_ARCH \
+ ${DISTRO_VARS_PREFIX}DISTRO_APT_SOURCES \
+ "
+do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}"
+do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config"
+
+SSTATETASKS += "do_bootstrap"
+BOOTSTRAP_SSTATE = "${WORKDIR}/bootstrap-sstate"
+do_bootstrap[dirs] += "${BOOTSTRAP_SSTATE}"
+do_bootstrap[cleandirs] += "${BOOTSTRAP_SSTATE}"
+do_bootstrap[sstate-plaindirs] = "${BOOTSTRAP_SSTATE}"
+do_bootstrap[sstate-interceptfuncs] = "bootstrap_sstate_prepare"
+
+bootstrap_sstate_prepare() {
+ sudo tar -C $(dirname "${ROOTFSDIR}") -cpf ${BOOTSTRAP_SSTATE}/bootstrap.tar --one-file-system $(basename "${ROOTFSDIR}")
+}
+
+bootstrap_sstate_finalize() {
+ sudo tar -C $(dirname "${ROOTFSDIR}") -xpf ${BOOTSTRAP_SSTATE}/bootstrap.tar
+ sudo ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}"
+}
+
+python do_bootstrap_setscene() {
+ sstate_setscene(d)
+ bb.build.exec_func('bootstrap_sstate_finalize', d)
+}
+
+addtask do_bootstrap_setscene
+do_bootstrap_setscene[dirs] = "${DEPLOY_DIR_BOOTSTRAP}"
CLEANFUNCS = "clean_deploy"
clean_deploy() {
--
2.30.2
next prev parent reply other threads:[~2021-10-07 7:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 7:56 [PATCH 00/10] Add sstate-cache Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 01/10] oe imports in central location Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 02/10] wic-img: create deploy dir Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 03/10] rootfs: recursively depend on packages Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 04/10] base: remove unneeded "before do_build" task dependencies Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 05/10] dpkg: add explicit dependency to isar-apt Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 06/10] meta: add sstate feature from oe Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 07/10] sstate: configure Adriaan Schmidt
2021-10-07 7:56 ` Adriaan Schmidt [this message]
2021-10-07 7:56 ` [PATCH 09/10] sstate: add caching to rootfs Adriaan Schmidt
2021-10-07 7:56 ` [PATCH 10/10] sstate: add caching to debian packages Adriaan Schmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007075637.590860-9-adriaan.schmidt@siemens.com \
--to=adriaan.schmidt@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox