From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a5d:64c5:: with SMTP id f5mr4397387wri.321.1634042196003; Tue, 12 Oct 2021 05:36:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8b92:: with SMTP id o18ls1920805wra.0.gmail; Tue, 12 Oct 2021 05:36:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXRiuZccObwV9LsKorT1moR4OTMY3lm+mI1mJPQF4ePDCvtb3uHO4uY/JtXtcYOr6JwRUI X-Received: by 2002:adf:bc48:: with SMTP id a8mr32194791wrh.397.1634042195095; Tue, 12 Oct 2021 05:36:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634042195; cv=none; d=google.com; s=arc-20160816; b=sVR18TCMFnkS1T952Tr6i85/XlDeInNhnH+tGcOpGqSulP46YqicJvCgVdqz1DItHZ H57t8STFVBL/jac3XHRxVh5fRI6YmKA+Miu+4R+E0v1RYWwaKeA10MdqTi2ej6gqz1Mn 27vTnEH8O6z08hZEKqcBQXuJV7hditu4JTOj6j9CDqzc22E01PhNukav65s50ZNcjcbm PShud/Cr1FnDaDuShLyF6QOkoA0GQMlsPvDWkViYwc+u4dR36FVh8KmX0rGIN0MT0WeS FuCp7n2cbUw+uWrF1ky5j6RSQtYi764h5Icfh0FMTTWJ6i2Y8LvX6950o1186Tta8VO0 LOqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=jSvZVd7D+Lt/AQUxiI37sF9Rt+2ZmW1qTmaU/86ARLg=; b=IbBHs23SJg+7HyCXsO6R0oCtNnAx4u01wPvxbVoUKU3Rc15ENnGhcQe3owZrtSwG5A pDPIVfYtENZSAIKK9GSHJQwOSJ/1j3nkEN6GPmtc9UFYIAiyolLcz0afewR2yZ5rVW4l p0quiMu0uDNzXLfHwOAwBKHCK6YfQhteyNi6BX2/nPjWXefFzMjNSR+Gaa72JEyl24q5 1oSpv/HJqPicglDSZn8i2LPPK5s7LeluVXPz/mgjEvgQW77erGX1fUU/u37gt7BnNSEy +Gad4n+RxXJh4s7eLMpcNvjKT40OmFZ/RZTndYu/bs1/mmUL91nF179rTXoyirr6Cg8z EVIw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id l3si174221wml.2.2021.10.12.05.36.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Oct 2021 05:36:35 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 19CCaYMT027109 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 12 Oct 2021 14:36:34 +0200 Received: from random.ppmd.siemens.net (random.ppmd.siemens.net [139.25.68.25]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 19CCaXOk017377; Tue, 12 Oct 2021 14:36:34 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 08/10] sstate: add caching to isar-bootstrap Date: Tue, 12 Oct 2021 14:36:23 +0200 Message-Id: <20211012123625.1703627-9-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012123625.1703627-1-adriaan.schmidt@siemens.com> References: <20211012123625.1703627-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 7sYvOYfNfes/ Signed-off-by: Adriaan Schmidt --- .../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