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: Christopher Larson 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)