From patchwork Fri Apr 5 16:31:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Larson, Chris" X-Patchwork-Id: 3486 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 05 Apr 2024 18:45:17 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-io1-f56.google.com (mail-io1-f56.google.com [209.85.166.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 435GjGbx003773 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 5 Apr 2024 18:45:16 +0200 Received: by mail-io1-f56.google.com with SMTP id ca18e2360f4ac-7cc74ea8606sf253745839f.2 for ; Fri, 05 Apr 2024 09:45:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712335510; cv=pass; d=google.com; s=arc-20160816; b=vRfKdYH3dlEuBnB66+RxbF5C7+7snL4RJNyjcyu/ZQTpwhp7cF40icdJdGTbJQ6aNz ZFN0biOAlx7BZWAFJ5btHQIaQoymYyX7/4K8Dx72tNdQLJlsTmljzV8MAlVENv+yjhSp v4nCUiefxaw1r6KAfLtAHs3lrUNK5zhhMvT0vzlaX1/9PwrZp6d/2eh8xxUgmASptPYP vkIMdOyNGfzHGj63S5kNdEWShPXDwdEudCzpJxXDwNaB0pCkWQCkAHKt5YSSZS6HOwOm sGnV5+9j5mohzHS3WeGWTPlQ3SsDLHbUg4DWXF0sBf+KLH6LmZov9crYQVLJFTfHAZcY BJSw== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4H7VxwrY5D+RRVtyW9tsVIqst2ZH+UJSqMXvvxdOcR0=; fh=564QeooCeqJUJ/0rhM4/XT/OsUUNXy56CoAEMbBjsbY=; b=j8YR9LiunmwlfHmolPnMb+DgJs1HaeNBsa8UmmmksiIGko+2gTyAfdTgFPTnoHZ3OR Uhuhw3ZIrAAFA7JFlS5ZXQFLx3aja3IFQUmM5xtVadIU38o4AjNINDckh9VfIWsBTirT wsUb9oReheQYXzlB7+vhZTYNa4J3Ub+7936keb+1w+h1sfA90ql1b60IiS2cqWd0VI6m TuwaHm1EgIH6RfUKzyE5xZM4MDf2g1ljUMC2x/B6X7d1FQr3JwY/uXbVA62JANdrld8W 6HRfPmGL1dfKVE1IFTvmvVkxk+5hi375bH3fvRNrk8Ts3GTk6fOMRpk6Y+6iaeWHwSdH FLAw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QsdI2Eba; spf=pass (google.com: domain of fm-1325773-20240405163221ceecdcd574f706522d-waiung@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1325773-20240405163221ceecdcd574f706522d-WAIUng@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712335510; x=1712940310; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=4H7VxwrY5D+RRVtyW9tsVIqst2ZH+UJSqMXvvxdOcR0=; b=W/tpL+MDq8G7SL6qYtqDb+l/418f/UcjCx36khMsbk4IrMcrYP64O4PvELfOcHhSIZ /7Ivj83anVSCdcz/Zn+t3MCV/YLWIxK9s9IZ0i4D2TAy+WcwM1bOrfri8GpZ8YKVSFjT QmoeJYUyCteW9TXWTbcYdBtkBIB4txCJw2rHUyk1fF5sGNO6M6vgFpPwhX3FaA4PvgUp AGZyHpUHvtRHeDbgsQ/qiYLEotGnSzCc3knTtlJUmywOcE3QrKqaqIfEr1zl4KLlGb3d Hz2SJP/dsatiec22Z+HRj6jlungImpSf/T84opiA4yJmaOmEmFU3fxc3q+XWVwV4PFHe r7wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712335510; x=1712940310; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4H7VxwrY5D+RRVtyW9tsVIqst2ZH+UJSqMXvvxdOcR0=; b=HTXytpHkGVZlJWwLM1r6tsoU7RMcB4Tpipixcc7IYlSyavsGF9iivwtX3Xij4urutm hap8c5xIXpb+5jcgLVP6L6/6Fs5L0ocIyN6daytWZ7Sw7Wf/B5cpCxPT8CZFVU5pVmeI BGk6pCq7BWYuMCQl2f8O/vdVQ89JSSIku87WQV7CmQp7lYU4Ps9RnqcknGHxrXyzldnu DO4QBjv3sYbdzPzruFYI+z1sUzvH6A4AA/C74oSkMc3F9lVM/kA78DUfzlpuRq6tRzXX b0z8GLlAqHihHiqPn8yIv1go4lLvXjFXFRJBpF/ltkyYLSave1wEaRjuz2kdAg/SYpIV v0mQ== X-Forwarded-Encrypted: i=2; AJvYcCX2TT72Qd509v3BRXIoER2jhX5UnFSN0idPGCAIj2rRIk3oJrrSpKQ6lc+fVf2bXlort2rJSEp1J3C6CtdGMCZ9RdcBWV8= X-Gm-Message-State: AOJu0YzEbmphR4apQMx6jmIx1TqPXB1MFAhr1opNuiCOHRwc5xw9GGjv N+bVb37Wgv6Cxs0STT98cx2xBleNu+BV78i9FrnS88k1/86Ml+/l X-Google-Smtp-Source: AGHT+IEzJ6H95jzlm4mSNfnm1WVpRelW7pBgYRXTBnWBvyueAxToLwluV00FFV4g/FWxTaX1/XzvGQ== X-Received: by 2002:a17:902:f710:b0:1e2:c198:7cc7 with SMTP id h16-20020a170902f71000b001e2c1987cc7mr2192772plo.28.1712334746743; Fri, 05 Apr 2024 09:32:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:ea06:b0:1e2:45c6:efb with SMTP id s6-20020a170902ea0600b001e245c60efbls1602540plg.2.-pod-prod-04-us; Fri, 05 Apr 2024 09:32:25 -0700 (PDT) X-Received: by 2002:a17:902:e5cd:b0:1e2:922f:bfa3 with SMTP id u13-20020a170902e5cd00b001e2922fbfa3mr2286216plf.51.1712334744775; Fri, 05 Apr 2024 09:32:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712334744; cv=none; d=google.com; s=arc-20160816; b=E4byoM+zsCfcz0Ex0eKvrG8YxJX/6DZHWzphRgQTo9pC1Z+ZCKa35EN2vFvAGgkHag /Wt4ikJ1Y7E5w+FsCb/QpntavHZ/fei8GHuJIbCb5JkdZ/bWdz5A83WlXgY161dv1SOj X42P3zuvunjU/azPdoyfrwIdCUY3BTl1HJRegZbbPVIzBM+LMaxgGRvHRMIZ09yhV+1R pnPu/3GKPn0jLaV+Cu8tckRqPgNkBmUhIB1/OyC/rA+Do3ZRS7J7f0RjK/qcAMFTYPJ/ FI++ekhArdsEcleVFXMD+hI3vD8Cg9egxyOS8FTsP7sKKrUge0xQfjBU7+DxIQCQOt2G 4+FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=pJ1+nRk2r4AbxuuYs6u4MkKsOs20LQBbO8vYeIpebHU=; fh=3bh9z2BWAzGAc1byRhMi0K+arMZmX5BQHE0sOxINdyU=; b=lbOu9e4qAj6GzWQL55ymDxD4NG1QNcyPgVxfQoZ8+HerZs3ie3+vNB3QKyNsXjB2w6 tm7PtEyo/3RkNr6eczxCwgS6CcWiwEgub4LF6IlyWt547cULbSFbBuD+RLnauoqRPMn6 kmdOfEeKDLc4NZ1nvrIbEvvisucP+8gHbjQvwk2L+zNq0wVMqq7J3At3+waKC0769mcz JjbTO51/6DOMzDmykaXtdUpfAxFsfao+Yi/bJw4l4/nfQsg69QjyM1mdPJTaNzMOA0r3 8Tjt7RaWhv24EzPVWUzGFBxXFe344nQg8QEfY6aqGHVs/Ww/ThYZ6mmGPyHWXoKkjcAy qX4Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QsdI2Eba; spf=pass (google.com: domain of fm-1325773-20240405163221ceecdcd574f706522d-waiung@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1325773-20240405163221ceecdcd574f706522d-WAIUng@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id jc18-20020a17090325d200b001dd61b4ef8esi97963plb.12.2024.04.05.09.32.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Apr 2024 09:32:24 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1325773-20240405163221ceecdcd574f706522d-waiung@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240405163221ceecdcd574f706522d for ; Fri, 05 Apr 2024 18:32:22 +0200 X-Patchwork-Original-From: "chris.larson via isar-users" From: "Larson, Chris" To: isar-users@googlegroups.com Cc: Christopher Larson Subject: [PATCH 1/9] isar-bootstrap: avoid forced early expansion of key vars Date: Fri, 5 Apr 2024 16:31:27 +0000 Message-Id: <20240405163135.2987489-2-chris.larson@siemens.com> In-Reply-To: <20240405163135.2987489-1-chris.larson@siemens.com> References: <20240405163135.2987489-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1325773:519-21489:flowmailer X-Original-Sender: chris.larson@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QsdI2Eba; spf=pass (google.com: domain of fm-1325773-20240405163221ceecdcd574f706522d-waiung@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1325773-20240405163221ceecdcd574f706522d-WAIUng@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: chris.larson@siemens.com Reply-To: chris.larson@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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. Submitted at https://groups.google.com/g/isar-users/c/2NB-PXyswq8/m/xTTcxqxTAQAJ. 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)