From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7353323043876241408 X-Received: by 2002:ac8:5908:0:b0:432:b41f:f7bb with SMTP id 8-20020ac85908000000b00432b41ff7bbmr16944850qty.14.1712078939213; 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-Google-Smtp-Source: AGHT+IFX6OowJQ24Ph9PmPLFh2Cs1su2TiuLlEz0Hvu2EsJtqsL2uB0v3w5UXeWGv8lPBRmLwSrE 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 Return-Path: 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; 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 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2a07b092c4fso4176435a91.0 for ; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078937; x=1712683737; dara=google.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BWJRHi/pgOK4uuXLICjusI1Z9vlLCros0C/57POwrtA=; b=IDqAxCdUVjVOMVOdkPzdPT3yxmYzvzuftl4E3HZDbUY29eDpmUj/hFf3tFa5vKuOxP +UyMwyTvnIq3JZvJry6fBKX2zIS4T2LAro9TxwsFmQfSs6krzlXMcN0B6VSBNjKAL1jd u1m/1NIgN28NHTrIfvlOymQym8mFAWZAJErOTaEiGOq0NF6TIYKAHbXxjXuDyoMVXxt0 XtBr9HUWS81wmyR0O4Ff/TQVJufh6IsOVaxJACYvR/Jq2y9bqv9MvGqkZfG5JW4kOZvD DE2s91fuNTh0EqL81vQvAk94W0DC5Uq40GLespC1nCmw1qvDSY84OkrMXHnQPNj3BpTU CaxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078937; x=1712683737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BWJRHi/pgOK4uuXLICjusI1Z9vlLCros0C/57POwrtA=; b=iL57D12ND8hnMQvzTZG6w+0fOn7a6IlnXzSixBi3naU0GStBMhFlJuwGWntKrdZ0l3 7w1qWDkQESgdrMOqIBqP/AXcAxlnQ5u0qQh6TxEcA+hdf+pIGn3z8k+wXy/FM1D6nYAt mcz0OHs4wOLGGmhYHCtTZWyh7imjr7/F0HEsgM2bOM8Y5KBwZqHnwp0/GP2xjauqTTCR pUQKW5uNVqJs84YyHskfBVq1oGpvux7JEBcm3wFPmzxrCpSF5KzXiUy887qIZ6ntzMG8 yil/DBLpnzM8n8/n/aetYiuoeH3oP+luhJecnxHb5ZHnSBlCqn1JOtzCFuko038/WZ0o REfg== X-Gm-Message-State: AOJu0Yzkos4gNjvEiQ2NYdjyE/plxGr7kr2KXzcsGVMwQYKbLoHW4aqF ZYtywbkCphCFrN41ZILnJiPiKYnzUH3Uw/vYM0duX/XGcvMXYDZlPL/dt86DOM8= 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) Return-Path: 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 X-Google-Original-From: chris.larson@siemens.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 Content-Transfer-Encoding: 8bit X-TUID: Yi4Cy4a0XfOL 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) -- 2.39.2