From patchwork Fri Feb 4 06:41:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1421 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 04 Feb 2022 17:41:37 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 214Gfa8n001589 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Feb 2022 17:41:36 +0100 Received: by mail-lj1-f188.google.com with SMTP id c31-20020a2ebf1f000000b0022d87a28911sf1286725ljr.1 for ; Fri, 04 Feb 2022 08:41:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1643992891; cv=pass; d=google.com; s=arc-20160816; b=SGGSACZ6/HoqH08oS0pYTWUAbqky1KSJ6Et1lJVxCdbAY8b3Sm2OvrnEYGR/LXxCC/ XPxaiz/IUlVreTshp68R0hahDwSK5JcbpOxx9sHFRty6ir+FWEycD/nA6aXkxycoHI+2 aE0ORPnqnNVHLF3NtKuYzyGQPZFprvtyG4NfX9Ag6kmxZMntv5u87mq26TeIIqfrZybT kKnNtEMxAMihL9rfFfkZJErdT7EzMka30nWhpPUyv2QQ5lQPptjERoo2u/xqhais9byp 5bRiHrwH8a0Tv/p3y8Cq/Q2+7d4dQzL6bUGUHb8hUdCi1VZXpCPEsitu7fjBDPdHioi2 XtRw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=Abys+VaBi0Qh8p/WMkeJEKWLluPJp5lvj8VKO4ux0j0=; b=xEkxx8i88AYKg1/DAhSR1fniFcshDbD+VTyZ+MUTQMKBjrZWLSBRfdAX7RA6Thj9vw FlYDtQ2b9oCRHO1AbpgtIEm2/aGmdrfufd6qNqFENJNkzmrN+bbxvqmFK/SDuFoCOG7n 8ZEYhBI3uTBYHMusDbM6IC6TRIXEaFgEH+D6qfjx2bMU1jffdUGDs9w8AY4G4dYFvbi9 rIE42/+SV4wCQIZ6q930TzEIbJmDWByhWrWvkvEUjsAVwNbIgesdO6cvXGJQCaxkvFtB R+GzoOmK2JiIY4ZRJR4u+rW38DvrZjbvNm8jmE1FFz0ESRfzyu5OS8dQoTHn1AMG6zQZ 1TaQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=GOLlDiVT; spf=pass (google.com: domain of fm-52304-20220204164128bf7d40ada8c29bf488-_8ww14@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-20220204164128bf7d40ada8c29bf488-_8WW14@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=Abys+VaBi0Qh8p/WMkeJEKWLluPJp5lvj8VKO4ux0j0=; b=bevKRrxna25bm0IiwyPv3vMP3I8V3cMwwD2MZlEttk+EsC55gk0fVDcZoxzVO5utG2 DLVtgn5rEWDJ4CDtOYJNhpxFxlhtgi/4eVV66buezRQLv0eRGtZQRN5DM1PYKuYGVN2R Ahonp+fr0IKx+m16nE3GSDBmmyC5VHm+2XYTAQWbZYgdHmzxUL6gyh5MriLykTXNna3f VQ67EiqWLF4A5l8As9h8dpKm/yWJB8bNPBLhym6XB2BxbZl1UZXjgDIW4dBzgunDXgx7 HTkLaWaGKeFcbbTJDok5vm2bRQ0KCkSJE8cOtajvv5p+BpMImfpvrzS03gsPi7+HWxX9 F8aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Abys+VaBi0Qh8p/WMkeJEKWLluPJp5lvj8VKO4ux0j0=; b=Sga0WvVK11qTG3KbJdnWiQyFBnZ+o2lpedh118fEfiP4afNYAsuzV2vdY3YStX67Cl FrAX6LWdlr+nXQvrR2Ea3Dfvu5rlhbTuMOc4g7XADAPJY2dU1FQtzxk7d8hD5dp11bNw 1ZsVvEqfsVGjarzHwXxq5GdA4IGzwJCXHWgowWaTSOeVMpMTS+LT9kbnFNSfNNxj1o1u MgyGp179O6QcqCFhZaGsSoqibDOF9xbXsrnNXAl5HYWYP2UDEnFqygjhgVk5RSHR/7L3 n3SRkGA7vz2vod0VeR2qWi25V6uNM0klbpUGpwxDDq+dxqMxnCr7Bjb64r9e8XdihCjf pBRg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532HJblC2neM54S4Teb3fKm25TAG42PK/MGLnwmxSTpD0x/DXOAa 9WqDRYF3LqQACUiZAC5bDZo= X-Google-Smtp-Source: ABdhPJwvHsJ8oL6+bmaNPKu/NVmxVeSjeyMWcT/oeWmg0uPJUMLXVlTKhQ3kGTJm7pznUHdOACPVWw== X-Received: by 2002:a2e:b05a:: with SMTP id d26mr2251272ljl.425.1643992890846; Fri, 04 Feb 2022 08:41:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e11:: with SMTP id e17ls1823596lfr.1.gmail; Fri, 04 Feb 2022 08:41:30 -0800 (PST) X-Received: by 2002:a05:6512:228a:: with SMTP id f10mr2823536lfu.22.1643992889938; Fri, 04 Feb 2022 08:41:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643992889; cv=none; d=google.com; s=arc-20160816; b=F2p6eWJmRevusimgJ1OKEvrmPGz5MPXXj3SCAgpOB0TxMN/pRAy8ysJG3DQC/ZoUXs QhntUnevgRmDP2SA3vDS/Zp45d6BGgp/PnC2uv0ygItZHMX7ybfEoe37ZOFrhJ3YZZam u8Z/TfbR75Nn8N8EBp3hRLH5Zy5rFD2y2LecMDHWYtCPg+tt8Tu7dBpOUIoRknSFcnm9 F4PqtgitUQ0h8vWUkE6hT+8LOcINzNh1rSLhB5z5WXN+/yfFUpEi6JKBm8TclbNTFx1X 8KxedRUG0mdJ9zBZHVRKiLZSVjuk/6PzcHHaPdfKWZEzeZGWtsWVNrAURZ4gGo/e5e5e NPlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=j+LKr3XzyiDw+F0RhPLy/T/R0XmFJZ1ZokbSq5m0ZSo=; b=kqq8KfL0+HmcD+AUwu1vEI95/6c6uPcE0L67Phb5pL1mLphDOBv3IIWU9Byce0jWL1 THNDR1luNwzbryurl/dWmR9XZA/K6qIUrYhFXQmEmRf1h42WBxTlwaV3LyNol2b/kbjz QY2YlNnBj8hgZCsijakApoBHlRfhQfH1jlqSiLVYQLBb35o9EJ/v5WkJ+R4XeTPTRSD6 OTDE7Ca72ZsWJMsLMxSJcSNEsZdgH4/O54lwdq2QF7NcDgEJE0iQ8Bf6RweGH37swt41 kSBvd5btjuBQKkLq9LhxIUDBlyg/4embA9braFfeI7vjXqn+ub6BVET/IpH/Qr/a3EnZ MOfw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=GOLlDiVT; spf=pass (google.com: domain of fm-52304-20220204164128bf7d40ada8c29bf488-_8ww14@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-20220204164128bf7d40ada8c29bf488-_8WW14@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id k18si78884lfe.8.2022.02.04.08.41.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 08:41:29 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20220204164128bf7d40ada8c29bf488-_8ww14@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20220204164128bf7d40ada8c29bf488 for ; Fri, 04 Feb 2022 17:41:28 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv3 1/3] sstate: change rootfs task to cache Date: Fri, 4 Feb 2022 17:41:22 +0100 Message-Id: <20220204164124.10396-2-henning.schild@siemens.com> In-Reply-To: <20220204164124.10396-1-henning.schild@siemens.com> References: <20220204164124.10396-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=GOLlDiVT; spf=pass (google.com: domain of fm-52304-20220204164128bf7d40ada8c29bf488-_8ww14@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-20220204164128bf7d40ada8c29bf488-_8WW14@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX This patch moves sstate caching from the task "do_rootfs" to "do_rootfs_install". Which is earlier in the task chain. There are two "bugs" that we fix by doing so, while hopefully not giving up on too much caching speed. - rootfs_postprocess: - image_postprocess_mark: potentially outdated BUILD_ID and friends - rootfs_generate_manifest: manifest file gone missing in DEPLOY_DIR Since rootfs_postprocess is kind of an open field it might also fix issues in ROOTFS_POSTPROCESS_COMMAND functions in layers. Any function deriving stuff (like a manifest) or changing stuff (like the mark) could potentially benefit from "not caching". Signed-off-by: Henning Schild --- meta/classes/rootfs.bbclass | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 1fc487896f4d..78fb2cc71350 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -270,29 +270,28 @@ python do_rootfs() { } addtask rootfs before do_build -do_rootfs[depends] = "base-apt:do_cache isar-apt:do_cache_config" - -SSTATETASKS += "do_rootfs" +SSTATETASKS += "do_rootfs_install" ROOTFS_SSTATE = "${WORKDIR}/rootfs-sstate" -do_rootfs[dirs] += "${ROOTFS_SSTATE} ${WORKDIR}/mnt/rootfs" -do_rootfs[cleandirs] += "${ROOTFS_SSTATE}" -do_rootfs[sstate-plaindirs] = "${ROOTFS_SSTATE}" -do_rootfs[sstate-interceptfuncs] = "rootfs_sstate_prepare" +do_rootfs_install[depends] += " base-apt:do_cache isar-apt:do_cache_config" +do_rootfs_install[dirs] += "${ROOTFS_SSTATE} ${WORKDIR}/mnt/rootfs" +do_rootfs_install[cleandirs] += "${ROOTFS_SSTATE}" +do_rootfs_install[sstate-plaindirs] = "${ROOTFS_SSTATE}" +do_rootfs_install[sstate-interceptfuncs] = "rootfs_install_sstate_prepare" # the buildchroot is owned by root, so we need some sudoing to pack and unpack -rootfs_sstate_prepare() { +rootfs_install_sstate_prepare() { sudo mount --bind ${WORKDIR}/rootfs ${WORKDIR}/mnt/rootfs -o ro sudo tar -C ${WORKDIR}/mnt -cpf ${ROOTFS_SSTATE}/rootfs.tar --one-file-system rootfs sudo umount ${WORKDIR}/mnt/rootfs } -do_rootfs_sstate_prepare[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" +do_rootfs_install_sstate_prepare[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" -rootfs_sstate_finalize() { +rootfs_install_sstate_finalize() { sudo tar -C ${WORKDIR} -xpf ${ROOTFS_SSTATE}/rootfs.tar } -python do_rootfs_setscene() { +python do_rootfs_install_setscene() { sstate_setscene(d) - bb.build.exec_func('rootfs_sstate_finalize', d) + bb.build.exec_func('rootfs_install_sstate_finalize', d) } -addtask do_rootfs_setscene +addtask do_rootfs_install_setscene From patchwork Fri Feb 4 06:41:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1422 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 04 Feb 2022 17:41:37 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 214GfajA001592 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Feb 2022 17:41:36 +0100 Received: by mail-lj1-f191.google.com with SMTP id p6-20020a2e8046000000b0023e1f44053bsf1293880ljg.0 for ; Fri, 04 Feb 2022 08:41:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1643992891; cv=pass; d=google.com; s=arc-20160816; b=zmfNpYj63bCS5NIQs6hfHHU9AYk20XGne0x/Ov8JSZbBNHo71Lhbeb2TmWRX/SJS0/ sUG/Hje8LgkDOGtFSbo7LPfUz8med7I0MeDHTwVx+VoiY3SDfoO8K28BYDXUrzBZIPdh 88GBZQpo8oX4aZXQKyA38Rnt2WDyvegmb6+cDDLnIv4238M7tuR5nAiqgZUxGq2QwQhP wuiVSTt9KhiVY9AcXSL+AS5w+hTO8ZJf+SejwcrRjH8zcQvAIfuwB3RYj6YBvpDPVh/M UkEGhjcVYXrkfQL6cWOz+U/aklkV2+SPLZW+44N4L2V23WEj4aUp/bMJd3jU8d6nRTaU ebTg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=q/yKM/fnh9zM5TdDt36ptFKN+y1hYUv/UIsy0LgFTWc=; b=rM6hbuQ1PwB59K93wjM8h+60BhAQPGGFKYZ7S2emu5QTji0s9KeyjUzjGX+I+A8VU4 jtTwadxK8JDBaXqfCC5llLk4XRth1R/SIPub80oacZIMSQtvE+GazPA7x+nxY3ahyyX7 kZ2mHnKVqqzYiqm1yjfuNCTvU0GMIEfdKu1gg/49Cbru/Rqkcz49Gop4pHBWHUtC597m Sbc8WN8iR4/eRGBkRt/54CnXGxVDCPppDcQJ+B958qsrStL5J7YVCyN7dr0eqWsb00gc HIqs0pJhlCGFnV5EqkzaSaq/QW5h2BbRtOYhzvqh/RN+l8ndOc/CFXNZ/gO4r3ymryuf kojg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KAoB34GU; spf=pass (google.com: domain of fm-52304-202202041641296a493cfdf324b23929-a_bveu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-202202041641296a493cfdf324b23929-A_bveu@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=q/yKM/fnh9zM5TdDt36ptFKN+y1hYUv/UIsy0LgFTWc=; b=ZFjsVAbTUrQuGs788+4TQtCltWQ+7Mpo/3N2v5V7U2rQ+MaH4Ei5shU1jl2xozlTPu AwrwXqawhSBqiQbBmJ/fQ/N9snIb4l0UNCWtPxdO8BFgfBCoteoieTuQJAYbaKoKXTjI TElJi+LlyV1LHDqDne8a1dL6gvmtRik18vAWK6DcmgYgntrro7/FQOZi07KTmsYXo8Js 8t3UdaAi3uM+9xRln/EGR7yESMZsN4VU8674qIyio+0fobV5G1HWM1XZI9EK9IVVjz8B z3LhcEmUxYSTknvOGb+yP7TVUWMQIUPKYjqZZsIfkaMnpok0EbMTCbABigEhhWwxaJ7d NMYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=q/yKM/fnh9zM5TdDt36ptFKN+y1hYUv/UIsy0LgFTWc=; b=6gl3bsALbpx/Wn1R0VXIDsuflB9UMMeKWYsr0icznsjizSvB7Io2dC5wsyqUAjgUj1 K0HlNZaD7Kp+kxa30nRm8pCZe4IviMw847SU0/e0P42OO5LwtOaA7Y/bA43HxEoCEdA5 rEMOtQpOj+yOvUZHin7i+/3XOhRUHZBX2ytsDaiMOQhDNtXQY+fyMP0k15WKvU20i1aS FIvgCNLB41wrFtN/dCE1YLmwxHQSEFzutLK8kB9QC8v7Fpvk6yzKxirJGCTLFraNoW3s J1MTbOJAhVVmoqEPPGKrT+CeUsj9OJYZuab6YdkfjNcfeVTRy+UttlA42a4AwilwFNzI acmw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531pWq6wQ8SnWN8fCvV8GDreCEeeLjVDLMvp5HkNVNjoQ3zDQ3SK KlyulCV9AxeaseABPwjTzvY= X-Google-Smtp-Source: ABdhPJwrsCIdjXTwAwVxGtH+lKa/FK1NWeBpKzd+qwH0MIVqowYprJ9Ztk9benKmsezQQNfuJXvvRg== X-Received: by 2002:a2e:7a11:: with SMTP id v17mr2295964ljc.63.1643992890585; Fri, 04 Feb 2022 08:41:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:98b:: with SMTP id b11ls394723ljq.7.gmail; Fri, 04 Feb 2022 08:41:29 -0800 (PST) X-Received: by 2002:a2e:2c11:: with SMTP id s17mr2269086ljs.424.1643992889651; Fri, 04 Feb 2022 08:41:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643992889; cv=none; d=google.com; s=arc-20160816; b=oTKfKiQ6xv39q07Hm+jYghgurAzN/jdCHFkd5iaSatO/kPo3QV7y7wgUsFBTR86aty A0NUov6MqJ8AeODZzN6PXzDR7um1uuEelkdRwvTm7rpx1+VErq52XCKPSmjmWMUAk/us Kktx6Q9XwBmRXYLBGero2NxB6Wvu0yO7wy6lNtiSmxfnzZUfsCgoeSUMLmnKMJvUXfDo +S8Yoetuqes7DLm8Y+Bi63lYCvTzvIAFob9CIX9DAp7PCgYVjNMWKl2MhCkJCcIkEHKD LUF3dMibqiKi4KruKffl7ggIuajwAQsFlCrPeDOm1yzuzFbi9BAR3FbO28GDAnx8YPyy K2Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=eDl4+R/Xqp6SnY7LJxpET8/0W+5r0k1u55xfKEs3G2M=; b=IGU7h6+TMsASisV05hoFeAHhWs3NqyJ9c3LUfOgimluOoPh4GDjX3Kyx3t+A7/2rjn WA1QjT9L3FrqKdHC1ncdpWHJ3Q+cqgRB3B6XOsa2MyfM0pBoMjFe+8JEaZSC8xdaql1y KYrtKWfjyTtsuvATziI2EaG98xcNZQUbpYYszFM0lQuIqeaq0EIxhuvPcWsMrDOKbQUQ xUqLD7q2E+SXEM4+5udfjdYJX8mtq6JIHkzAvUf4nVur/CH5tDwbP5GCwAMJzWrO3/aS Zf5wF8M6Q6dOvxbDIegApX2Lkaaa/fAHIBnLpw6p77GeAC8TwMkx0imOlA+BmtURk1HK nPxg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KAoB34GU; spf=pass (google.com: domain of fm-52304-202202041641296a493cfdf324b23929-a_bveu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-202202041641296a493cfdf324b23929-A_bveu@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id x16si89659lfr.10.2022.02.04.08.41.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 08:41:29 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202202041641296a493cfdf324b23929-a_bveu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202202041641296a493cfdf324b23929 for ; Fri, 04 Feb 2022 17:41:29 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv3 2/3] sstate: fix task order and deps Date: Fri, 4 Feb 2022 17:41:23 +0100 Message-Id: <20220204164124.10396-3-henning.schild@siemens.com> In-Reply-To: <20220204164124.10396-1-henning.schild@siemens.com> References: <20220204164124.10396-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KAoB34GU; spf=pass (google.com: domain of fm-52304-202202041641296a493cfdf324b23929-a_bveu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-202202041641296a493cfdf324b23929-A_bveu@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX With do_rootfs_install being the new sstate task we need to be more precise on what needs to happen before do_rootfs_postprocess. Some postprocess functions need files downloaded so we add "after unpack" - sdkchroot_install_files - buildchroot_install_files And do_rootfs_postprocess needs the apt caches for rootfs_do_mounts. Signed-off-by: Henning Schild --- meta/classes/rootfs.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 78fb2cc71350..9f0d345dae03 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -262,7 +262,7 @@ python do_rootfs_postprocess() { bb.build.exec_func(cmd, d) progress_reporter.update(int(i / len(cmds) * 100)) } -addtask rootfs_postprocess before do_rootfs +addtask rootfs_postprocess before do_rootfs after do_unpack python do_rootfs() { """Virtual task""" @@ -270,9 +270,10 @@ python do_rootfs() { } addtask rootfs before do_build +do_rootfs_postprocess[depends] = "base-apt:do_cache isar-apt:do_cache_config" + SSTATETASKS += "do_rootfs_install" ROOTFS_SSTATE = "${WORKDIR}/rootfs-sstate" -do_rootfs_install[depends] += " base-apt:do_cache isar-apt:do_cache_config" do_rootfs_install[dirs] += "${ROOTFS_SSTATE} ${WORKDIR}/mnt/rootfs" do_rootfs_install[cleandirs] += "${ROOTFS_SSTATE}" do_rootfs_install[sstate-plaindirs] = "${ROOTFS_SSTATE}" From patchwork Fri Feb 4 06:41:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1420 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 04 Feb 2022 17:41:37 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 214GfaD5001590 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Feb 2022 17:41:36 +0100 Received: by mail-lj1-f187.google.com with SMTP id c31-20020a2ebf1f000000b0022d87a28911sf1286719ljr.1 for ; Fri, 04 Feb 2022 08:41:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1643992891; cv=pass; d=google.com; s=arc-20160816; b=Q1nFFcLVMNhtMQI7Cvl047VctlTGPD+8QemxbXsAMDgriKqC4msno3h4cGPsXli1oH A3zUZiyBAb0+HYc2lElG7j3Rb2Wg3DzAfoiDnkLVjgyO/3Q8wMRXIPRL+S7QHNvzQKds mslftRMBez9pMFxUNQU85vD2W64N48itC3cLQS/l5CddVz2vEzm3ACId+1pv9l0gW/Km Kpk2PetajBkpU9Zag3ti/OY05TSRMfKrfNTUpVrYewqqgVVPGJDvdSz7GxHcqBeYHoup YoD5Hz+sTABu9QNjiBzMOLeq9rfbJ80zTDJ1+QNZYW2HoPaGT3E6I4rJvO3Zy2s1I6rY U4zg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=oFOPjqqCNcfvITH0JcGE29nCseBUV24K+x+Zs2J6sLI=; b=WAPH1ddVMC6l8bTCPN1l/jQ7asdlLHkvtjLmYe1fzd8x2qdzZlBuMT1gfj4vcNNPPq HNnHmy4vH5fkVasvf6YTnQ6loYIucOk6bBBP1aa0qUwZxtJbeKMEuMgs2PQNRohXnfSS bA3KLVbSx9Zjg2dyqR5xo6tX/iy3yQkFtB03WYbnVIiLn1aT7tRN715zeSlgijPzj1Ka 1yb4ik1QjRS+2GrEqPBy/4Jogcg5692gJt/eqd6mHG2gVsR/MGNizjbjnoRP0vM/8Q0K HWEn4wlq06G7OTN1UfoGMKLD+yYzeqFgMaqQViiH9apIwIms0fDHQ4AYkPK0vSuvVLqG dUAQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Es4p1PO8; spf=pass (google.com: domain of fm-52304-20220204164129eee0a1a8a0b0b82e95-hs_dcz@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-20220204164129eee0a1a8a0b0b82e95-Hs_dcz@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=oFOPjqqCNcfvITH0JcGE29nCseBUV24K+x+Zs2J6sLI=; b=N/fBlJFw9M1+fZ+d24VngzDa7jh8Fk19E29IaPisPraTmYAsfWpqD166BjqETG2CGW k3+xjEo5KFvC99M2NSszXm0LgwyYB7wyGjY5VWgQJPMZL662LiynGrmf4tpVwWoMD0ME q0Pw0+nLOdX+0dSa38gxtm3heRpTo8mq4sp+zQZY51ResHvzS8gzmi5V63kfKB8wFY6V 0NI8DOUuAEjHCoq1kUfWmrFigAazydNX7nnO8IM9p6205d9puSqx7gZsE+eD7cELvqVH ElIQSpwK+GEbVFFawbkCtvl7sehs2n/5N/658Ikgg3xOV84GmuyHIdQG3TBpzAGIvvBD eibw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=oFOPjqqCNcfvITH0JcGE29nCseBUV24K+x+Zs2J6sLI=; b=j2ImhOy+MPl+L9mu7LqoOO81CXKVO86PG7C1d7tCT6ID/ZtKk6qotD+Pnc2uyNOh2N GJOEPhkc8qEkZyxZ0iRjMFiwkHsRarz1xfxa3bzfjdtJ4Rg1E/2rrW1leHt/ejp9N9AL zNOEuA+jD8bkMJVhFr0XUzA2rOsGwgnEKTH2FR724uTGL+ssoMc9q5hVPrUD8zOknpdZ WRtIr6pj96NFry9YOs78t0dnBtKrfcTbnvG31ymGx23Hb9fDemg5upMwj49AdYAcHQqP 9wIZXsMTWZI1A5tA15Ze2+FK/+ZNqFXRhT4A4ja4Sh1+F06uyERUoI7lkmff1vrVGfJw 1Z/A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Qwuip4QJwtkXGqxYLWXCC7L/O7E8qBdNmAgSCbzwvmuKT6c9c lg9T4XmUrjZqCby9S+vj3qw= X-Google-Smtp-Source: ABdhPJyX7M0IkyoKObVZXiN3ZaUKfMKKxL2Dybt74g7zvVkZV8D0Wil+Xlvkq24QqYJrfQefEIHjcg== X-Received: by 2002:a05:6512:a93:: with SMTP id m19mr2951745lfu.117.1643992890715; Fri, 04 Feb 2022 08:41:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:198d:: with SMTP id bx13ls397811ljb.2.gmail; Fri, 04 Feb 2022 08:41:29 -0800 (PST) X-Received: by 2002:a2e:a546:: with SMTP id e6mr2371927ljn.368.1643992889816; Fri, 04 Feb 2022 08:41:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643992889; cv=none; d=google.com; s=arc-20160816; b=s5r7QZBPf/+irsHMRNEFX05FyZc/Lwb4zMKizdSJ32rDBXXC3mLKNt/p1/c3iDd6N7 OjTG5r4b+FVg3fdLbKvLquXsgvsS0r4l+GOo6rV1RC9K5tG9aMTmVMxOq12Nf/VbkDid DUKBPnTj4/wzy52eNpyoKAR2qn5hb+e6BIyVgycLkHVW2VGd8ltGI44wo+Kc7UGwmE9m 0nEvNln3KVIIHbuA7Rh62QC/O76C0MVz9s2tiIBUZM/YY7pX4lwwTSXASIA8Py2Hqg0P P5YeZ2oosAkVOORmmVzSFef0QVbsv2uZM/yzgRXOAMbCa2EIawTRGB8Om/DDb1eJ0iAA 5c4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=PEqEZ9R24X08kRsOUj8RqsBNdWwiI9YUvsnrm8Ppb5Y=; b=SXHdqIRJDXAIxZ8EUijPxeKPuVG+VmQkwCb/7YKQWTv46zDBY3REi8A2oTlVLYx+VF frF9TT0r/FahqP9XzwVJBrp+Hw7KoSYf5XVdP9MytuX86PgIVo2pJzsmbNytJU0GFgHQ oFY8P8SKUvIasn5Dburz22j/m8oHugE5q7NT7TVhhPNq5b0nGDwV8HRkCmmomTIUSogu KN5ZOjKZIuAkrTqf1UPCCMzqlbz+oMrNdpwnjDfUYk9k5gCqJBxtheE4eo9RxBCHWyA+ bSULZeg7vsD2y/4n0mAQFR1rN8NrxK48YbNKIOrlM7EMVY+iT3zxmFdvBAwxAly5Pw1h vgog== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Es4p1PO8; spf=pass (google.com: domain of fm-52304-20220204164129eee0a1a8a0b0b82e95-hs_dcz@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-20220204164129eee0a1a8a0b0b82e95-Hs_dcz@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id x16si89659lfr.10.2022.02.04.08.41.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 08:41:29 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20220204164129eee0a1a8a0b0b82e95-hs_dcz@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20220204164129eee0a1a8a0b0b82e95 for ; Fri, 04 Feb 2022 17:41:29 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv3 3/3] buildchroot: make function buildchroot_install_files idempotent Date: Fri, 4 Feb 2022 17:41:24 +0100 Message-Id: <20220204164124.10396-4-henning.schild@siemens.com> In-Reply-To: <20220204164124.10396-1-henning.schild@siemens.com> References: <20220204164124.10396-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Es4p1PO8; spf=pass (google.com: domain of fm-52304-20220204164129eee0a1a8a0b0b82e95-hs_dcz@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-52304-20220204164129eee0a1a8a0b0b82e95-Hs_dcz@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Signed-off-by: Henning Schild --- meta/recipes-devtools/buildchroot/buildchroot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index 6d9ced0c3f28..aa190e921ae4 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -61,7 +61,7 @@ buildchroot_install_files() { sudo install -m 755 ${WORKDIR}/common.sh ${BUILDCHROOT_DIR}/isar/ sudo install -m 755 ${WORKDIR}/deps.sh ${BUILDCHROOT_DIR}/isar/ - sudo ln -s /downloads/git "${BUILDCHROOT_DIR}/home/.git-downloads" + sudo ln -sf /downloads/git "${BUILDCHROOT_DIR}/home/.git-downloads" # Configure root filesystem sudo install -m 755 ${WORKDIR}/configscript.sh ${BUILDCHROOT_DIR}