From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7353323043876241408 X-Received: by 2002:a17:903:2281:b0:1e2:bfdd:41e8 with SMTP id b1-20020a170903228100b001e2bfdd41e8mr2525035plh.5.1712334746884; 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-Google-Smtp-Source: AGHT+IHTcdHIKezIWZsjKqaEb7CGrX41z1s/ksNcYGS4FQl3TpmxOjfAtzhbiq7uPaJo6ZTe410Y 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 Return-Path: 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; 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 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240405163221ceecdcd574f706522d for ; Fri, 05 Apr 2024 18:32:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=chris.larson@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=pJ1+nRk2r4AbxuuYs6u4MkKsOs20LQBbO8vYeIpebHU=; b=QsdI2EbasRSQU3I9ZXBZDMP7G+McV9AiD+oeeCb4MsdynlAhgh8XMwyxBqY4J59COpnVNr PzOjhL8wrLmQ2SIBMUJ8OUTqsrf2lmxdrC07+NegMGA8vKAJX9IPoi/IJTpGf2noZ1PkUwLb wk3shmwbkTX1H+HfPMom6Sc4BxRak=; From: chris.larson@siemens.com 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1325773:519-21489:flowmailer X-TUID: NuozHwT9j2K9 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) -- 2.39.2