From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:adf:d1e3:: with SMTP id g3mr22517206wrd.63.1634134627185; Wed, 13 Oct 2021 07:17:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6141:: with SMTP id y1ls3189583wrt.3.gmail; Wed, 13 Oct 2021 07:17:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOI3tSUU2CXDAt6CIsfv6pktVQ8Rg3gaOU1AM2gXrp3WKm4qo+zttF8jEguf/UOMrzHm1D X-Received: by 2002:adf:e9c8:: with SMTP id l8mr39566688wrn.188.1634134626122; Wed, 13 Oct 2021 07:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634134626; cv=none; d=google.com; s=arc-20160816; b=vQQooz5MDt6/0scf7ujb/0JdSCH2GDeZ3KSuveqEf26YNSCiP+ZEsioGbFbJEQDilR gaRN/fvjTKiSfE9zHw2PhkOQh7i5XY8Y7kQo8TNYT4y1pLP/tepFFX23dWM/vh2GkF4Q 9qHJRrQVac0kjfq23rszRW0nYomYHb2ZzxgXE2PBQRxJF/+kXQKAZyx4JmCtrJQMgvMk Lx/RjOLMmK1ZbHOqLr8aXQsi2Owgps3WZA9SNrzjo3+c9Cioe3lBz6y6fslHPeO4IA5C 9AYJlXFVgq+QQbHhT5u2mo1eXAjSpPlmdl2ZVCH2n60yHfqSHWKArsgIqT0ekm9l35Ol TB0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:content-transfer-encoding:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=Kdv6UUPyTOxQy8neBM1BApKxx5feXLGh5n79bpU7eVw=; b=OblR+fxvnWYgpQMqzxB6mwvfwLdjHEwjMxQbR/2ECueqmJv/vwiw5jTMNswRZcPMnQ XJaSYYL/XegH/yJwG5VRoqipK5HX5SXYp1I1Rh/1Ff4kkFQ78UKNzxtalPdoKyhpuom0 +Mtuzn68sahYF84IyO96bEJmgG5xIhI63n/MQRQNfifr/Tv1qZhG1YMsDx/dBocwfDE6 NFI0Z81HyKBfk7DU2EBWRLyy0U/CFa2zJSYVYMbEAqTvxIHtDuSO3MuKWqwMtrsEfG2x XnQWEMgqEUTFcf25o2N56X6LS5CoyeWuiox4a3aAz04e3NL0Ldsz4miYWRIAC0UhKBRA HWxg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e2si960388wrj.4.2021.10.13.07.17.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Oct 2021 07:17:06 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from [10.54.4.214] (leased-line-st-87-252-252-30.telecom.by [87.252.252.30]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 19DEH3Jh009320 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 13 Oct 2021 16:17:03 +0200 Subject: Re: [PATCH v2 08/10] sstate: add caching to isar-bootstrap To: isar-users@googlegroups.com References: <20211012123625.1703627-1-adriaan.schmidt@siemens.com> <20211012123625.1703627-9-adriaan.schmidt@siemens.com> From: Anton Mikanovich Message-ID: <154a80a5-97c4-c17d-7ca0-462ae0f73315@ilbers.de> Date: Wed, 13 Oct 2021 17:17:03 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20211012123625.1703627-9-adriaan.schmidt@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-TUID: C/DPMizhEQzt On 12.10.21 15:36, Adriaan Schmidt wrote: > 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() { I think it's better not to move existing flags for do_bootstrap to have clear git history. -- Anton Mikanovich Promwad Ltd. External service provider of ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn, Germany +49 (89) 122 67 24-0 Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov