From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7353323043876241408 X-Received: by 2002:a05:6a20:8f01:b0:1a7:47b1:e4a7 with SMTP id b1-20020a056a208f0100b001a747b1e4a7mr1258738pzk.48.1712334829157; Fri, 05 Apr 2024 09:33:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:9288:b0:6ec:ffba:185f with SMTP id jw8-20020a056a00928800b006ecffba185fls632126pfb.1.-pod-prod-09-us; Fri, 05 Apr 2024 09:33:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8dG4SOohADhxUOzqeWH+sz7tuDOuqosQi/Ac1ZFzXVZU/RAK2kxziSDoU81va11MoP8+/ X-Received: by 2002:a05:6a00:2d2a:b0:6ea:afcb:196f with SMTP id fa42-20020a056a002d2a00b006eaafcb196fmr1849243pfb.9.1712334827611; Fri, 05 Apr 2024 09:33:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712334827; cv=none; d=google.com; s=arc-20160816; b=S7LiA3G44q2POLZFa4fq+IwRhK8Nq/WcjXL09cMENlXDAvwzSrKdXU1abBmJl52R2m LZw79fO7b82HjgOPKO3aqCwSn7DrfrokyWwWa/hQTrShuxQcd/NMvE3Qgs4CRDU9YRKa TP45UILtcj66LBo05unzZG16Ecz5qdUYT8+0ziDpCQB2ZhhxiGscQeAQZYEswLTqc+xW pjOu+CMahePTlvsScWHxHVGAn8MZDbHWou8QfnOlFbC+yqqDqRtJNyjufTG44G6t8NeQ TwfHHX75y+tuc8zJIKU6q0iux/2wSmwZFL9Qk1rFEFGLR9KT4Uf4PHm+6mkPXEhdKQzj YqvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:msip_labels:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:to:from:dkim-signature; bh=sO1aDarc7UuEF6yp/PSSSWeJ4DTAeHgkpj4oEpUiKX4=; fh=OCLipNJhBAjuYZVWe88RgIbTd+C/BiXjPppf4/h0OyA=; b=VhsE8fx2lw6b+wREJVSsxL9EKYuF5p1zk5uGDOgRGTMsdsjYaSm5FOIysTQhLyOVrq SpAbHZcManTsFEX+J1VOBCYCLkIzv6bkQP9CtWpJd5OC1igiTn8U1SMFeY7BFEVw5S33 s7j39D8oOrDBOWbAyvF5vAxvQ2Rg+4oOopBVlmLpRKlsgSGlSQVRg3r9kGI506lEj3tR 4/6x0VfsKHbqSfQp9ebFbDahFGThzniEuz+MmeDBYlUCYcLfIf75fvO4Jsz54jBdq6Tq Q/TqhN8TuHAO1aQcE2Apu6eSY3vTxpAjY2m/UXPKKR8H0nfkAg+NbpK9pHj8U0BWCul3 1cyA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="p74pkP/V"; spf=pass (google.com: domain of chris.larson@siemens.com designates 2a01:111:f403:2009::701 as permitted sender) smtp.mailfrom=chris.larson@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20701.outbound.protection.outlook.com. [2a01:111:f403:2009::701]) by gmr-mx.google.com with ESMTPS id k196-20020a6284cd000000b006eac41e9673si202793pfd.2.2024.04.05.09.33.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Apr 2024 09:33:47 -0700 (PDT) Received-SPF: pass (google.com: domain of chris.larson@siemens.com designates 2a01:111:f403:2009::701 as permitted sender) client-ip=2a01:111:f403:2009::701; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="p74pkP/V"; spf=pass (google.com: domain of chris.larson@siemens.com designates 2a01:111:f403:2009::701 as permitted sender) smtp.mailfrom=chris.larson@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=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sO1aDarc7UuEF6yp/PSSSWeJ4DTAeHgkpj4oEpUiKX4=; b=p74pkP/VIYQ9jV8jIKXIobgfm2RvfifhHNZgReLkd6qEOIoLCZrGrcW4SPkeoUFJUfRmfH2gMuJp2kD8Gni0lbEMDebfIOrmKwFKn7mlJCWfXuKdlXQxO63FMQpbvmkFQ7mFlrI5p1QUeYzF2jDtbYHhaUaPivWMt0i9QYe2/8NBDt0WTUa6zPnp4gUfL34RFtlrta/N9wZm3WcUP2It04ubY9wD5hhbl/nZ9rzBsEU44Jw9eozUuXoEzFzs/lxVhDU8aK+ud6JVLP8sF998VpTpo4Ovw4UtvdzGoNnt3y+i5m8K4Bl8i+tXk29j4h7n4VyjN2twWZm4Uy7v4ExzTg== Received: from BN0PR07MB8375.namprd07.prod.outlook.com (2603:10b6:408:12e::24) by CH0PR07MB9821.namprd07.prod.outlook.com (2603:10b6:610:183::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 16:33:43 +0000 Received: from BN0PR07MB8375.namprd07.prod.outlook.com ([fe80::a429:2b28:36e4:89d0]) by BN0PR07MB8375.namprd07.prod.outlook.com ([fe80::a429:2b28:36e4:89d0%7]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 16:33:43 +0000 From: "Larson, Chris" To: "isar-users@googlegroups.com" Subject: RE: [PATCH 1/9] isar-bootstrap: avoid forced early expansion of key vars Thread-Topic: [PATCH 1/9] isar-bootstrap: avoid forced early expansion of key vars Thread-Index: AQHah3bYwbWMGyTNjUCRzukYOEs5ALFZ3wiw Date: Fri, 5 Apr 2024 16:33:43 +0000 Message-ID: References: <20240405163135.2987489-1-chris.larson@siemens.com> <20240405163135.2987489-2-chris.larson@siemens.com> In-Reply-To: <20240405163135.2987489-2-chris.larson@siemens.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_ActionId=12c4247a-3c60-42eb-a2ad-ca2edca1ee4b;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_ContentBits=0;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Enabled=true;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Method=Standard;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Name=restricted;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SetDate=2024-04-05T16:33:24Z;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SiteId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN0PR07MB8375:EE_|CH0PR07MB9821:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FenJrRp3n3olAwqcInyJtu2xm8jsFKAtGzpgKsuGhiGejG/CYYFkGUi19sZbK9F7DBMz76xXshNlIn7o9OuEeu91kxd5RlSB0pOr+/MVJs2C2yqtBsS8JgZudEYcGVsfqRbwDaldwjWxBd85cXoajqkLQvSa4ZCey1AhMvYAjPGHKr9EmQIeie0TH7HFtmAjVZ2yez81r865zVQtzIjms9d6/zy5k7b/43sYtc6vo+uUCGYofeXhWr15TW7C+CLXtB2hrf2ep2bTaPfkTUm72EOpdom/CYFv4WMXlVb/sdJYaaYo/gMs67zHTpz8RBpKP6WGRKnVX53fpV8CK4BKk8tx7iWkYJPHkqksSKQX5Rm9JMZS3hEeKH+iW91V0ikWiqpu3rglkKl8R+3g0GQ310wyHUVFWpG/ZlPIiodLVd+rLCiay6GsuSJPs2ibsOShJ+LrbqU5O+iRJ+fd27TU0DZgZRmZEug5995XlaN6mXe6cvJc0g8+pNl2//R8J3MshgGggFnVleVOyvh6c63hRcK6AgPb+ApGeooFkbJhrlyCXy1YefpeJsB6cgPJqAJFBgMLzFcJAj/SaO5UJbPfNAo8SqZvDK3HWD68IqL+rtM= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN0PR07MB8375.namprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?/W8YQV0Qsp98t/BQeb9lsiHkOk0zBtXkuTXRfKA5JKXLBWCaSirIUWpSCT3I?= =?us-ascii?Q?P4wNB3cy7aLtsOqHmvQmwHaFGSmdbVpXwMXPF5tIrjWhKBAo4PhEEQO04x4h?= =?us-ascii?Q?EoSde406HAoV+3qkEz+yHtarqDXvNsCGgXHc8vn2p0vTk4toHJ7ch7hM4Mnv?= =?us-ascii?Q?n7C7rtdRyuu975wnw1RJldiTcSeZF2TIdttr4Wd1Qf8BHEFuas3YcAHzuBiJ?= =?us-ascii?Q?NQO+n4XqGHdgx8ILZJ5WhXXNQBP5XdigKxQVL2nfJbcwOgpznNYOjrUMrM0o?= =?us-ascii?Q?xD7gz41jy2PZrwsIk4igzOENSfrL8z3dsWfx4LK/WUfN95F4AYpP8bI+I/aF?= =?us-ascii?Q?L7FTmmQIsrlBqoewSXP+GHjDlVRWFjh3s+AAtQk0DTXr52ruqtEAhaaNDVqq?= =?us-ascii?Q?UkeNPuMn9zyIvySFPcBJGiAyGg5S8490kz8kjpkzLJzP/4YgWf0NaVIgEXZ7?= =?us-ascii?Q?Poz0/0jTCgeE6X4q7XN16imvMII46ddO9202OtoUIXq3J981FffWO3Kbr36d?= =?us-ascii?Q?QqfmeLpeswmQAfeUvidkBVkgcpcudt5ddGdIWihG8+AD7dRknASOYeC0BNrT?= =?us-ascii?Q?P72CCf0Gj9apstUu9ffkYn/ryXGDvO8zb9m8E27b2KXWzQo+AilmU8bmG5FI?= =?us-ascii?Q?p7bWhqXVWoBfL3owvuX2gxmHEoacuDIm5A6vEavIF530HVxJLeWS97/efElm?= =?us-ascii?Q?OUdkbs4hIH/5EgisQ2fujfe5K1ccAj02QwPDSM0UF/d1kerrSSHdQz/UgiEo?= =?us-ascii?Q?IWnoYOZ2Jyd8/tTO019GIWJuhxjNifLq73v8rs1s5dXR4Y5cYMlc1PR+Bny0?= =?us-ascii?Q?HfpMZi6ZSC79sWbCZItswTr6Dk6qqaFuac0QiD/dyA9F1klPgd/N+Y2smX3g?= =?us-ascii?Q?THu/vpLYqj/RaGQ+UYVbn9V5aK9+b/hFDpU502JGWd9YPBwogD5AtYFHq4dM?= =?us-ascii?Q?bDaEFxjYxhB6aK0XIcNSE1nwldGZE4TSO4M2Ac6zSgdCBIkjvoqK42KvvMdJ?= =?us-ascii?Q?+Vh6KM6lzqmGlNE/3nsBbX6wk9BIkH3rwVzyw/vH8TbEcZhFcVMZg2JoEQIB?= =?us-ascii?Q?2Y6zlozh8dD5RMJ1S3Lo3je6cS7HyUXcdG4e/oKIHVHl47yRCyXcuTcYTrLc?= =?us-ascii?Q?FCmKbXVXw4DnKYpxThjG98vEDmjftLXJZSyfAm1eVtz+dQwVKSIo4O5YGRLX?= =?us-ascii?Q?AhwwEgbccF9AdA0wbWbCj40t6KbiOXWb4NK+rPLRGU5Z4+9iaZKeHpEJ0VYf?= =?us-ascii?Q?cLKWbtc6XuuaBXTtxInulsWXfmAA1/kJ6nzfBDOdkDC3Ivqq+iDSs8x+1J4t?= =?us-ascii?Q?d9fmD4Ac11Me/zcDClBYAp4BNeIKaeR3e6B9a/juXADt2ILi71nkRmxGL5X7?= =?us-ascii?Q?M6/ZJU55J/3TlrzonCcvGSjXv44455fCS8d7msfcmlyiZutqoKGQcVANx6FS?= =?us-ascii?Q?KgdhXd9RXm/efVRfWgZnNhhC8iFGNFlX94Kbtyc2ew2gw/XXit1SJonK4kFi?= =?us-ascii?Q?9/uhJPdn/ZPEgNHbAJBd6PaLQcNGY8EqgeUi2U/NOZLf9hTdqwwm2oahi3Qx?= =?us-ascii?Q?MJKD5zvaKf1QejR5lccBHJ9rxL1SHLXTgVnv21CU?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN0PR07MB8375.namprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4eb21d23-e3b3-4a95-7410-08dc558e2899 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Apr 2024 16:33:43.4354 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 41Xhlugf8mPA1XVvxxjrDvm42IdIWYLy1k0iCj/tNGJTxG6bVHVj8VwvjVlWy9mS78pLkUciU5o+pkI/ci8uebEC3ogGQ7ZD15U/VXkaWCw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR07MB9821 X-TUID: MbzAWftcMYwL Apologies, the subject lines were supposed to be PATCHv2, missed an argumen= t. -----Original Message----- From: Larson, Chris (DI CTO FDS CES LX MEL) Sent: Friday, April 5, 2024 9:31 AM To: isar-users@googlegroups.com Cc: Larson, Chris (DI CTO FDS CES LX MEL) Subject: [PATCH 1/9] isar-bootstrap: avoid forced early expansion of key va= rs From: Christopher Larson Rather than appending the items from the expanded key variables into SRC_UR= I individually, which means there's no way to use tools like vardepvalue or= vardepexclude to control signature generation, append the unexpanded varia= bles to the SRC_URI directly. This avoids issues with shared state reuse fo= r the isar-bootstrap packages. Submitted at https://groups.google.com/g/isar-users/c/2NB-PXyswq8/m/xTTcxqx= TAQAJ. 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/rec= ipes-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 =3D "file://${LAYERDIR_core}/licenses/CO= PYING.GPLv2;md5=3D751419260 FILESPATH:prepend :=3D "${THISDIR}/files:" SRC_URI =3D " \ file://locale \ - file://chroot-setup.sh" + file://chroot-setup.sh \ + ${DISTRO_BOOTSTRAP_KEYS} \ + ${THIRD_PARTY_APT_KEYS}" PV =3D "1.0" BOOTSTRAP_FOR_HOST ?=3D "0" @@ -22,6 +24,8 @@ APTSRCS =3D "${WORKDIR}/apt-sources" APTSRCS_INIT =3D "${WORKDIR}/apt-sources-init" DISTRO_BOOTSTRAP_KEYFILES =3D "" THIRD_PARTY_APT_KEYFILES =3D "" +DISTRO_BOOTSTRAP_KEYS ?=3D "" +THIRD_PARTY_APT_KEYS ?=3D "" DEPLOY_ISAR_BOOTSTRAP ?=3D "" DISTRO_BOOTSTRAP_BASE_PACKAGES =3D "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg =3D ",gnupg" @@ -48,13 +52,11 @@ python () { distro_bootstrap_keys +=3D own_pub_key.split() for key in distro_bootstrap_keys: - d.appendVar("SRC_URI", " %s" % key) fetcher =3D bb.fetch2.Fetch([key], d) filename =3D os.path.relpath(fetcher.localpath(key), topdir) d.appendVar("DISTRO_BOOTSTRAP_KEYFILES", " ${TOPDIR}/%s" % filenam= e) for key in third_party_apt_keys: - d.appendVar("SRC_URI", " %s" % key) fetcher =3D bb.fetch2.Fetch([key], d) filename =3D os.path.relpath(fetcher.localpath(key), topdir) d.appendVar("THIRD_PARTY_APT_KEYFILES", " ${TOPDIR}/%s" % filename= ) -- 2.39.2