From patchwork Tue Apr 2 17:28:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3463 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f192.google.com (mail-qt1-f192.google.com [209.85.160.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HT4gv019565 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:05 +0200 Received: by mail-qt1-f192.google.com with SMTP id d75a77b69052e-430b673a96esf69484291cf.2 for ; Tue, 02 Apr 2024 10:29:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078939; cv=pass; d=google.com; s=arc-20160816; b=yf2GaRf0cBaClr4zBhfsqYP7Wljjp7rKaxSA3QUWaymCl3/v7aYuh+5uEGKCMGQoR4 IFpr4U3QNhlbblzHJ5xTdQIszEeD5PZAIyEYoGEMOsV4Wb+4bjPRDs8K+JM4CkEx1sSg ISE3z4+DB9wBfs9155DOD+MuILbCsFJ0eMOEdSYIfw4P1C/RLRz06YKnKzdQOBEWpysX 6M7IDymbfjMoKD/AZanChfUNbNFjrq28s7+yM1SuAzkpgw0EDjqG8V0nTHMUtXJRAXiE qneHlEbiyHy0jXq27BrnhJhlDKMQrK0ksY5sV9VMJdhLdOSHGzyBCInyRhjlRNMPGX2d RsQA== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=ph6RUbpY06tsGrFpUmY2kiTLy9pLonesWsh/zjbxDHw=; fh=9gnWMDeO+pgSRSzwGYnjMR2prdJyZbZNyhJ3gincnU0=; b=P+1F2IZ81VDOLXjq1W564dwoYN533u57J46NcjT+6sGiHLUrQrUctki7/HfdAuF0SL wDtCrIZQxLN/4C5CCETA0PrXF0e95MSXkwQCG2pjNTnCgyqk8ZV5FtIr82FTZ0qBKiJ2 uIN8jGBklrUXiCRMd20hjtKmQUIVxG/ufRcVVvIdZpOiihhDcx2JiGa9sp4eBdD9L7Y3 4nB/aTt+v0Ge+K/nqSlm2ahgRUYcRBbGRTAl49q+pxzS+AotPp7Pci8HH1l+pUBnxQrL FezRmHqwXvznhQqJMyA9P+I7TPVUKmku2IVuBClk3oziaZ7i3weetYOJKnG+0nGUqS4g FBEg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IDqAxCdU; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1030 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078939; x=1712683739; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=ph6RUbpY06tsGrFpUmY2kiTLy9pLonesWsh/zjbxDHw=; b=Oyrpd/zMC2DIlFZOQQ+UNDBmuryPZd9m3Qw1VGfIQd1I0UQkazw9cUTudtzjEuSsEw H0P63U7POmknkaFHNbUjqXy8HMJa3lFsJ5k/Lqhc7WHy1tJo0ZoMW5Ksg15qd+bddXiB dUeUhBEfIOaeZRKcAGQDMTStMspg4fk3KB3sizXR7iRdjaURIz6mAN2JMeIKvtlfhz6u gnVkDWczZQSrHWQ94I0ThDW+dBLh6qRGYvBmk+88R0R62HdePFvsVJicFLf6BRJFyUr1 LjvpzKOUgJTnCbJkzkNc4zm0Y1P+pZaR3RGyXALW72urlb6WIYinmgDDHCdou5Stu+rW nTig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078939; x=1712683739; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ph6RUbpY06tsGrFpUmY2kiTLy9pLonesWsh/zjbxDHw=; b=ZQGwRzEabKpTMWmGfVly26zkCfly6kD4L7p3oTjtXBQ2IxppaNXqdOBXxv626G0rq0 1M4FCRW0TT+RAH6G1eFvVvwEqBdmnOsE+gntO0tezl6+9+VCAb3lcbDiShkHG47fh7sy YnGtJtr9NFq/U0teosCALAQy7AWWHpfZmCBIMk4kPTGmTseKRBUc6t+kW2rJM8Gb8rnn p0lStOaWwhhrfq6uT5WaaYrHH3LzQU0y0kTzOeLd2ygw4LT3fcycHQZCPxqn9+KRTm9s 5zHRYkxiiNBGAoiQjj0pHC0WL+Hvh689yS1tOpnnJkpn5nShu/HUzWEgZsYuK37TwUJt T1Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078939; x=1712683739; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=ph6RUbpY06tsGrFpUmY2kiTLy9pLonesWsh/zjbxDHw=; b=NH0byHkitlPRpAzmrYWoCzqXNJIdIzR0JxuLBkaTBM2rcfoLYeWN5Gbqnkxsu6fr3F HYt5DNsZtfPdXJky8N2shk4dCfLr2JVcmKVNbp9nj0mSzS+HERJNGhnDINcYq0zh0I4p ZbXfX7D4nN7bbfbdykxvRFR9L1rhkNNBLlAHTuXLKtc9kId+32XIo/Z2bbKLXRSlonIK ZZBIF+aJkiGK45TRWNVObHFXVgC3lxKpqKivGLlYNpIzmQTn5F2quBr7dl55w2nlD7BN SlmhLc4mBsm4LTIviK6sieuBwEHUkxPE50pS8/+CDE2jojcXHyW5mrv42UcZvswfna0j 0TuQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXv3gFEIUtjRie0NYIt+m2J5bjcrRR3xaxPNfo5Y5H/wGiM7uFn0LN6BtKpf7kBngmy/wDsJ+GDyksQBpmT+Dutgh8GW6A= X-Gm-Message-State: AOJu0YwPQoGIV1ZgfTkCW0l445TAtArpfgILLAAT+6Go6q0/x5macxaH 29kbhf9ccMDQXrw633VO4Q2slQltjmX0lZ64nvMOzMJkkhKbUYrJ X-Google-Smtp-Source: AGHT+IFHV69VOtUPF9WDkPjL2Y6isZvVee9FG79d30yQh+6uMPFy0aFv1mbffizxJHaOo5AA6LKciA== X-Received: by 2002:a05:622a:1653:b0:432:d61d:3d7e with SMTP id y19-20020a05622a165300b00432d61d3d7emr9854667qtj.30.1712078939125; Tue, 02 Apr 2024 10:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:7d05:0:b0:431:39ab:805c with SMTP id g5-20020ac87d05000000b0043139ab805cls6292680qtb.1.-pod-prod-07-us; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) X-Received: by 2002:a05:622a:1a9a:b0:434:3ecb:b6eb with SMTP id s26-20020a05622a1a9a00b004343ecbb6ebmr945750qtc.46.1712078938506; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078938; cv=none; d=google.com; s=arc-20160816; b=aimmBXlsNI+NqvKzwloTZec/kLRg4VQ6JPNlK5eXWdjBbPoRZKlg+CxU1As+MCdD4o aWWmYc+KiyTLi/p6ojeLD944O9YpxiADTRWrdZXGqA1HQEeXgYuVnbNKMMBesK2zkVhg EHy4iduFpzRTAXXYOcI4ve0AOgM5RbU72/+B/hsGT2EkaLU6n6czaAOZtCUyRiQiztKf UIVbI9J6IHXhjKb3qrUFpNo58TEkSeb+GzKHh4m5uOnCvGcpsW1cO2GzvEVctp6BtTkx H9J+nt8x2OAA8kVKGlyxycrIMYnrKyYNDUq3hPMY7f/CGf5F4GW6tqK83toXuyrJcNJ8 hzpw== 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:dkim-signature; bh=BWJRHi/pgOK4uuXLICjusI1Z9vlLCros0C/57POwrtA=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=SlaM7JsbT/eY/Kn2gKwRKmkQmbr8LDd3k0OH11A/R4Uh027gPPB8c2UacZfMJwZKXJ qXNfb46kGHU3eWVu6LEzP8xs+mrpuZKp0Q/ShKqkJtdE6XSY8y1lqn6iBws7DFEarOqD eqgCEcoMDfAjiHGnyKyr9at0bcisXeYJxklNm7k+4xJBQEBDHTWBDqAFb7TGKWfore4P w2UZ5YRgHqY5kRkWBjnpebZSciILnhY26kiskaWZ0kkrEB6f7A50tsw6BIz7rZtpNQhM 7wekHJJp1l8aJZwcMa02AwsBngC46uPU3DDMTIptpalg59NH99wPuNlCAMq2wXLysHVc RFEg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IDqAxCdU; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1030 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com. [2607:f8b0:4864:20::1030]) by gmr-mx.google.com with ESMTPS id eq25-20020a05622a5e1900b0043140b1ef8fsi1026345qtb.3.2024.04.02.10.28.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1030 as permitted sender) client-ip=2607:f8b0:4864:20::1030; Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2a07b092c4fso4176435a91.0 for ; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) X-Received: by 2002:a17:90a:a884:b0:2a2:5876:5a74 with SMTP id h4-20020a17090aa88400b002a258765a74mr2391318pjq.25.1712078936683; Tue, 02 Apr 2024 10:28:56 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:28:56 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 1/9] isar-bootstrap: avoid forced early expansion of key vars Date: Tue, 2 Apr 2024 17:28:05 +0000 Message-Id: <20240402172813.418770-2-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IDqAxCdU; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1030 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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: =?utf-8?q?INBOX?= From: Christopher Larson Rather than appending the items from the expanded key variables into SRC_URI individually, which means there's no way to use tools like vardepvalue or vardepexclude to control signature generation, append the unexpanded variables to the SRC_URI directly. This avoids issues with shared state reuse for the isar-bootstrap packages. Signed-off-by: Christopher Larson --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 17f19fd8..de14e946 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 FILESPATH:prepend := "${THISDIR}/files:" SRC_URI = " \ file://locale \ - file://chroot-setup.sh" + file://chroot-setup.sh \ + ${DISTRO_BOOTSTRAP_KEYS} \ + ${THIRD_PARTY_APT_KEYS}" PV = "1.0" BOOTSTRAP_FOR_HOST ?= "0" @@ -22,6 +24,8 @@ APTSRCS = "${WORKDIR}/apt-sources" APTSRCS_INIT = "${WORKDIR}/apt-sources-init" DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" +DISTRO_BOOTSTRAP_KEYS ?= "" +THIRD_PARTY_APT_KEYS ?= "" DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" @@ -48,13 +52,11 @@ python () { distro_bootstrap_keys += own_pub_key.split() for key in distro_bootstrap_keys: - d.appendVar("SRC_URI", " %s" % key) fetcher = bb.fetch2.Fetch([key], d) filename = os.path.relpath(fetcher.localpath(key), topdir) d.appendVar("DISTRO_BOOTSTRAP_KEYFILES", " ${TOPDIR}/%s" % filename) for key in third_party_apt_keys: - d.appendVar("SRC_URI", " %s" % key) fetcher = bb.fetch2.Fetch([key], d) filename = os.path.relpath(fetcher.localpath(key), topdir) d.appendVar("THIRD_PARTY_APT_KEYFILES", " ${TOPDIR}/%s" % filename) From patchwork Tue Apr 2 17:28:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3464 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:07 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f190.google.com (mail-yw1-f190.google.com [209.85.128.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HT5dk019575 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:06 +0200 Received: by mail-yw1-f190.google.com with SMTP id 00721157ae682-615365a5ecfsf9136557b3.3 for ; Tue, 02 Apr 2024 10:29:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078940; cv=pass; d=google.com; s=arc-20160816; b=fsXwfyx2pj8kiNwPr49ICh0/7dJhoSVcf/A0jtBhgIYIzO3hGM6Hf36KJh5nDS20aW vAJk9cwN4MVkm8rYLfsNPwKvsc3rU7xgbf7GZdNxocuwgRAeHnDjzNSzf9St/glIyGQI 7JbTSM5Q+Lzpt0C1+By0dS2sXLgB0liidn5J7LmWKVj55kG/elJfAd+PP7HJz32Z/Kxg s1FiowXJdWe8R4dqBEw1crTLwJ/NCQRa5Lamh3+qJzSb5K456qgxZ8SpVIebbC83ctOo S3A6VjIx1yCRcgOSR63X9KmXMMm1ZpWlYpQwmdB0RVc7lrwoFhjf8hDUKCbDFiPclEsH w88A== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=U9fLwQnnQXxurtfEPyHZg3O1kvYmUL82ATeUtVwPd38=; fh=TumyUueu3zDfjgk6L7MKi4OMl2+fTf/H5bQXYcNLRPA=; b=ZLXo9NQyCbGcQyo/4kQIOgfri36QDQrSIph1KkLa8ccm8sbllXCkQ5RVgDQiUmaasG cx0rrIAio2xKri5O6QpKN/eXqFvw92WIBrk1rk4faLSxtHokg8K/LJoqe9pSFQ/RbaFM oqKByzzKb9AV9OhmVkNqzXDb1HtjKCyCWkURs3GkpcfnyiV5Obk769eJiCf6rajl6B2T oZJWY365i4RU8jD9LvHA8TR1+B+3foSElL8yc3UBU1mmqlxlnVBKuE9Tb0OmKkgUL+ze GkxZzdEZxVv/aOs8JlWn0yKr7KQKZxoMir+yKXGZ7rwWBfbzMbj7fVcIYBUFaxMBObCw K1Rg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hD73dKSp; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::432 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078940; x=1712683740; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=U9fLwQnnQXxurtfEPyHZg3O1kvYmUL82ATeUtVwPd38=; b=YDY1VsXkPhOqYD862jXU9AXjQfzXI3s8Zgs0rDELqIVUiFdok4MMbVzFGmtuQUBbqy aUaMWO/j4gg3o/i4EHifT/CX02m+1AWAo0sCBUDLiCky8+WKOjnBlQfTybq60ei6/q9o OxQtReiEBjWY1tBCNlolzTBmbBMqeyPYFVJpn7pE+fgIkN3cDUCiWVIKmPhELSJYZsiB qbPMuRruSoOdEV2SL1nOBYXwBBqd+sFQgfwVPlwnQHojrdjgslSMvsb4I+Spw9tSqMhc m1CUQwwVkuy16t1Sb2n9uTJ779OdLptI1/wD+Bir4vxiP+BJIbFF62ctz3DJkI6Io3Yv Et4Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078940; x=1712683740; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=U9fLwQnnQXxurtfEPyHZg3O1kvYmUL82ATeUtVwPd38=; b=UkbUbugmzVrtq+Gz1GySiYXvYg+4nFP7CE6UpwEJluyHilOO8V/xPbfgoOP+92Q+sX sypSscWEYV2oPVYbq4P1rwXg/1Q2dw61Wgpr1HFx93GVITThJZx8gOzmkO5bpV3Cg6LR bJXNufXg7j60xNbtorXeM3u16srIuU5LZtDAPQ+AJAdwHn8NwSmLZl3zK+wqcpCQifCn W/5A6CUjPLt8arnfvqmO2V8LUk9jF69XKWnGmepNOK5Npiw40C7YKVz44tyx5ETgMbQI 94GHfUQUXgu0d2gjo5UzIZvrkyB99M5pXP+dnPPvtdLn7HqootmQUf5ZFmM2W1y49FNT bxiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078940; x=1712683740; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=U9fLwQnnQXxurtfEPyHZg3O1kvYmUL82ATeUtVwPd38=; b=HfCW+ipPayWCEXCf9ehkKAPQE7Z+EXShNdqK02+r8/pSrgXyR3c3M2NdcFVj7lU4Q0 PNKSeYc9+88HZteVmytq4Z4MuwEfKUOBs6UwmDrE1ruScgw9oGtyVuYxI9owCvPpu/fx u7d5YEY5IKp06RT8fV/Q1Agt4QpMgTABmYc5HLy41Xh/AJ5KXswPX+GapAYfM8ryEyMO xwN39YaHdY3t1swVUl75ydWUSXftrAvUTUKlVZTZrL7bx3GFclnNfO1EO7ATqepBJCV7 RT7/8GQNXOTMW1qBCP/G4/UiUzSUH9noHEIHCfcr8/Cuynq3xi0MglDhlnZJbIwALbrh tv5g== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWaT5sJngsJT9NugXymJx09v5e2Eh0/E8k5ksvE+X59afOR9lNFn/zocYRr1Tl5YrbKRcIvDgusnjUmqq8T9AQq3fHCVkg= X-Gm-Message-State: AOJu0Yz5d0S4/SJIcNNgQVJqjCyGLvj9/kjU4K+ye5mvF5eseZyV362N VW4D7iAojAdgb8xi1EkktrG/ZSNLrEXDb86c+nkZ9zyqjES09VC4 X-Google-Smtp-Source: AGHT+IHG1jlHgqbybailfjfZK1bIdU1K4fixBrjZ51l2TQFjunM9rJF6RwrFpnxJCZ+V3/xoH6HmvQ== X-Received: by 2002:a5b:1d1:0:b0:dd1:48c9:53f3 with SMTP id f17-20020a5b01d1000000b00dd148c953f3mr219982ybp.60.1712078940016; Tue, 02 Apr 2024 10:29:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:6907:0:b0:dcb:b370:7d0c with SMTP id e7-20020a256907000000b00dcbb3707d0cls54998ybc.1.-pod-prod-02-us; Tue, 02 Apr 2024 10:28:59 -0700 (PDT) X-Received: by 2002:a25:a527:0:b0:dcd:4e54:9420 with SMTP id h36-20020a25a527000000b00dcd4e549420mr264390ybi.5.1712078938994; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078938; cv=none; d=google.com; s=arc-20160816; b=vlO95WWhZ9iu8CqEwNoU4G1RN4P9Sypmuvyp2US9SL7t4HtAEWbR/HjLb4GgW0pANf +GxtvG1POweokYaGrgbCvTNdtN2YYF5mgXnM4BUyqMbKeDOYK1kOBh6Gyt5ZlSYGve37 lbpY/pBSk9h3kHtSRpTzgso2hTjB1NISPJFkA22msdTnu5Oo6mJ7mFjn2i7Iwg7ah7Xq 5IStLWiFL83lgWSMaRSmVXs1Do564v38SFJ/qSU4W9PO0rlBYZmnD9lPyxk+RGdO+EWq lKevbH2nop49Izwxba/F7sVZN/b/MJFVDr0Pz9opOkyd9Aytshef4wCHIz8qfVnwFK35 E9JA== 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:dkim-signature; bh=ow62Wg0ahpKaQs4u9mNehenl79oACOFGAHG6dEm4EBI=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=Xsds3XFcVig1lqGSE02DB2FnIGdN4G3U9GCJMJGksj6NDGB/ppmcL8o3Xj6Jidgpz1 Qjnp35pd4gFRl3n7dgVreLvTuP0VVO8EZhooO6GHTXsrxzf15Jd/fkxbY4OyEoG4GhBp MIgPBspXNZsb37HyeOapH1hejEzG1ocTiGJqS6+JsXzkqVuVnrobHQBwhManNfKmCnuz oi6BZn3DLsVsDYPKsRJKfwLo+/Gii25K/HnqsCbClUEsO/8FRBM1814YxnvyAE5jdMG9 5bCI2tYX/GM5jiXqDjhYrHOC2xSahsD282LMsjp67qbbN24rZVZ2UVptBoRksHamx0hA EeCw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hD73dKSp; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::432 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com. [2607:f8b0:4864:20::432]) by gmr-mx.google.com with ESMTPS id w77-20020a25df50000000b00dc619c1f82fsi942062ybg.4.2024.04.02.10.28.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::432 as permitted sender) client-ip=2607:f8b0:4864:20::432; Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6eafbcc5392so2506613b3a.1 for ; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) X-Received: by 2002:a05:6a20:728a:b0:1a7:1c9:8c7c with SMTP id o10-20020a056a20728a00b001a701c98c7cmr599735pzk.43.1712078938069; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:28:57 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 2/9] isar-ci-ssh-setup: avoid abs path in signatures Date: Tue, 2 Apr 2024 17:28:06 +0000 Message-Id: <20240402172813.418770-3-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hD73dKSp; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::432 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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: =?utf-8?q?INBOX?= From: Christopher Larson TESTSUITEDIR is a full absolute path to the testsuite directory in isar, as set in the environment by the build setup scripts. This is referenced in the install task, which prevents shared state reuse for this package. While this is predominently used in CI, it's still a good idea to avoid absolute paths in signatures, so we can reuse shared state for this package in other contexts. Rather than excluding the TESTSUITEDIR from signatures entirely with vardepsexclude, we can retain some information about the path by using os.path.relpath to make it relative to the top directory of the build. This is the same approach used by isar-bootstrap for the keys, and the vardepvalue approach is also used elsewhere for layer paths. Signed-off-by: Christopher Larson --- .../recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb b/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb index 4693f647..89100444 100644 --- a/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb +++ b/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb @@ -13,6 +13,9 @@ DEBIAN_DEPENDS = "adduser, apt (>= 0.4.2), network-manager, sshd-regen-keys" inherit dpkg-raw +# Avoid absolute paths in signatures which prevent shared state reuse +TESTSUITEDIR[vardepvalue] = "${@os.path.relpath('${TESTSUITEDIR}', '${TOPDIR}')}" + do_install() { # Install authorized SSH keys install -v -d ${D}/var/lib/isar-ci/.ssh/ From patchwork Tue Apr 2 17:28:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3465 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:08 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f61.google.com (mail-qv1-f61.google.com [209.85.219.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HT7Dt019590 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:07 +0200 Received: by mail-qv1-f61.google.com with SMTP id 6a1803df08f44-69901bb1743sf29925496d6.3 for ; Tue, 02 Apr 2024 10:29:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078941; cv=pass; d=google.com; s=arc-20160816; b=PtLUp0Rqphi8NrTmok9slWl+G1FU+Dc4hw7nEREIM5NUGpx68XcOkhzz5fKz7PQZs8 uXNv06XQVEwfKbeLsVoPM8am5lbit7TwVaWez05mweCB8VrWqbSU0SahkA8tCUnbZ1AH kNIRrC8QU0n+oKHTz8GLL5mYq/GUezBF8oql0st3+pNvLUUW0xef2ku2gWbwh/02qSWP ZLXe7/wNfW9yylIp9DxAhUmmWj1i6gya5nONduN7aDqOiwRou2YW6IVjTHOnwj3o72ue BC+U5tmZbBCcNDCszv/r1bX5Z1nE7vVJVuxjEwvHH8OyGdQyb96FXIio59MfRHEZi9hZ Aidg== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=JsFzO3ah66QDaD96Zxh03HCWdMtYPBQ4HieNtrmrHsA=; fh=pIVY3oTIs+lZqZC5NBGKOWYcgIGpZM8hOQAj0E6kDF4=; b=KElVkGToPt1tx4bxSHrs1Ru53+XfuhclEozFEizMsp6OR5rylVlsegfsCj0EQeV0N7 Jd7T3qYIGezMzpRoJxJ/FyY0zfBV13P6p2LnpQBSnBZ7uAeFIqBUpkqdg2Hqpn1NlMC3 ix7DJy5gItSZBmePLgom4iMf8NiEjl1e0Em6poRTarJPJKdlSFsEjjalboymM0bDHbtI JEF83EDEUO+2ozOYw/58lQMtrY2oKzDk1G23fFLk+vc3jDAs2SaUtru3j7GMvrp4tKdZ Hfpy3f9bcyXYy6f1YpGO88MgZpMZTYiyyGeQgSaAbZSY/3PDnQ2XBpDx5Kv+rcRU9ivY NKrw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jw+Zk5wi; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1032 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078941; x=1712683741; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=JsFzO3ah66QDaD96Zxh03HCWdMtYPBQ4HieNtrmrHsA=; b=mTTJ05/ZggVRc0LoFLdg6pCTEc3F8zz+taoWSVwsxZ84PgkesknKYWhJJFqwdq3/aD XFK88ynshpwj0drLaBkd7bhIVs4qFam1s3LF/GkUfPMO5UYLK+5UAbp+sZbHwYfzYysL 72wMLZLI4zGpc/uinxCYZEE/nZRcDP1kvYU9k/o7CqaIy9IZYMfqoWbQ7xTfcumib8RR KqFufDop06QO/hJGSNKDQvR8bL5SV4ZQvwTb8rC0/egrOk1UTnfMxBQSZmAPjJmLBhRy AE35ZbLSbhITMg+ZPWmT9QnreoFI+qqRUxf9+GjWZRxHQ+rJFUQredOCAlPrI2oprFon Zwew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078941; x=1712683741; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=JsFzO3ah66QDaD96Zxh03HCWdMtYPBQ4HieNtrmrHsA=; b=UJ9cBTHzCClvCuJFPTR2soIXYFTJYaDryAziGxfP2r9cDbdaDiHD+29yv5av3czhBD loLI6JdhZfypHP2PUL2e7XTbbx39jHkY/urEfhm9B+ir2c5vR/vvSWRtUqM9yZbkol+o ZlrcxgjniKUv9ApEsgvcURNH4gVmalHR6xmTkHgUmVXB4lneg8qLJNMa9FY5iiVtuLaQ b2W080StXm4auF98TTY2W+FDjLiPgjlwWhVAy/UeyegexNLJWqbXweF5DS22JccVIipV ezNnR59VVmbJ55zV4MexusHgvylAc7MC+TcXLw9704N9bzTF9qUy538vwC8R+EeCslIF ZFeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078941; x=1712683741; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=JsFzO3ah66QDaD96Zxh03HCWdMtYPBQ4HieNtrmrHsA=; b=UGGJfbW829ileuML9GzIRlaFPv4/l5QndN1Jpy2s11qT0lk2DUc3QseNaTL/f/vlkb qGcAwkbk7X3t2gejsOyuQLeXlWyrFoXSVjsCnyN8qGz/7ZO6Ib2lEBXZLv7UXtpfsXtG NesHJ0mBubsddceV4NK+M/c1LEseXQs2Ll2Nvg5rg00sBN6kJgZ8XhQcYrcdG4nFXKX8 BS4K+xD7l9jUoGuTSGRq1sRx883k8pCly55O+g033hF8GtvGL7HsnxSAommY68vMs0YF SSnRaVtHTJO8qIK0ci9YTh6B0o9g9AOM4H+eObUi2HU+B/NoD3t9vv/xhh1LVYI4PZ7F 6w2Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVM1fNKiaNZbcqs7VwfY6EtfE4OtA3Y5priIGlmTUTHc6sOWWNRlQNm/8PEVwwoLH8dUlJvkjfUN+gdMA776vx1/PVl2Y4= X-Gm-Message-State: AOJu0Yw7yXim3sxsHaVHkLMAwyRk83cMuX4R0bZd7SIEKoFRnpfZDvez wqbyzfgHgN1unQ023MEVgYFMKiEPs2M7+UDC5NzeYJq6dnmOmVgn9rI= X-Google-Smtp-Source: AGHT+IEW/faI05U1LqaEDXqZ6+6+cbwl4t+83vGF2fCDRZL3+F2LQRvad0wEAcftuhwMYFx3TM2O5w== X-Received: by 2002:ad4:4e11:0:b0:699:2212:3b33 with SMTP id dl17-20020ad44e11000000b0069922123b33mr331127qvb.19.1712078941498; Tue, 02 Apr 2024 10:29:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:4ea9:0:b0:698:7a54:d873 with SMTP id ed9-20020ad44ea9000000b006987a54d873ls1036835qvb.2.-pod-prod-03-us; Tue, 02 Apr 2024 10:29:00 -0700 (PDT) X-Received: by 2002:a05:6122:2003:b0:4b6:d63c:ca8f with SMTP id l3-20020a056122200300b004b6d63cca8fmr377053vkd.16.1712078940163; Tue, 02 Apr 2024 10:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078940; cv=none; d=google.com; s=arc-20160816; b=TBAVjKfcck+9k4DEAYQQdTxsS4+Q5kgDGZVZyE5/JPdsliW+PInjzfCItfw2bBp3Xr PzqPpuZRewUirZrVT5iN2TNDVqcmWVdVzWfJ0DPyp/gD5Kk80a7DFz4ttCkq+v3Pkao1 mJKHavG6Wquldds2eucjNMyYiF7/glEJYzOrFnXqUPUb6UTqKHxj7eLLK6W3kIQGOp9r xs6MIpyHKGCMN5dDYWUhybtGkzuQxhqA+gXzWBnuhZIuYmr+OLxaepdjGrzsH54Mvby2 tFA44d3G8hDPjZzp7yYnW64IomRS2TiL/CeVK3A3UMR4ehih6pYJdXI1aBFJG3jNvjwv 7VCw== 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:dkim-signature; bh=PsoYVkopixoTWu0I0XvQ3YIN+luvBXXfRju/3GaGyGk=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=tq1yFI8DA+ao6R03DhoV6/am9IFwN7eMFYtoR85VGXHEUxevpNhqFU5Yt8b5Hr9/Gi EgI1sgeA8Tu3XgMMRoJ/JyCQa6bduXGuzo1sMGclqFP4uTKIQaZ//g1XNv+blMgfRbsP jURGv/JMHABhpoWxJ9sfaqHso+w9RFdmIk+0Q2LL1HA9D1D6gDVX3l5OOXIT+OFVbi5f lSiMclrqdkO4/4E2JlrQ9wKdCyUkVwmijGKOGihqhgLPxh/EjchxGFygHFhYnqhy1ddp uUxYTrH78mehOVmcvuGbUwdfP2Ap68UWB2HpkuE/hBeaUKakkJO3qfmy/b6C/7OFRGhT 4kpA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jw+Zk5wi; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1032 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com. [2607:f8b0:4864:20::1032]) by gmr-mx.google.com with ESMTPS id 33-20020a0561220a2100b004d3c4a37c63si564643vkn.2.2024.04.02.10.29.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1032 as permitted sender) client-ip=2607:f8b0:4864:20::1032; Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-29b7164eef6so4468667a91.2 for ; Tue, 02 Apr 2024 10:29:00 -0700 (PDT) X-Received: by 2002:a17:90b:18e:b0:2a0:2a36:91a0 with SMTP id t14-20020a17090b018e00b002a02a3691a0mr400677pjs.18.1712078939376; Tue, 02 Apr 2024 10:28:59 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:28:59 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 3/9] isar-sstate: lint: check for absolute paths in SRC_URI Date: Tue, 2 Apr 2024 17:28:07 +0000 Message-Id: <20240402172813.418770-4-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jw+Zk5wi; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::1032 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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: =?utf-8?q?INBOX?= From: Christopher Larson In addition to the current checks for variables starting with an absolute path, particularly those within the build or sources directories, we should also check for absolute paths in SRC_URI file entries. Signed-off-by: Christopher Larson Acked-by: Felix Moessbauer --- scripts/isar-sstate | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/isar-sstate b/scripts/isar-sstate index c14c2843..9b20cb8e 100755 --- a/scripts/isar-sstate +++ b/scripts/isar-sstate @@ -839,6 +839,23 @@ def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, ** continue # remove leading whitespaces possibly added by appending val = val.lstrip() + if name == 'SRC_URI': + src_uri = val.split() + for entry in src_uri: + if entry.startswith('file:///'): + entry_path = entry[7:] + if entry_path.startswith(build_dir): + pn_issues.append(f'\033[0;31m-> path in build-dir: SRC_URI entry "{entry}"\033[0m') + hits_builddir += 1 + elif entry_path.startswith(sources_dir): + pn_issues.append(f'\033[0;31m-> path in sources-dir: SRC_URI entry "{entry}"\033[0m') + hits_srcdir += 1 + else: + hits_other += 1 + if verbose: + pn_issues.append(f'\033[0;34m-> other absolute path: SRC_URI entry "{entry}"\033[0m') + continue + if not val[0] == '/': continue if val.startswith(build_dir): From patchwork Tue Apr 2 17:28:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3466 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:09 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f64.google.com (mail-pj1-f64.google.com [209.85.216.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HT7ck019592 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:08 +0200 Received: by mail-pj1-f64.google.com with SMTP id 98e67ed59e1d1-29c7932c5f5sf62041a91.1 for ; Tue, 02 Apr 2024 10:29:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078942; cv=pass; d=google.com; s=arc-20160816; b=mbOU/2JCHvr1+uX7yJsYWk85bsfRe4M4KxiGc+/320zVm9MamuWckyXtSZqqI/EIAI pBWjrz2WQ+2HdkncwVR1J9wVLZpNzYyArBz9XxhRoAnAxqzcAg8uTXtY4hhI9eUQnHO+ 5NGmMA8MwZFqThXJAAZU9/5/L6sEJ3n1sZnB7g6O2v7Gm3CBr3OXnCSz41FRI9cKke78 woaUWdMm4XWqP3/Ba2004zjruAyovQNIDEKHKvEml2PNfrKYbp1hBFVbDK1zjTbi1IS+ 77Q1kUZlsgqOQddtatM/edVCahJjRRyCLUz64MksP3+lae69BsmDI0wGgEoyjXZp51e7 lM9w== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=OfYwjejDKGoavg856QNdJQSdmejoLoLchd5KT2EsLYA=; fh=rUKRF4S6heonBiPHp8NfbHFWhTTl+vxSVuaY8W4HSpM=; b=QSQ2rI32fuUHypFRvrygkYYYDQVoboB1BPzHHLL/MPInQPikoDhj32gPPLkv036OXe UJpQBZudDqF4kCHPyYWs6nO9wgPzFgPwskgLvppHSgspJzMpUH2dTVZjzc+HFjWkHXpe 5pCRp7nviWeF0S7lkQLSTozdffj6yVLLaOWxm1V4PhygiTydNAcP0wnjzdBn8tu/oKmR FyW+tjywzWNCwLbzxj39G4z4vjoOxO4H9M0x3stZ2pWqcosAxXASR1xhoMuC+iyoCVJr 28hfXmO0umBT3mqloVWnWiLoWts48OIufqGnwUdSuB+/Czs4+Tp+lj5nNsuMEy8LzjMN N1rg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gZqLPNCU; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078942; x=1712683742; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=OfYwjejDKGoavg856QNdJQSdmejoLoLchd5KT2EsLYA=; b=ltVwDW7yHAHw3cZwFeq7MuPDZaUrLhrT5tyYTopygkVfkTy5EVCl3+2x0dyFknke+R sdeoxzfZtClBj+/7eGdU2b91qCeAbQe1MeKxyWQbItItEp+Xt22nNwtuuuAu4atpXD0j 6zpQKe2IvbtVbI9ciFfWnrS2DUEs/ya2+PDccfHOUc5A4bOAHfNDF13fivT6Fs+kPkZ1 JDORFNoYjunINlsAl9Z79p68OdTOUPvDQby4n23rnUmEg4T9myndyVOUXbL/fglc5LpY PwmFLuJF2TAdk0pQj+TkVFD/4HsknhLP34lTnJ8xG0K2m+azGImPaWJOeFNIoAWpaeA0 os5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078942; x=1712683742; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=OfYwjejDKGoavg856QNdJQSdmejoLoLchd5KT2EsLYA=; b=MZkd0mN4Wi5KUmaY2JnbwVCGvGgYDBLsTtVvXk+2lxduqpkRYMyTu2qz/OYMqFbETc ThgF9OJD284HyfGSI6yKuM6GRZH/bZq4wiqkEaKMxdF/OzVj6U+12OazGkY0D0G3j3sn m7ww+jK+zJS6ROeyR7lTAFiC9PO2Xi5CKE+fxgFTQihMEyAiLra9Bl/OEQ2HJVqmpYCb sJzXI9rSfOpi8+xCtd23SGDW8pB+7ga42giNqhpJmsPxNJgAd/t+nS1CDj0iwBG5Py7D XRK7phUFQjz3ebeH7pf9A/1HMKCXoakvE4QpeGcau6kSiBBXfUyofKcAqbxYcWV0ZYX8 QrDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078942; x=1712683742; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=OfYwjejDKGoavg856QNdJQSdmejoLoLchd5KT2EsLYA=; b=ipTTRBEmTWY1TfiAiQ+GKr88eqCQ287TqD82CKuOYhbCznHo3SmS2AxQNBQb9uOFwj dNq7/1wZJe1n8s4nLQYmwUp0r0wblHnDf4A0FbUjnXdiL6gs1LDecw9sManCWc4PUdkh oXnY8DE1ruT7RH/N1zjpTQRRU6Sg8mal30d7T08GJZ6pP0HrkDduVvIuO08mRtsmpBfE 1rZZKmZQOEE6Do4CBLmvaEeySjnOJV86qP1iMUYP3+0W5RBTTt2G7fkl1xElx98atMwt kfPUyVYkj7VpQ5Y3MW56bvxXUrnDCUUNlA8IQgXnB5xAQQ78ODtZTbQfRF/EQU2FGqjf edRg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVgqoFzT0xDeH+1W8JEc853MIumJHWFaAsMEWUQkAfAjPgLN8fBiHTAB1I81/6VXioyAs627WsvLEc3tOSOpkyhXU90rik= X-Gm-Message-State: AOJu0YyPCdAKbYCgRxMF7krNQ+G+EF63hoQDCbVXN64J37zb262b1qaR PyUPHQ029edO2zxLwV+wZVGtaKeFTP4/uYetLuwdhqaGlT80ei+F X-Google-Smtp-Source: AGHT+IFb5skojo6LYPMn8w0VlVA+Vk+wy0vfNkYIzAvcf9ddZvFK86dtwTFoTgNBQcIQuFJgzGBhIw== X-Received: by 2002:a17:90a:558e:b0:2a2:79cc:5eb9 with SMTP id c14-20020a17090a558e00b002a279cc5eb9mr217120pji.7.1712078942262; Tue, 02 Apr 2024 10:29:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:7564:b0:2a0:4708:fd74 with SMTP id q91-20020a17090a756400b002a04708fd74ls29321pjk.0.-pod-prod-00-us; Tue, 02 Apr 2024 10:29:01 -0700 (PDT) X-Received: by 2002:a17:90b:4ccd:b0:2a0:78f4:2dc5 with SMTP id nd13-20020a17090b4ccd00b002a078f42dc5mr180371pjb.22.1712078941177; Tue, 02 Apr 2024 10:29:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078941; cv=none; d=google.com; s=arc-20160816; b=kHfsSKibzFun9/PwlZll3QtoVjqIc9N0CiCbTLbUcZVDRkeMSLVbs0siP9lqqrpJqV INq0NdQ9XJS+9XA3hSdYlNzRLJ5LD2Mut9OfmiOn4GlQmy91ZxMs1J9cqEQlZIOVHfMi 4JI0RNge/9PPL1xfpzfyzYkKPFXvYVoXCOqQRLcetBknszncz0hSP1uefMeFsrgigoLv JuUP6ghDR5Kn3nyTkN5B/ogrmIECnBgKlfjXiPdS1JHUDNegghuszlQDwgUQ3nVOQ7pA 8u5TW/BBS2iAVOM5rEnTaYkCP2vr+uSAC+Dcmfc8YnvP6wD5AH4FAH4T7x3vW8qxy11P BqQw== 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:dkim-signature; bh=pCp2/5apqyEvfPvSZ2O2t8CM9o6Ve9WNpL+a27IeD3k=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=ghj1ip9g3Ge8Qe1ZeTIoNISwZlTzeRF4mvQtj6e75YmqHvizko4Q3r8jolaoR6b5YO YM1QFy+qLq2wNwyHk9n3MqMvdR5b1lTquU7lRmMGYsuQOcRTm1bNLnIv+uVTBzSx3EgV B58WEAxLxrL91JvjEv6HFBaEC0BAm/nSsYTSRMIfmiLv4rnrIwh2KgL54LafMo9rQINm l2muG5c71ZK88gjY+xZYRngpTd7Tf7S+izCNz/YWYFkgtHnMWPka45K4hWmJ6dKW2biF /Q7RqZ6hBG8hZ8hLQKHUIpsXxfbCyZnlWQc8ozjGjhi7kt/76c/yNHOOu3VEX4qhOV0x +nEQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gZqLPNCU; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com. [2607:f8b0:4864:20::102a]) by gmr-mx.google.com with ESMTPS id d126-20020a633684000000b005f0a5113629si500562pga.3.2024.04.02.10.29.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:29:01 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) client-ip=2607:f8b0:4864:20::102a; Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-29f69710cbbso70557a91.1 for ; Tue, 02 Apr 2024 10:29:01 -0700 (PDT) X-Received: by 2002:a17:90b:3712:b0:2a0:76b1:896 with SMTP id mg18-20020a17090b371200b002a076b10896mr224404pjb.12.1712078940778; Tue, 02 Apr 2024 10:29:00 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:29:00 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 4/9] isar-sstate: lint: add support for checking stamps Date: Tue, 2 Apr 2024 17:28:08 +0000 Message-Id: <20240402172813.418770-5-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gZqLPNCU; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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: =?utf-8?q?INBOX?= From: Christopher Larson Bitbake supports writing signature data directly to the stamps directory without having to build, so we should add the ability to lint this signature data as well. This is useful for checking for cachability issues without having to complete a build. Signed-off-by: Christopher Larson --- scripts/isar-sstate | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/scripts/isar-sstate b/scripts/isar-sstate index 9b20cb8e..b77f73eb 100755 --- a/scripts/isar-sstate +++ b/scripts/isar-sstate @@ -154,10 +154,12 @@ SstateCacheEntry = namedtuple( # "${PV}:${PR}:${SSTATE_PKGARCH}:${SSTATE_VERSION}:" # This regex extracts relevant fields: -SstateRegex = re.compile(r'sstate:(?P[^:]*):[^:]*:[^:]*:[^:]*:' +SstateRegex = re.compile(r'(.*/)?sstate:(?P[^:]*):[^:]*:[^:]*:[^:]*:' r'(?P[^:]*):[^:]*:(?P[0-9a-f]*)_' r'(?P[^\.]*)\.(?P.*)') - +StampsRegex = re.compile( + r"(.*/)?(?P[^/]+)/(?P[^/]+)/([^/]+)\.do_(?P[^/]+)\.(?Psigdata)\.(?P[0-9a-f]{64})" +) class SstateTargetBase(object): def __init__(self, path, cached=False): @@ -288,12 +290,13 @@ class SstateTargetBase(object): class SstateFileTarget(SstateTargetBase): - def __init__(self, path, **kwargs): + def __init__(self, path, regex=SstateRegex, **kwargs): super().__init__(path, **kwargs) if path.startswith('file://'): path = path[len('file://'):] self.path = path self.basepath = os.path.abspath(path) + self.regex = regex def __repr__(self): return f"file://{self.path}" @@ -334,12 +337,13 @@ class SstateFileTarget(SstateTargetBase): for subdir, dirs, files in os.walk(self.basepath): reldir = subdir[(len(self.basepath)+1):] for f in files: - m = SstateRegex.match(f) + relative = os.path.join(reldir, f) + m = self.regex.match(relative) if m is not None: islink = os.path.islink(os.path.join(subdir, f)) age = int(now - os.path.getmtime(os.path.join(subdir, f))) all_files.append(SstateCacheEntry( - path=os.path.join(reldir, f), + path=relative, size=os.path.getsize(os.path.join(subdir, f)), islink=islink, age=age, @@ -592,6 +596,9 @@ def arguments(): parser.add_argument( '--exit-code', type=int, default=None, help="lint: return this instead of number of found issues") + parser.add_argument( + '--lint-stamps', default=False, action='store_true', + help="lint: assume target is a stamps directory (target must be a local path)") args = parser.parse_args() if args.command in 'upload analyze'.split() and args.source is None: @@ -798,7 +805,7 @@ def sstate_analyze(source, target, **kwargs): print('\n'.join(out)) -def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, **kwargs): +def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, lint_stamps, **kwargs): ADDITIONAL_IGNORED_VARNAMES = 'PP'.split() # only list non-cacheable tasks here # note that these still can break caching of other tasks that depend on these. @@ -809,7 +816,10 @@ def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, ** print(f"WARNING: target {target} does not exist. Nothing to analyze.") return 0 - cache_sigs = {s.hash: s for s in target.list_all() if s.suffix.endswith('.siginfo')} + if lint_stamps: + cache_sigs = {s.hash: s for s in target.list_all()} + else: + cache_sigs = {s.hash: s for s in target.list_all() if s.suffix.endswith('.siginfo')} hits_srcdir = 0 hits_builddir = 0 @@ -891,10 +901,12 @@ def main(): target = SstateDavTarget(args.target) elif args.target.startswith('s3://'): target = SstateS3Target(args.target) - elif args.target.startswith('file://'): - target = SstateFileTarget(args.target) - else: # no protocol given, assume file:// - target = SstateFileTarget(args.target) + else: # Either file://, or no protocol given, assume file:// + target = SstateFileTarget(args.target, StampsRegex if args.lint_stamps else SstateRegex) + + if args.lint_stamps and not isinstance(target, SstateFileTarget): + print("ERROR: --lint-stamps only works with local file targets") + return 1 args.target = target return globals()[f'sstate_{args.command}'](**vars(args)) From patchwork Tue Apr 2 17:28:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3467 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:11 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f190.google.com (mail-oi1-f190.google.com [209.85.167.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HTAxh019654 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:10 +0200 Received: by mail-oi1-f190.google.com with SMTP id 5614622812f47-3c4ea3d8e40sf2142706b6e.1 for ; Tue, 02 Apr 2024 10:29:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078944; cv=pass; d=google.com; s=arc-20160816; b=NWJybpL6WfFam/Cfq8X9FRk/CxPkTPgvgHG3p/129uWjbvHez6n3Iu+TsguiTQnUNu ropvE4h+Y8Y4bHGLTzz5l0OmIeQITx5+Zv+IUtD2yLEku62tlDEzub34fZJrdKL+Ke3K Se0FW4JkWSWwABLUbiR+lGQ90kuG8J9PoG1y6SD7pwMtOZzpOlVOZF0ZfQqhPKo7Th9g RR+9khX4om/aiSexm0EAMhS7VSX2xMaWeLIc3ZUEfo/sXTDBlXOHNW3AEDVwC6IBozlc CZe+H2qSTVfBQHLhrPUszvITAtwDV5gH92ItyduFe2pSCT6yXQFHXuaO4vpAm9XtAFmw 0cig== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=43AmUyqneksJRH95AGp6qyFKepcnAKbYZ/V3A0lFrs4=; fh=MaO0rwNtANkLChO4/nvfG7rvR580jyQ+YcfPVIMWtgY=; b=ML4HPK2BaYoTR9H21bLjUTfUzP5XqcUiNv8gr2v4OTDhrjxsxs9S8Gbz6qDHQOIiXw UTcuPC+aaP4pPGGrVf5hRRxJhrwC6X3f72z6v7V9ooR5HbfLNWk+flz1HG4X12NbqkxN FVhtWr8bQaPjHbOVRON1T0m+zJEGUDDp/cO9SrO0A4T1/npHwVz3DuBlfRRy3I9dgFOj uVCyM3rP95WzcMaEjDrzzNTdFLZgGFmQS0qFgSYZ/WJ49RrXvlLrkd8XxJ8NNxDPdcWk E4hwLYxaHGtWkd0eSi7BDOXWGR/6dYG0cc2QpqNrn917HFcn4LDpSYt7+NEuKbxROmAS nMwQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZmlUIt39; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102d as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078944; x=1712683744; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=43AmUyqneksJRH95AGp6qyFKepcnAKbYZ/V3A0lFrs4=; b=m2lvi4IqfYKHoJGPe/au9UHCsAyilqxHWFD0imQP90Zz+ovBDqkSystuXMOZ+X8Yrq LvYppq1tdtsdUmByWUUl1djWZoZhekm87LDFJGlon0vDoYnCH+5vCPA3k32QrbNviNLJ 6t5hFf6lAZEqXC4YaIUEKY0kcZH64GTGHcxUXuz1BBGPYjkNvntAoV8hbAsivIgK5TZy guKyu8xMT9zOxO1bjv1Fq2ttnCvp+d/C0G6qTfS+Am3gZdt/tmpXM+PFHzgxguiNf8Ji vlMk7NDb2ZevIPgVgSxrCW6s9X0ADNwg1CLxWWTtzRwpPngbWWjd2neL8NQz4WYaJCxF 0Djg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078944; x=1712683744; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=43AmUyqneksJRH95AGp6qyFKepcnAKbYZ/V3A0lFrs4=; b=Pgce8UkXCByFtCwoQPBfwyChA5Vpioi+5zq0gag75bYRIQw80XOOSWbOvPmFo2Z8ZO 6wBvDelYkXpBh6lQLE73OLnIvnuVfUXuc2s1J8qHd4c6YoDLKx3tUPay/OvZFnNDb0CD RqZZrXHwmCtBTck6fVTmTnxyqiOBN5rmBDHwc326nCnuZaGZCEwmexoYrqWT78iFLc7j h4a2Y5MdmqsK/bO5YYz7CI0Q0tR1rMcZduPbhWyDIaql+x6JD2cA3XDGx8t2fDTJSQ8M c9wCUineCt6ncGCgr5uScq9sdkTYszQcXh+mlKQgDi26vWJG8+KUAbEOiO2gyx8B67oa UWmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078944; x=1712683744; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=43AmUyqneksJRH95AGp6qyFKepcnAKbYZ/V3A0lFrs4=; b=KcKf/kga5ucrC0K0WHFEc2fnXpeVhI8AbMEQbYif1UkHQe4pWvSnSNuvm3N3UPL3lX 6lTfIPzrjIDZx5/Twes59TKXc70G3UfCtic7OPDJaLNnJKFeRqtd+CCqOwBg3vQLuCL4 cVb6yd80PRaAiYTy+0j6KGu152qUzndBNmYFWFNNJ017LaroAzfG4vHnTpgvlqfct638 AEobrHMu0LtC0ug1tuNtbkK6KZSpYUV7Q4vCUlPhqbhmSRZTGX58pajscEsJeUdyhO9U V5nSxXAa079Nk/nx7DcAwMJxkECxSc0VsmOgmihlyLcJ5Gz60GNLg2PS0LcL72KUd4dF wAVw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXrlynd2S9v8HOqUTyt/K/V+e6xBmHuMASYt02/794inohYeCd1J3HKgVIpD1XoyP85zs9J73VmBDHJEzkVHO0Kfuo3dxE= X-Gm-Message-State: AOJu0Yw/Ss9fgtJkHS6kKaFUt2qZIcFk6882oLkQWHeSxL0lkmZc7zYk UjgnkQ1MHN5dVWRo1/rU+5x9zq2NzRXoVukjHall4bzJxiSO9Kpo X-Google-Smtp-Source: AGHT+IGx9yOK5UFiODscIwc9gbSKmlZWYyUbfqXYQnJQNQ2UP0ShZWhToQYTwG8A/fzwHeQnKbGu6A== X-Received: by 2002:a05:6808:ecd:b0:3c4:dba6:6190 with SMTP id q13-20020a0568080ecd00b003c4dba66190mr11420275oiv.47.1712078944451; Tue, 02 Apr 2024 10:29:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:148b:0:b0:432:b6a5:a647 with SMTP id l11-20020ac8148b000000b00432b6a5a647ls5479128qtj.2.-pod-prod-07-us; Tue, 02 Apr 2024 10:29:03 -0700 (PDT) X-Received: by 2002:a05:622a:486:b0:431:51d:42b1 with SMTP id p6-20020a05622a048600b00431051d42b1mr15852325qtx.42.1712078943022; Tue, 02 Apr 2024 10:29:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078943; cv=none; d=google.com; s=arc-20160816; b=a3mhZ2JZG/i/crcKCYTM8fASfl2UWqQSL/RUFad+U0a0vqfkEcpRYwB3KF5NbEAm+y ERE6f06BMZEodMpUsM7xLwyXsJ/rtNuLUiY1hO4iSuGqnvE/w+BeQwcMsbw/ZKSCRkzz VbD+7XdSgciMD+qLFyAEWDRsLjsw5Xmn8HOlMjT+y4dQPG+nrdxVBDm0G9FN8aHRCxBY rJ+ZFDBVCEgPejZ4JKU5MR/jE4yxanPn6jhEQSGKDxM0GOklqgHMdup8XIBRdj95d2b8 zubbXdSo79pC4ROeYMV2/CynSEIJJN0ju9r6O89fnnLtQifZCRQAL2OF6205CY0TqOf1 Wy8g== 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:dkim-signature; bh=hxZ4l3kPNjqxgyiKUpWIKD05e6toeamCreNP2M0hUxs=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=mYLY11PT4allEt4tS51EME9VL/1VnsCt1Ko7nteyYmvsA/uF69ndIHf35Am4LAxEAa eHwlAPnfdMrvqXaL0LHqprXu3350KXez7PtIJ7yTFeSMLo/L3Gb649zEZ7ZiJozSIY6V SyscOubSGr/Nds47QC0e5oFbClJ1Yyl6q6p1DSE6VmTEhcHZkpRUVDsWw4qrHjj65dJy xDalLxfJwkb0F/ZsqCfwLsmAJHp0Aa+Y9Vn6NW9f2eQPpEu57k3cjlVDLblu6TQCY7+J uyYcK59pnKlJSaW1w4Cr9456bWcOeJlw9pYxbnns5UAwWLPlgP6HOsn2F8BBLx2iFm28 fdyg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZmlUIt39; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102d as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com. [2607:f8b0:4864:20::102d]) by gmr-mx.google.com with ESMTPS id eq25-20020a05622a5e1900b0043140b1ef8fsi1026358qtb.3.2024.04.02.10.29.03 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:29:03 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102d as permitted sender) client-ip=2607:f8b0:4864:20::102d; Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-2a25094f8f9so997020a91.1 for ; Tue, 02 Apr 2024 10:29:02 -0700 (PDT) X-Received: by 2002:a17:90a:fb89:b0:2a2:5678:2d75 with SMTP id cp9-20020a17090afb8900b002a256782d75mr2662095pjb.9.1712078942079; Tue, 02 Apr 2024 10:29:02 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:29:01 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 5/9] isar-sstate: lint: ignore more image tasks Date: Tue, 2 Apr 2024 17:28:09 +0000 Message-Id: <20240402172813.418770-6-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZmlUIt39; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102d as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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: =?utf-8?q?INBOX?= From: Christopher Larson Currently isar-sstate ignores image_wic, but not the other image tasks. Add additional image tasks to align with this behavior. Signed-off-by: Christopher Larson --- scripts/isar-sstate | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/isar-sstate b/scripts/isar-sstate index b77f73eb..5270f944 100755 --- a/scripts/isar-sstate +++ b/scripts/isar-sstate @@ -146,6 +146,8 @@ try: except ModuleNotFoundError: s3_supported = False +DEFAULT_IGNORED_TASKS = "rootfs_wicenv image_wic image_cpio image_tar image_ext4" + SstateCacheEntry = namedtuple( 'SstateCacheEntry', 'hash path arch pn task suffix islink age size'.split()) @@ -811,7 +813,7 @@ def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, li # note that these still can break caching of other tasks that depend on these. # Run in pedantic mode to also look for these issues (e.g. in image-in-image builds) # To make a build fully cacheable, avoid absolute paths in BBLAYERS - ADDITIONAL_IGNORED_TASKS = list() if pedantic else 'rootfs_wicenv image_wic'.split() + ADDITIONAL_IGNORED_TASKS = list() if pedantic else DEFAULT_IGNORED_TASKS.split() if not target.exists(): print(f"WARNING: target {target} does not exist. Nothing to analyze.") return 0 From patchwork Tue Apr 2 17:28:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3468 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:12 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pg1-f188.google.com (mail-pg1-f188.google.com [209.85.215.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HTAoY019700 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:11 +0200 Received: by mail-pg1-f188.google.com with SMTP id 41be03b00d2f7-5f0382f688fsf3675602a12.0 for ; Tue, 02 Apr 2024 10:29:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078945; cv=pass; d=google.com; s=arc-20160816; b=yRuMtmi9QD1LAk31mC4jpoOqcZlxweZZ0TsdDxs03DxQTpNs0K8DR/L8QsLSCEUy1R PqLrwtg+YxWHyxr22c0ABLQ2qF/h2z+O0gLlQdmQ71zQqmVg88UblEQCQauBF74L58rm VSthM0uzKjKjpoNFvtg1Zn52Ef8mOIuyLXAezjh/7Cegw1o+lz+zK+8nUhfSn6xolfwg qM1n6t1UByzOKdyMrB0NVhZHjWfJXcVJTD4CKWejq9vYcX8ThUrAJV0+3pHvdI9NMlYw 1dwABOE6xqF/VUXVmb+Sryash2RdSl6XysKOMDr1Tn4V/zPEzmUK+A0U1+2mVKAet26B OFFg== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=xYv2UrCysO8AAxOF+EV92BZ8tqZ6XJYiCpDStUckUo0=; fh=2HdNj9FiidPTgV9Bl3+lTfxkNmH/WfXQB0TyzoPwnPU=; b=Mgxp/eNAKAHeN/A9ZRP4GaYr1yf9k23KodrL4mpy7Ede6P2fNrgpUwJefX2vc5jS3h UZpf1lJ1QnsPIL3amyjhSJGeNsKu6aaTUlQaDzTrAn0wnB8CJPDCOAPNk6Kitw+ldMx5 KML3vkhk6MCQs6noX8uBjzINbljFtXqZohQfEEiPrTpacLAPRpbOKy7y27iPlygRgxMt /GEj/jX7fmsJCDk3BtAd6WCt14QmYU6/klWquxVmiLgywNsX/v2SuXHY++v1YS0nAEpD CcCeLECg1AzFrYRXHtA8FksolRMFNdxDNQh3p50ZAh91Tvcy2OSuS2LYJ+sK9FVmhvU6 I4ZA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Z+WcyCFT; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::430 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078945; x=1712683745; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=xYv2UrCysO8AAxOF+EV92BZ8tqZ6XJYiCpDStUckUo0=; b=xr2CG0BDqwz2xTQ+3U2MdFs1TlryyEyJxevs03NF/Y5T35Q7+QyrMkqV/f64Zd1A28 sG4LanN1gTnMENXzFmjj+MeIUHDXydytRCyZhlGg1ht4p+Tt/6gZVYhw0xT7b6t6Z9vr ep8RSRYzFfzpUEPHADhmKeY2GDhzkYAR5m/jtGwMQiO1qPrqgJJh5Tcd3s+mkyyL1OaH dQ7RATBliEuunD6emMugv8tPzl5d4Fyg6t9dTqXlSXfHq2i4GNbY9yNm0mADlQ3iHTSe GUhQ2V9gznJZoovwDcb7h++driLaSFma8ivBiDuAwVm5DpwkPj19EnP2quur+Z4N6dBe PAaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078945; x=1712683745; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=xYv2UrCysO8AAxOF+EV92BZ8tqZ6XJYiCpDStUckUo0=; b=QFe4Qjsdov26H76EPwcgNDL8iuMwajXXnFjujamdHvTywqr/HdPgHPf5xgqzpSRWEl BsMjl3FXIhO1j5zmW74VFQ5C3kWkW+n4fWHoej2a1IvWVRHXozSEgDRML+hOelaD/fVQ cmasQadtHItHnNBtycXtv/psPFjLn/MUCgPow0CNgIHzvJGuRTjCFvni67YBkOjzI4xp e4aUmGljgYP4xzUE7/0qSzZGEqFsyy0HrE14JwYG0WEdApxumisQ48hd8lJJqgrtnURJ yeNxa7RrpIhT/fjFGS0Hud4OmwBDyMeMRHEZ1YtG3CYJbbnlKzCGSZXthUWimjZwIjus 3Leg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078945; x=1712683745; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=xYv2UrCysO8AAxOF+EV92BZ8tqZ6XJYiCpDStUckUo0=; b=oPVG2LcPkyHE5MZQCYzjLkZZi8p4xwY8V6KiReywpqY/GmKMzor/IYFCbpMrU2KkBa sSWsaypN26PjN9874R7M1+Txh05QmZY5NnTxHTz8wgRqpsD0SJRHhsAPEh4hpaSCDB9h JKlwc1hpOB8SutUyXgVFWXJ5mopoQ2lE3LERJ5U0rMs+v8PJbapP9pEN+88ZgAxLAVJ+ RiOOrN4z88KcDpDOHvFWFjUfAr6dRPPDl1yfgMtOyFm1wC0jiy5kRHCy5TanpngYPKZ7 Uo9TPFQByYYTFQRbcY4bkDVozBMOffC5cOsL9krvC2N7yHVjH3tpg+8z0tvwOyVDD65y 7QAQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCW0qXWVRA7S6BKXle0igSGl+kPleCkkKBgvb+Lzxq8Ia6y0ld2Psl5a05kzQsN+sxBao2ptAbOUgnCcci5nkI4T1uSAt4o= X-Gm-Message-State: AOJu0YyuVlomx5HqxRoBXQFyBH/TpB4gbtZg0HIrOO6Qt0aV/hTssKtJ mbmKRgp/6RrfyMZZG7kVRCezZYUOjCa7EY+A/wpNcfU8w0yVpKLg X-Google-Smtp-Source: AGHT+IEephBd0WhDC+U/TiHC8LlBN0vHoYRIfEiadE1BlX+oXop5SjSFHLOLj8osd4IZK5VRqDkSLA== X-Received: by 2002:a17:90b:358b:b0:2a2:5ef8:ae81 with SMTP id mm11-20020a17090b358b00b002a25ef8ae81mr1874282pjb.3.1712078945132; Tue, 02 Apr 2024 10:29:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:4b8f:b0:2a2:831b:7186 with SMTP id lr15-20020a17090b4b8f00b002a2831b7186ls158414pjb.2.-pod-prod-01-us; Tue, 02 Apr 2024 10:29:04 -0700 (PDT) X-Received: by 2002:a17:90b:2381:b0:2a2:78c7:379e with SMTP id mr1-20020a17090b238100b002a278c7379emr1142107pjb.13.1712078943834; Tue, 02 Apr 2024 10:29:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078943; cv=none; d=google.com; s=arc-20160816; b=duucA4gvywV1etuH8jm9fMyXviOUQhIgS1c5ldEaYaTQ9sR3eV0zotjd7d2FaJv3mN jzE+XCb4BD1h9OJ6Edbx1YSvnKSJI3MmsFvIn6EI7eLmpeq0usug8xLgJxxSiTQDtvEU cAbvyACHQsLO4gXNsHJME9q6EixYnzE8fSIYxSNTEt0Mr4QDBtzsOo3sLa1ph7WHKDmQ FgDSeod0jqOGeAuy2a9jeB5JGzn4FHnHNXMI/Xc3yWpl+pxRZfcgUCar4a9AzBn1l+Aj VN2n20QC9oN7AcTsGIX3YsJGd4YkD5+zIvBbYDaoBJUtHyfaIVI6PtY9zOqy1iMe4fcl gbBg== 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:dkim-signature; bh=aXdJVsPOofUbXcNdRVsMYK9fu+CCS5zdOh6hoqTy0O8=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=v58lIZBKn9s5uDo2oL7xTmI11EN0y1UGdIBfWaWsCa9Z+W8+iD49UIO5oQGdMrqQzY /GLd321EQZkYBEXoOeecVXs+e+ipBgTWhKyk6I79vck99tnX79zpvMG7+qP3wk9YI+N6 8eilPi03Fd4x9vRLYC2ZmSTGQlaw4IYdkR4ZiFMXaeYkNbagxrpawup06VSyYiEDk7ke KW5zVqUR80A4MFSOgpyhltNf3cQnZHMFY/AHsd8noyC+XzOW/5dP975jodM/effqLsZK Gcokw1qE1lhlTqqwxU0LYgF+BZRxunpY7R3Hl9fDKagJKLRgLXSjkohVoNkR1WHW8r/L HNrQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Z+WcyCFT; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::430 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com. [2607:f8b0:4864:20::430]) by gmr-mx.google.com with ESMTPS id w13-20020a17090a8a0d00b002a235e33f2bsi6231pjn.1.2024.04.02.10.29.03 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:29:03 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::430 as permitted sender) client-ip=2607:f8b0:4864:20::430; Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6e88e4c8500so4360327b3a.2 for ; Tue, 02 Apr 2024 10:29:03 -0700 (PDT) X-Received: by 2002:a05:6a20:6a1c:b0:1a7:1f8:e046 with SMTP id p28-20020a056a206a1c00b001a701f8e046mr10924189pzk.4.1712078943427; Tue, 02 Apr 2024 10:29:03 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:29:03 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 6/9] isar-sstate: add --excluded-tasks argument Date: Tue, 2 Apr 2024 17:28:10 +0000 Message-Id: <20240402172813.418770-7-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Z+WcyCFT; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::430 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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: =?utf-8?q?INBOX?= From: Christopher Larson This allows the user to override the default lists of tasks to ignore when linting the sstate cache. Signed-off-by: Christopher Larson Acked-by: Felix Moessbauer Acked-by: Felix Moessbauer Acked-by: Felix Moessbauer --- scripts/isar-sstate | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/isar-sstate b/scripts/isar-sstate index 5270f944..dddfafcb 100755 --- a/scripts/isar-sstate +++ b/scripts/isar-sstate @@ -146,7 +146,7 @@ try: except ModuleNotFoundError: s3_supported = False -DEFAULT_IGNORED_TASKS = "rootfs_wicenv image_wic image_cpio image_tar image_ext4" +DEFAULT_IGNORED_TASKS = "rootfs_wicenv,image_wic,image_cpio,image_tar,image_ext4" SstateCacheEntry = namedtuple( 'SstateCacheEntry', 'hash path arch pn task suffix islink age size'.split()) @@ -601,6 +601,9 @@ def arguments(): parser.add_argument( '--lint-stamps', default=False, action='store_true', help="lint: assume target is a stamps directory (target must be a local path)") + parser.add_argument( + '--excluded-tasks', type=str, default=DEFAULT_IGNORED_TASKS, + help="lint: comma-separated list of tasks to ignore (default: %(default)s)") args = parser.parse_args() if args.command in 'upload analyze'.split() and args.source is None: @@ -609,6 +612,7 @@ def arguments(): elif args.command in 'info clean'.split() and args.source is not None: print(f"ERROR: '{args.command}' must not have a source (only a target)") sys.exit(1) + args.excluded_tasks = args.excluded_tasks.split(',') return args @@ -807,13 +811,14 @@ def sstate_analyze(source, target, **kwargs): print('\n'.join(out)) -def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, lint_stamps, **kwargs): +def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, lint_stamps, + excluded_tasks, **kwargs): ADDITIONAL_IGNORED_VARNAMES = 'PP'.split() # only list non-cacheable tasks here # note that these still can break caching of other tasks that depend on these. # Run in pedantic mode to also look for these issues (e.g. in image-in-image builds) # To make a build fully cacheable, avoid absolute paths in BBLAYERS - ADDITIONAL_IGNORED_TASKS = list() if pedantic else DEFAULT_IGNORED_TASKS.split() + ADDITIONAL_IGNORED_TASKS = list() if pedantic else excluded_tasks if not target.exists(): print(f"WARNING: target {target} does not exist. Nothing to analyze.") return 0 From patchwork Tue Apr 2 17:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3469 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:13 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f58.google.com (mail-oo1-f58.google.com [209.85.161.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HTBvx019764 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:12 +0200 Received: by mail-oo1-f58.google.com with SMTP id 006d021491bc7-5a52eb3a60asf4072361eaf.2 for ; Tue, 02 Apr 2024 10:29:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078946; cv=pass; d=google.com; s=arc-20160816; b=TRMx6ytqE8P0DLvR4Eu8ZsBl1eFDqynhJdzcqNK+1K4I2XXs5Rqcj94ugOxuYKffah ZgjcpMScwTtn4DCOW9a61Z1/Dvu0nQfTJBbk4oKh42qCNQX7g8I88PfrbEhQlie7cjRa jyd2bnoc0vlnuv8QpoHd+mMxL6I+D1k40DAsM5qS9SfNp27rXnFJnfBezm2GcyUEPZA3 WmoWUpoWpM0icuCsldj+Y3PzebBvjra44uNd7y9Et6lcoCBQfunjV05yXv/+N2OKl02j nXFkzBfVytv2XzyqbVsmCIvTi/bdPskRmdum84vH9wgPvcZomSJWdtXN5nPvLTOqXwQv PaOw== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=Mw20TjHLwSKzwAlrfZ5eDTBYIKKuuHyCCV8JFw3dlV0=; fh=9lBbtQEK4r+cgw5A7qR14JVfhitz7HY5p7mhmwG3Ga8=; b=TLPEGxFRJzT4aY3+oaxCLDBspFvzH+rG3U9tW1Vnk5zgbjck+uLyz7b/fY8xxgyXcP zecJGgaKGdNCu8XE9ZKVaqR50Zcwbd1ZYf0M/j398M+J3deURd/EzIKwYB6ZPJ6EQmBu nj3FiPzvKAyvML0IjBOPo5IFMx9QSNElTYsQGeUD5QeY7lgOzrvPuXDo3Cx1Fgox2Bhz ByaU1nuNoLGx1YZ4mq4e5j+JbBYUy8s+JAogFQ2/a9RPZp56acvomk133f2Z4kedC77R ZdbGLjmyscc2wQeu0T+2oNahEFHEkjmCwGGSkAEtbOMe/4gU9XxBYo9I+DnEQZU7b0wW DNrg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="clhE/sTV"; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::429 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078946; x=1712683746; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Mw20TjHLwSKzwAlrfZ5eDTBYIKKuuHyCCV8JFw3dlV0=; b=ADaQ7P6KIVvfjevFN2mtnkWxkKj2Kh5uapdw3BccmusKhCO+yUvWPD899jZCXiKMxB 3LWyaZC/ajkZ1WwjSDFwvqxjUk1caDU/sQ3IUUthfWrQFJ8oFXtR1jRP3nKG1BMlUFFF MZAHCkymINxVz8p4qIwanw0BFVCOuLg2JJnzNU279EL7rJJU/ALC3WuA0ic4FXKSguHy 3F/jZyu8jIAvUJrDHxtYNoSAwohwpJv32fWLXdmMFF2s/lUtDCMJEn0ljAc3Y63GqTWp a1/6ENdqgpuZNp88Gl2xkXYqgy0btPw0GT0EYb0v/FRSR2Nq0Drjzg0Xi8SOOYq6khOb BhYA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078946; x=1712683746; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Mw20TjHLwSKzwAlrfZ5eDTBYIKKuuHyCCV8JFw3dlV0=; b=H/Irf8oeXGmkHBfTefDMt/FevxHvGGolBvMPKARoZv9ThsZwnmOffT+BLDUytK3CZn 84qTFSUqa/23zviPRjRPg/rt0GW9seSkJpSEczcSPQlVzcYnocYc3qbNbLykaCzJVSGQ C3feJlG4Ku12wjA3ugInV5BmtBk/MXb6P9YKWziu0L4x0YyPvTGoHiK7l5IOuGheyGHX 6D+LAS8Gd6asyHgeXlXqv8Bcy7Hqq8GY2bk2zQxx8kmkuxbiUeRRGCGVQWjM3nxPUGST wr+YjGY+XBoHafHeSLEknxXHpNA0v+2TAJy2ZkbTh8pWNiu5kmQ6jyUNByOmcPLiUEOm WFJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078946; x=1712683746; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=Mw20TjHLwSKzwAlrfZ5eDTBYIKKuuHyCCV8JFw3dlV0=; b=hZ9S+Ar9ZtgUI047PhkXQZh540DyqHoHoBG0RoRcMpCl0Jij2/n/+MIWK5P7dLQlG/ kxxtqLFpuvQP0it903WrJNbM6TNZgluCaotWYPl04m6L1lILHrCvHxFqorLzWlxeyio+ gwaRUYupS32Ue9PDNbr9L2iLB9pquY55JNG/LijPOZ5A2dnC/vobs+hQ6LpDJUBUTIHC YXOs56UY5mt8eLiPxKE9fFO7lAaoDDZY63OOnT0WkTWIj3YMi+5dpoMMKaVwhp2brJsv tWOoX4yZ+h8mslTEw7RIbGqa4T4ULZBNgD7O3NAJDGKB69VFomJKrwqZ3nsTTm+/cfXF zdLw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCX6JEt3CFwedRc0FjpSv2RkRBVs2PxLcf3oMeKSKGeNhZENDuEnoR+9a50WFuwKu6yENoAtNFgwXm+kVjy13Yd3KM+weDg= X-Gm-Message-State: AOJu0Yw4RN8nIJoFn7i5Iwx+0Bnw0mJIqyGqnXIjDnrup4mqtUbQUfev sKhA3szsndrjTk2/mOyGMdwu51fJb7vWQISzzVDWUuMQusdvTq3z X-Google-Smtp-Source: AGHT+IEL4qq5WC1JuO5AZroZ5rhG3g//TWJadU3Ud5ZUlo6MfAT6C0YM4Y8UqdgsiivOE8VRKGooUg== X-Received: by 2002:a05:6820:290c:b0:5a7:b160:d37f with SMTP id dp12-20020a056820290c00b005a7b160d37fmr8376542oob.5.1712078946280; Tue, 02 Apr 2024 10:29:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:a549:0:b0:5a5:468f:d911 with SMTP id s9-20020a4aa549000000b005a5468fd911ls3926779oom.1.-pod-prod-04-us; Tue, 02 Apr 2024 10:29:05 -0700 (PDT) X-Received: by 2002:a05:6808:4449:b0:3c3:d38e:8b91 with SMTP id ep9-20020a056808444900b003c3d38e8b91mr15524991oib.35.1712078945538; Tue, 02 Apr 2024 10:29:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078945; cv=none; d=google.com; s=arc-20160816; b=qRKE8hr4Fh/BkjuYEMCt6uXsmn5+7geMo4Jx005C5N92jTDSxocyZkRyI5l4eWsfIW dVASDx3v8gpeqDsSfz2Z18oXSdY0M4OiBJ3xEqta6woHymcr0UAuF89RMjH+vz2MUjtk jEAk1Y78eY48slk9vLB0Fdnun1x1T2Jp7qaBIEeS0LC3ILWzaHgEmZFIme7M5eGLAW0Y MyjO9NNoPzgiDpIf+JLRBIK9CmUkzN5oNeCtnfRJUwO3oqOjnzsR38njvz00ba4zs+K9 TAE9eFTWJ7Qh5WhE+4lrdrES1tX9vjnn7tluChgTFo79KcB78RsLWjK/BoCWiR42Ihgb SNNw== 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:dkim-signature; bh=LUX0UrcjE7AymKn9/SqfG9PpNSq7ebKnmGk1f1FAtzQ=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=LCnEN8zzJTjvCHPpgjhTkICuij/Nq1MV815WVS/dx9hyCM0aBKrAwr5c8BsM0+3WnU tafVN5B4rhpQ0pTA52avQV16Zydt1SLqLNMlN/iQ363RnyxCfd/iTOZ0QuvozTYh+mZe RzIXtrLV9KQdv/dILDVNFZO9cJvdGYeRJRCPSjKW8QhogcjbgOxiuvqeCukVoNFNyXX5 JqOHRAjM9o9WTYnDbAc/FlkucWhAAXvfzPunzDqz9gsqOFdEFHAQgL51Osh2oZBiOA7/ uuqIYmvUw40LbeJLEZmS1kHwfLYHRWvHHozLcSiFiF1M0SafTLcTmjSaWgH6/o5g3b3Y +1rA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="clhE/sTV"; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::429 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com. [2607:f8b0:4864:20::429]) by gmr-mx.google.com with ESMTPS id eo7-20020a056808440700b003c3c59ac917si726475oib.5.2024.04.02.10.29.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:29:05 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::429 as permitted sender) client-ip=2607:f8b0:4864:20::429; Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6ea9a60f7f5so4450594b3a.3 for ; Tue, 02 Apr 2024 10:29:05 -0700 (PDT) X-Received: by 2002:a05:6a21:3414:b0:1a7:377:b86d with SMTP id yn20-20020a056a21341400b001a70377b86dmr9982738pzb.12.1712078944762; Tue, 02 Apr 2024 10:29:04 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:29:04 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 7/9] cibuilder.py: add -S support to the bitbake method Date: Tue, 2 Apr 2024 17:28:11 +0000 Message-Id: <20240402172813.418770-8-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="clhE/sTV"; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::429 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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: =?utf-8?q?INBOX?= From: Christopher Larson This allows a test writer to call `bitbake -S none`, to generate signature data in tmp/stamps. Signed-off-by: Christopher Larson --- testsuite/cibuilder.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index fa30c2f5..e968d14d 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -188,7 +188,7 @@ def move_in_build_dir(self, src, dst): if os.path.exists(self.build_dir + '/' + src): shutil.move(self.build_dir + '/' + src, self.build_dir + '/' + dst) - def bitbake(self, target, bitbake_cmd=None, **kwargs): + def bitbake(self, target, bitbake_cmd=None, sig_handler=None, **kwargs): self.check_init() self.log.info('===================================================') self.log.info('Building ' + str(target)) @@ -200,6 +200,9 @@ def bitbake(self, target, bitbake_cmd=None, **kwargs): if bitbake_cmd: cmdline.append('-c') cmdline.append(bitbake_cmd) + if sig_handler: + cmdline.append('-S') + cmdline.append(sig_handler) if isinstance(target, list): cmdline.extend(target) else: From patchwork Tue Apr 2 17:28:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3470 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:15 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f62.google.com (mail-pj1-f62.google.com [209.85.216.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HTDqr019807 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:14 +0200 Received: by mail-pj1-f62.google.com with SMTP id 98e67ed59e1d1-2a26e4ca9dbsf150956a91.0 for ; Tue, 02 Apr 2024 10:29:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078947; cv=pass; d=google.com; s=arc-20160816; b=QHLxzCvLqsbSwyQc0CZCplC8ZSagRxoRFD/d/w93qX6wIPgMQJDKiIPEO+fWT5/mrY XTwbfxV++uDZv3slEnqEjfZB0jpFrlhyXqVBDTiA3JNHdmTNdHyOkr/ulc1nISUJeXYc yS4FFWyT6Wfqhly9TDTa1YkT36E/i/nsufeoK/ODgqrq2v5qRPI96+0HYawOM1IU9hbK YCoBylXsTxeGsOEqVSDW3iT3tjBDW0i4o7hpI3uply+2A275bVdlDAqEZWCt96p7uoEv +QsJG1pkuTBJjjSsSkbhtWisyArm3o7i3TqgzSJViLZpLqVUkvW4hvjjWVl+i3xHao2z 4YNA== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=S7MZO0JezmOxhShoNEM22b+jBQ+af9kcPH+H0+IRq14=; fh=vuufh1ccF8rVVdfy580TOGsXymRDHvNZkjGz671ieH0=; b=b1+F7HU87DzxVcVVbZ+EgFdF+Y1EzTO2NXctV8iLTnyFJNzXYu9EGVx8cI5eUw9cuS doFZJtKf965nNof8NDyjnUJoltBkVNXkqtblFaRwAKUlJKhYsrUBcONYq3bmYh+hOdjU bdhxf4H4iI+8ZFr0HnfWq4f6MpQetgM6nOPGh3glCX3Rb3iuiv8dT0ctxXWfU6Aj46+s OR4W3UmW+c19kIxB1/+cqDqYtlsz/tZPgluCtJUI7dPg4bHcjDtGTqxuWotkpnW8NivS kjL/s1qbUBkdHhbe3Tww32zdpIgvw5Xgmdpf/vqkgTbDGK6T/JNw6tENYK1Ah6wjpgyk stZg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LNVGHOuY; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078947; x=1712683747; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=S7MZO0JezmOxhShoNEM22b+jBQ+af9kcPH+H0+IRq14=; b=BQcPxCUhdPekLBr1suIfj+80yrsEgAKbkia5uloTMFIyiYOOSGkb3OuzKxiqkMXcpB HWUN21LIZDkVkYSLhN4WWir/lfpkmYdIWzL1t+WRqmO0tPmEi/BJ2iP0k8p2EKY3pnoe FVvtJFh/hEekGWl8cNAnSI+033xwlBbR/H/Xz7ldLYLdOFyb4eJovg0kbHujth9GB6Yg jgJeUTEdCWB+nQmgh9+4l2wWpOpWCuuj0nBFz4/rk1NAduuHnOesJDFEzZeJYbbSJ9vN Vjq4IKOySaOyQZCjo2S5kHH/xOVGpyybp9i2qYF5cFl7uCS40HPnYzYah0y3erdU5xQO 3iZw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078947; x=1712683747; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=S7MZO0JezmOxhShoNEM22b+jBQ+af9kcPH+H0+IRq14=; b=GUbPDmr9RuPawhpLcX7Hr0R/EGjHSZcIBqEiV35On/Ur7+K/OHBP5k2Yv+DLFbf+o0 VC/4teVb2iVrPbM6bfkQs6mh0erjTe5EcQGhcjn55RzFL2fyF9FOOophnvc6GiVSIm+6 rrRxQiZshOEFWVDIK3JYfbNG2PfAsOe/QxcrXQEGsxLpILixCb0GbXETBMa0qK6lKcT1 Qye3fW21OnrW1CcKu5pc2sZ+EFM2XVZ5jqAXWvb4vXtNKALgmhsl2kqu97ajtty/ZK4w HxTOTQmbrfuw3osYn8zx7Iw8bgm5rj7ZSIi12X021V3ZZQ2CEk0w0CmOBnF8F7FEEEiw ktgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078947; x=1712683747; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=S7MZO0JezmOxhShoNEM22b+jBQ+af9kcPH+H0+IRq14=; b=bQMdrdFL+lt3a76cfyKszOER8rPF8p4uY7iXHibnNNLqi9wjDtoxrWBBg+6CSuCs5v 67soimQ1o69/+AZFHJnRCVk4VD9VxAvSALgsLbMAtxRl8psKA525Z9yw28Gpq3IPlUvX 0tYnIRcP9FGhsizn3U6tnHTTxeV58eJcmV+z/i9Pn5BRwqma+cynE42c5mBcGzX+nIVF DmIkqu3mmgn5IFE0xiE2L/Qd0uB0XKFD1xnFcAr+AHXcCBUdygZ0UdCbVfbnFcdlZCer oLxfVGePBbuMqlwmwzyvckvA+GYrZj7NQgO1gZiGAdb7ZRfqy8xD6/n9Blv0ikFcubvd SbUA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVuxStSQMz9L6RiBExSnhNM1OD/ZC38aBGKQZnxkvLdmenJruvEYTXGxdde9xFmdgwCYYl43HKZQRVA09HJzrFzOgdn2Xg= X-Gm-Message-State: AOJu0Yz1L0HxZY9Q/akCZmWzungodJYNO2P+x3OdFVIHwBUjk2u52x4h 8m9Mr5dUezpiKWCYYPfmFU2yT8mZjE2aprl9uPzXbdPn27fP1DSs X-Google-Smtp-Source: AGHT+IGgOG9cB3+dJf3v0xSS5iu0BiTGgP2MWvt068rLQbcz0i7wUoQkxO9WOTfrgJiGbMiXXdpUBw== X-Received: by 2002:a17:90b:3783:b0:2a2:2d11:c637 with SMTP id mz3-20020a17090b378300b002a22d11c637mr8699061pjb.0.1712078947488; Tue, 02 Apr 2024 10:29:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:2687:b0:2a2:7a11:a785 with SMTP id pl7-20020a17090b268700b002a27a11a785ls28667pjb.2.-pod-prod-00-us-canary; Tue, 02 Apr 2024 10:29:06 -0700 (PDT) X-Received: by 2002:a05:6a21:398b:b0:1a7:c2d:98b9 with SMTP id ad11-20020a056a21398b00b001a70c2d98b9mr196593pzc.8.1712078946419; Tue, 02 Apr 2024 10:29:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078946; cv=none; d=google.com; s=arc-20160816; b=l/95WkGk6LhJrr4EVIAOe88GK0LZnYLCjGb6/ARbHno+V8Ee5fYuoZ86UpwCI/xWfy jOre8fMf+opgxFwc40bsnPNJDT8jvDCqp6OC8jCytgbCUspH+3+YO+di7nFwWR0y9tXw wqDvoTTbqyvCLflhXc4leAvw7vw18wmsb5HU6MsuRy8MtoKinvJMRpylfZteYIx2nOvP JZ+C4b+VwKkwxTP9SWI1hC3pQ7AAUe9VOe37Ye7/o43UQF41NXWce6FJlrvY3/GNj1eD rfTK9i4Gc77EZgNhwKdGwHxeAAFXYKQFkrKNHv9CFBW8s9c81y3SWlWZ/zMWiQ0z2FcW cFeQ== 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:dkim-signature; bh=8KrbPPIgO1XO88EUd87HvCpnyGpyq+1TiZiq52LRkp4=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=vWrTgNFOOlY8yXbZ0C9hj5XyLZaeiebwUx7pcF+7Mr63MOKW5vrAsg+x/jecKinoWS UBQSD8g+dHWPgfCBv85Ch6DYSscuR4oxwZ4XfFxUsUa97HY2AsZEd8EfSdpMBA1Bp6Ky o2ILFm7AJmuqQvLN2pPYyWhbuDuY44O7HTV35LFM0th0prE1SacTt/E7yRvqB7ut+vRS D5GD+ACTIinQBnzMLiczATgrbSAvWUGB6c7zs9PmGJkaRZ0jgOHVY/y2BN5leFWkeWaY kyfLtyfPrcGvk6Yazde5D3lAV7jTUPNUfQ9hcoIpt/7qiSQxxMy9DuCTftWFtVfB60PT zJ4g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LNVGHOuY; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com. [2607:f8b0:4864:20::102a]) by gmr-mx.google.com with ESMTPS id d126-20020a633684000000b005f0a5113629si500562pga.3.2024.04.02.10.29.06 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:29:06 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) client-ip=2607:f8b0:4864:20::102a; Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-29f69710cbbso70642a91.1 for ; Tue, 02 Apr 2024 10:29:06 -0700 (PDT) X-Received: by 2002:a17:90b:216:b0:29c:7641:5b8f with SMTP id fy22-20020a17090b021600b0029c76415b8fmr189432pjb.20.1712078946076; Tue, 02 Apr 2024 10:29:06 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:29:05 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 8/9] testsuite: add perform_signature_lint method Date: Tue, 2 Apr 2024 17:28:12 +0000 Message-Id: <20240402172813.418770-9-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LNVGHOuY; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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: =?utf-8?q?INBOX?= From: Christopher Larson This method is provided to generate signature data for specified target or targets and check for cachability issues without having to complete a build. Signed-off-by: Christopher Larson --- testsuite/cibase.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 90591f32..349a79f0 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -125,6 +125,25 @@ def perform_sstate_populate(self, image_target, **kwargs): # Remove isar configuration so the the following test creates a new one self.delete_from_build_dir('conf') + def perform_signature_lint(self, targets, verbose=False, sources_dir=isar_root, + excluded_tasks=None, **kwargs): + """Generate signature data for target(s) and check for cachability issues.""" + self.configure(**kwargs) + self.move_in_build_dir("tmp", "tmp_before_sstate") + self.bitbake(targets, sig_handler="none") + + verbose_arg = "--verbose" if verbose else "" + excluded_arg = f"--excluded-tasks {','.join(excluded_tasks)}" if excluded_tasks else "" + cmd = f"{isar_root}/scripts/isar-sstate lint --lint-stamps {self.build_dir}/tmp/stamps " \ + f"--build-dir {self.build_dir} --sources-dir {sources_dir} {verbose_arg} {excluded_arg}" + self.log.info(f"Running: {cmd}") + exit_status, output = process.getstatusoutput(cmd, ignore_status=True) + if exit_status > 0: + ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])') + for line in output.splitlines(): + self.log.error(ansi_escape.sub('', line)) + self.fail("Detected cachability issues") + def perform_sstate_test(self, image_target, package_target, **kwargs): def check_executed_tasks(target, expected): taskorder_file = glob.glob(f'{self.build_dir}/tmp/work/*/{target}/*/temp/log.task_order') From patchwork Tue Apr 2 17:28:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kergoth@gmail.com X-Patchwork-Id: 3471 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 19:29:18 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f187.google.com (mail-yw1-f187.google.com [209.85.128.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432HTGgD019938 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 19:29:17 +0200 Received: by mail-yw1-f187.google.com with SMTP id 00721157ae682-615272125c6sf14219817b3.3 for ; Tue, 02 Apr 2024 10:29:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712078951; cv=pass; d=google.com; s=arc-20160816; b=YEt7zEb1Na8Xwpw+Qyfz6x0/BPHkIYfZ7yDbd919b7uKbv5nbMFl/Ln99/t57/b2Dq mvVukp845LT68sQxau1YMFCkj/tkjhxI+unGXiQJkbDbZlXLZtBTBwXDAAcwH1CDU+Xc wYecihxk9p+jExl57SQdVX4Ff/15m2HmyD4uyznK94PmtL4WbEf0L8ukw6hBtnpFqawm gED+edTaGzq+dguBfiPS5ih85kT3iyLVU1unFQyQAlCC8YauOrRKp2xaomtsAVy8xRmK U0+rDBBZl0qFrEhFiE3YAibHUkfr2tfcPWdOt26gWmYYWvjxs7WxcNvttGYn8PUav1y0 5S2Q== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=SxtlIwg16dYwoN39z9O7mytdir90JmqYA72T+k/2Rqg=; fh=gl2GcookxOmnREy0/d1QLhzYbsZrV4+TE1hOtY7WiXM=; b=rgOlbYgwwrNMLt4F0pWb9zwR6NMCHjqq4VtiGHA3IWLiFTmpno2ehxqBnsPBQWJbmv dvZARxVMgAZEOokEMARDvs/8W7I6yBRjmCwF0x5Ba3vjLnwDXePemBVkk/sbMK9A76ML g8xyewydP3C4dOCVSvB1DKW2g/zTZLJNyzDEnRbRxFachr2UoLGk7mPc5CQUW/vnidBp L2fBTmlaMH8l33HM53j1EghlaWqkfFqfRGoC4nM4PoE85LfSJ5KIH6AjhJ+2c8lV+C3t VpNX+3Z8pM//i8ZJ4Nyl2Rj5QS8PZfg5IgEMHX7m0AmVQVzcjEEilsQdAr0J3zTYxkFV 6spg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kr2GMP6r; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102f as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712078951; x=1712683751; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=SxtlIwg16dYwoN39z9O7mytdir90JmqYA72T+k/2Rqg=; b=BHsmh8h3HYSFTQR2/YXusgUjkEyxTQAe2ueTxyHYVJ3Cd4XKcKzcmZi93wzljuAsKm PO+TgPtB0fjw3P8j4BkM07EXVYR9Ilkns/Ad/4PNG1S43iCGtjuKeFdn834ZeI3JQ8r2 BeSiBIcxKIobKXM/Kr7kLjnkkhmVinHyey/x1lQbesYafgeA2XSkRhmdjUdFzQgnuPWR w7g4ecX/emlXOGLA965ny61I1zNwcbtG75IkeMFuL9gFF66ua3NhiVsnSHPn+YITlP22 X4wZkln5cBDqB5LyiqzVHULtNdOnynZDzZ33lHd6cJI49NGjc/db7P2R+PxlUrHEeRkn pK6Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078951; x=1712683751; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=SxtlIwg16dYwoN39z9O7mytdir90JmqYA72T+k/2Rqg=; b=nXFb+pOl3A41Wa2ylDik34q4vAb60B3UN5zo2idOghBA2OhRFpvAEwWF7QrcSyA6dn 7gTzdK7FFuKoZz8RvsycessfBJ2BBlMzlVPnD0jpucmLtZn//kikZBfrtwFdf44qnZ93 VsyGwa3quG8Zegt0KbhaqdYjAoxplokH9E89qLVTYvRZSDtl0N0CxPLTnSWX5Mq7QLZ1 6WkIAEq3+kZtNsxL/kEaP8b71RaxQ2FtvpY3P2YZlJF3meXTR9oLWQs1qqClLHeRDxuI CKqZhJTdv5q+KC+6S8gw2PQyvxNvvuCp+TiSV586hxJnJqAYJEoQZb3k7yNUui/NwODf Rznw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078951; x=1712683751; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=SxtlIwg16dYwoN39z9O7mytdir90JmqYA72T+k/2Rqg=; b=HVP/ybcQIfXCuNGLyMlwsMFpyiY+QBaGZGnmg7iLDZdBYrE7EitdKIEavkBUZbT78A w5zkba8AzHOV8/rUYVbk6dHO/Qa4bP0I77/qEwZt/pj/jFDyFzSl8xgusH8libjIE8sA ZKLDqNyIRhqkvReD6S651ScFU/YoA+QW+zCgJ0MH/UYlV5iTKg8w3vC4amPXeDuBcSlZ /pKO+0NiTpYgRPpMR+DNz2wq/5hrknQbqucgOKFGmxo48Bp8aj0UwNk67ca8J/QV3XHW aoYVGtrnqit+BnVjRL0MZYR169rzv+AJrqfi3Q7tqT38fR6kRrLGeURCTVlL52cwc6Fz 2MXw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUF6u+tK6w+V8M69DEDeY0zfJC29IVITKYmkHv1bSXQcadB5ZMfofYRmhPPWOiyy6ij83cHHtNl6CVaYrQOgPZbpfIJ3YA= X-Gm-Message-State: AOJu0YyKd0iaEnHEZicNzpcUSS/NG8rgtmd0zIA9VbyuY/CTpuzfHjuX nPSR0FKgh0ZOQbJHUpBw5JaJS8MlVvO8ye08P2K/K1fkQL7JJpZp X-Google-Smtp-Source: AGHT+IH9rKa2vXudeiP6psBUyORsipAMiaDIVfFH3SqN2FGl5lOJNkbfL62Ri+kpcnHzx+ZNiyJJDA== X-Received: by 2002:a25:ad45:0:b0:dc7:45df:a04c with SMTP id l5-20020a25ad45000000b00dc745dfa04cmr11247771ybe.43.1712078950987; Tue, 02 Apr 2024 10:29:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:b29e:0:b0:dcc:be89:34e3 with SMTP id k30-20020a25b29e000000b00dccbe8934e3ls506828ybj.1.-pod-prod-05-us; Tue, 02 Apr 2024 10:29:10 -0700 (PDT) X-Received: by 2002:a25:141:0:b0:dd1:ebc:ca2d with SMTP id 62-20020a250141000000b00dd10ebcca2dmr11462420ybb.52.1712078949928; Tue, 02 Apr 2024 10:29:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078948; cv=none; d=google.com; s=arc-20160816; b=CnP3awS7SLYIF/vdKIKLESVmZk1LtvqE/UCAa2IAk14ORwKEzYu9DvJ4ZXyyQn2/x3 q/RF23FNiU7SCpBN/+q5CC/HvSeyUwv/D3/HuPgPZGBf13udtT9genI0Ytlv3VcJT0NN PodAQw7Y4CjEcOdmwF30fH9hVi+i5saGLQs8+YM9IkYKgzavyHZdCFoji5vjV8XoMb+7 +zPJ9BY8pmbDK7v+WOSNmsWGyVNShFEjy7m6INt2kNVqZFl+gqKjigHc5gjZ0fQN/xwd foK/KaMhbWgwlZaZLFAfSyr51U2jDQKPt5rUZTTSGiMAgDzIcpPhMjAkaSz+ySq7myl1 LdEg== 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:dkim-signature; bh=Z8poW6yDo5+DmGfYF8v/qfCYZl4n9xDTebx2Drsxr88=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=olXquFXx7EjYTl1ryIhFzlSXR2KVcTUmT9ulpiUSKmEfsxUq7zxPUWXLlIn3KKuuMS a8MXebZAd9s+UvanbESNTkZWrLxs75EvtPl4PNhytW7Lf3Bj5igQDW+JdVG6Qp1ABRue bK5LFL24eGIPUvHeZzi32Xjy6fjgdJ3ADx+RGdTpIJBlDUGA4E82r+DF14bsgOdzGaT3 4au+UAB5iCYJk90i47MHK8nY3iiBWdtLb1UX0g+oA9Jslu5bQsmCxOJpwHrVm+qjDhbS 1k8Vea5KVnFPKBpUfi+tSs2x1A7wJlGLtgl2jw0d0xXO1VW9alvlvGnikChF5ogR/tP+ 46/A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kr2GMP6r; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102f as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com. [2607:f8b0:4864:20::102f]) by gmr-mx.google.com with ESMTPS id x195-20020a25cecc000000b00dcd2dd6bba7si829215ybe.1.2024.04.02.10.29.08 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:29:08 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102f as permitted sender) client-ip=2607:f8b0:4864:20::102f; Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2a27ba3b1f3so321141a91.3 for ; Tue, 02 Apr 2024 10:29:08 -0700 (PDT) X-Received: by 2002:a17:90b:2c85:b0:2a2:2dc9:7437 with SMTP id sw5-20020a17090b2c8500b002a22dc97437mr6679408pjb.43.1712078947373; Tue, 02 Apr 2024 10:29:07 -0700 (PDT) Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:29:07 -0700 (PDT) From: kergoth@gmail.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 9/9] testsuite: add signature cachability checks Date: Tue, 2 Apr 2024 17:28:13 +0000 Message-Id: <20240402172813.418770-10-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Original-Sender: kergoth@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kr2GMP6r; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::102f as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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: =?utf-8?q?INBOX?= From: Christopher Larson The current sstate tests do call `isar-sstate lint`` after populating the shared state cache, but those tests take some time to do so, and do not check for cachability issues for other targets, so add a new test which does so. Signed-off-by: Christopher Larson --- testsuite/citest.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/testsuite/citest.py b/testsuite/citest.py index 7e24c498..b1c0b760 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -290,8 +290,28 @@ def test_container_sdk(self): self.init() self.perform_build_test(targets, bitbake_cmd='do_populate_sdk', container=True) -class SstateTest(CIBaseTest): +class SignatureTest(CIBaseTest): + """ + Test for signature cachability issues which prevent shared state reuse. + SstateTest also checks for these, but this test is faster and will check more cases. + + :avocado: tags=signatures,sstate + """ + def test_signature_lint(self): + verbose = bool(int(self.params.get("verbose", default=0))) + targets = [ + 'mc:qemuamd64-bullseye:isar-image-ci', + 'mc:qemuarm-bullseye:isar-image-base', + 'mc:qemuarm-bullseye:isar-image-base:do_populate_sdk', + 'mc:qemuarm64-bullseye:isar-image-base', + 'mc:qemuamd64-focal:isar-image-base' + ] + + self.init() + self.perform_signature_lint(targets, verbose=verbose) + +class SstateTest(CIBaseTest): """ Test builds with artifacts taken from sstate cache