From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7351319545624133632 X-Received: by 2002:a0c:e107:0:b0:696:7f66:279b with SMTP id w7-20020a0ce107000000b006967f66279bmr2135736qvk.13.1711612461600; Thu, 28 Mar 2024 00:54:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5cc5:0:b0:690:c124:c187 with SMTP id iu5-20020ad45cc5000000b00690c124c187ls889787qvb.1.-pod-prod-02-us; Thu, 28 Mar 2024 00:54:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+E6ZQOxQyy4q/AWU7pVytILbIlOUFS5ysJw3WVycMwB85FcVmY3g0acWGuDvoU24MmDSN X-Received: by 2002:a05:620a:4548:b0:78b:3fac:478c with SMTP id u8-20020a05620a454800b0078b3fac478cmr2336089qkp.59.1711612460395; Thu, 28 Mar 2024 00:54:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711612460; cv=pass; d=google.com; s=arc-20160816; b=Mg43261ZRIt8UGIvI/4ZEL0TMeOxX0lBhRLhyrr0sSx3HNnNZoJTsKJtmJRhxkrnlS mboyBAts+lGH57JD5rJSzNT2cVmd7yYo7I3nGP0g1DHU9YGi9QuPgNZugPxQ85faEzL3 MxA5NrrGDWPTqIHjvosT7rsn0hktmzqOVcyUOfIkclfC7jtyRH1euvjsXKUA8t39dKxI BV45CF948OU36PEhYhpv5CugFVI7Ty7GnKr5CSXvpNASdlT3y71pFCQ7feMCdNaoDicJ 37zEszTgEi11Hr6ben7o5RQIigCSMxe3A1Xdz7K6/CO0R0i3HzZqruSGvZm4sLpyfXuF ZnEA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:msip_labels:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :to:from:dkim-signature; bh=xVWQZE+4o8iPXX4oQJCGmFUozWe7b+A5MmAkTRU8UFM=; fh=OCLipNJhBAjuYZVWe88RgIbTd+C/BiXjPppf4/h0OyA=; b=kOIbptry6UYKx94R8rT0sx4NBS9tGNNpzPXiTZU8MHByu0zVnccUgQt7PF69X1RnEP e2uUulbOWAK4DCmCgOXaa0Yys9Hj8McKYH/6doqUSEIvbImhNnwcPjAKbGXAQIkhaCsy PBK6N4fbmUCJGtfxPILWut0tIdkuRLWqhfrq6+uR2fAh0rLQtPmuzJVHMBy2MYc0kEXQ RkKwWjoqwsuEYxJ+Rio0vRhyM+xqJuy+aXRhUjPMr4UzwQ6rNowCFziFjeq0hiF7D0Ft zEeEYgj5/Z8C4mvRReIv90k1JH3PAFI9ZdkzkJR+4Hq16+CEScukaF5CNwSqPf+qOV2X 8Aig==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=lN6+HzHo; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=nicusor.huhulea@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com. [2a01:111:f403:2613::600]) by gmr-mx.google.com with ESMTPS id m25-20020ae9e719000000b0078a45a5c896si60970qka.3.2024.03.28.00.54.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2024 00:54:20 -0700 (PDT) Received-SPF: pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) client-ip=2a01:111:f403:2613::600; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=lN6+HzHo; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=nicusor.huhulea@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=flGh7W2F9GMgVthkuiifiidQSz5ZECAHZqf6D3IKItTFaxaUFOSn9zrt9+8e6LGENUg8zdXUdJIhZfdl+gLvX36GMuKwcT3xvNMyvkV+zD1tdvXv0nkyqZqexzOENZAHf1YQJwA9bWN/5dea5Y73t+xLb2DMr26LCs/cJBS+wmoClEvnwv9C2AqJpKI71P70gCOTEA2phY94K7QR0aLBfxR7XLiomPae7M0repVbeRmmHQ6m9KND/myA0yZXTnXKb+bNfo5GVCHMjwOTpy7BVRg6AKpfBV8EvoF52aiH2cZQdrlFgh99SD4UvxiqPMRPDqy96kulJG2GVX/m2VhidA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xVWQZE+4o8iPXX4oQJCGmFUozWe7b+A5MmAkTRU8UFM=; b=Hu4S4ybAKqyTJyaXgWNEWQfeNce7kmoYELPRwGk1IhcSHfaPVyWfPzLNStzWf9eRSKUiPpjHIyMLGFeaRciMZYkyV0116WpMaH8hBxQsy3lQOHa3ChyaF/l0HruDZOLuH47hqEnVKkBXHDSszc9CkwTtWR6ZkjmY0FF0Yjvt0l621p8Eh98TgTJQKrsjoARtfMO/IBxy0N61iMkFzbXnnCOelWIxbVemEAN0um5k7ASvSoLhC5RBxsFp5clBjhGlfA4eQeBCXenmDT2zZXhTuI21S23wD2xIUBrLQ1ZeKJTSPWm+lwNwOISW8A1sg9SmNfFdF8wUa2SVq0zj/C5WKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none 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=xVWQZE+4o8iPXX4oQJCGmFUozWe7b+A5MmAkTRU8UFM=; b=lN6+HzHoz0SzNhWx2BzgYXs3AA1YDgcjGf0gsgKQSNoyb7QQ/MEWmXKZf7BhpMEU1Aq+DVIxn8GGSD1197px8sKvEdW5BH7gIe9ofypb4j6ZxzUnA0OrmGZ3an9lMWJSKpe23NRtnngA2okpuwrroIRyGqz8b2f27lOcNl+INkhBjjb+cMcMErtLaBJQizHurERUGkw9mVYluVZrTXE+nktdaf5mlgQTpXENOdmH89H3EfjKMbZCwqjdII9muzUHXKLP55gV2N9dc2AOn3sP1DwWAdZBan9y4hJLG/Op1G8NBGj7rLetsCJizUi911jrFvi+2xh/cXngpIcYP+ak5Q== Received: from DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:431::21) by AS4PR10MB5548.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4ce::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Thu, 28 Mar 2024 07:54:18 +0000 Received: from DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM ([fe80::224:f99d:c979:4bf5]) by DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM ([fe80::224:f99d:c979:4bf5%4]) with mapi id 15.20.7409.031; Thu, 28 Mar 2024 07:54:18 +0000 From: "nicusor.huhulea@siemens.com" To: "isar-users@googlegroups.com" Subject: [isar-cip-core][PATCH] efibootguard-boot.py: update dtbs based on their deploydir subdir paths Thread-Topic: [isar-cip-core][PATCH] efibootguard-boot.py: update dtbs based on their deploydir subdir paths Thread-Index: AQHagOQA3mQQwUJlzkK2u0pIbr1OlA== Date: Thu, 28 Mar 2024 07:54:18 +0000 Message-ID: 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_Enabled=True;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SiteId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SetDate=2024-03-28T07:54:21.093Z;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Name=C1 - Restricted;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_ContentBits=0;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Method=Standard; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DB3PR10MB6908:EE_|AS4PR10MB5548:EE_ x-ms-office365-filtering-correlation-id: 8ba1c6fc-6866-4217-a29e-08dc4efc4585 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3391MqU+RoGK78XB8uISR+T7u9wCiQSuGOiRdkMtKsDC9rC1w9ChOJK9HK16BRy774gQk9LwClD0QjfWco6j7WtkUMsAHm6nD2s+rCFPsWAbxN52MKM6pfnsdEkZExJQ3FTLm3YSbtcy9B/R+dUrzc70QOEgHxFgiotTxmo2/SPqpd4jsXh+hCc57pBzuK8+HYas9fQ2b901Q2ZGRuQ3a39z5e22Ko1NJFAYw/F9ln2a8SekrepUOM+bkMdifiCeqxeGsAV8F9krcLirJsiLR9RHMhG/qgevj6BO1/+DrfEHxdDnG0rHTG9eA4R9PLs5Gs3GtI3HqppVg3r/Yh5RbMgz99icHQiR0gqQ8EK9C9WrayALTwCHcy4EZAWvjFY4AzcYvrSQ16czrtLx4VpiEjzrRSpIWorsbgGPs0wgDYVpc3Iwnc+7dOYMz/1RzDRUvkU3si3HJ9wr0VZ/ROti0kedXKxU3gkH4W+3VcTCPwxki5GbZ5B5Ge/4kTbOxBZleW6/6y7j4ub9rbF447rhkqjpTX2mVX7UAhSTFdPh37UnJ6+BBTDpMXHf2zSo7muXiIdcxBmMdpWIJIJr5BQK8J+9PWSUEBB+NuR/ELyHTIWRNdsEQ1Ycwg6nmj3SgP0XNgIjvg0eg/pMm8BumbKttNZBsdJbZTCn154z51GfcsKJ6nKilkU92zJnDI/sf1Qth78qVqTFtH+/uQBH5YiMKaIXuEXI433Lp1qLYMUOe40= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015)(38070700009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?fuUmMOAYbaGRYwnkCfTWniPNF0J9PWOyBoSIJRDQaBuaeUPi0z+bWl2EBd?= =?iso-8859-1?Q?pvqZSLr0YcQGwQUYdi/iRWL7cYNsJiaNYt0J03s9ACzeYrSob21p5IWz+2?= =?iso-8859-1?Q?AlL0FkWhYWApO8sR+OdoFm4vTUCSxGoSPmJcfQRfXSqJHMq+LpXsI6LXrX?= =?iso-8859-1?Q?Hf7N0bHPtkQ7zQex07XL0fgxcgDo59poS1uN5maPCazAwI8Nl9NSNQy2p9?= =?iso-8859-1?Q?dF+6CnATycfsloyLihIsJUWtWXT4GoncMxrUMmlLAwMJhkHdqxD8y3/uYk?= =?iso-8859-1?Q?E0MvKV33XvhKqbCNJ6DDXugpMHX7BwGaKp0Bm2Gjwdi7etJhewocdXmEdo?= =?iso-8859-1?Q?idAZJ9vj6362FPOqyAFW8Ea1HjZZ7nZOPXvLl2lYVUcH2WIQ64DndCnjzA?= =?iso-8859-1?Q?rpWAxzM8LcH5jF/WJ6MG6MeisVZATgto1ZYjmtBfiHM8rTsSXsHb6uJLH/?= =?iso-8859-1?Q?RRY5YOHC4psteZ+xbe9bsP0mdE8v9q+WQrqeQ2kvbzkdjMjUXABF+bv44G?= =?iso-8859-1?Q?Xy4vooSLJdj8TeR4TQ5QC3ZkvTy5aFdqCJJeaqWkM2SFlG1h3Q/Kxd/e+d?= =?iso-8859-1?Q?bVqgywKPjhOqgtE4+LEoWDCfquU1qMEjht0G7BHVD4oToxRFD+LweVOalD?= =?iso-8859-1?Q?rHU7PrxKmzAQV4Tg98e959GxPoGLHAl8KfM8kg8WDHfKzVFzvmboZSZ+6/?= =?iso-8859-1?Q?o8k2uRvi50iCyOen0bq5A6dMUdoYUWBrY+4kZ+5O2XjuQ1TXZ5TM0tZBMC?= =?iso-8859-1?Q?QAk03nXNFVajdpq+uYndRlKpArBzcSarembdv1UQ8SWilsftYdzNXNdwFy?= =?iso-8859-1?Q?jMyrFcAfJGTItvPAyd0ppxVuIyylCAovoZChUm0GxiP9OJCahNcpJwtXYe?= =?iso-8859-1?Q?GZyNe+KgYC6fKz+Ca4QCH1z/IJ27qN3RDsk/F5uOgJw/freQnAzYtAMv77?= =?iso-8859-1?Q?jICpSMG2rosl422JPCOnbbz5jfHPLK+yY3aihC+zEaKfbGy1ndg9PioPV4?= =?iso-8859-1?Q?CZq53YY6xtFpzKouYP+zXDbzJjCFj+j7RyM3gRY9OA/pBXrQRaXz9E5zLZ?= =?iso-8859-1?Q?mVKf/FLZau3emIWVWrp1YNk3v6Q/1FKMwJxrZET2X/UodKp7RQ245ps/+e?= =?iso-8859-1?Q?MJz5DVV5yCWDZxnnWlRz4h/wuSOBgB8e4ywaaliImC/AzAwvrVmXyvaFAi?= =?iso-8859-1?Q?uAZmH8aQV/X0RVkBtSKBipOyibypSiwTK3N2RBIy8ApdUxoKUMBZYQHxxO?= =?iso-8859-1?Q?a7dtNpDIP3J+Q0IEA0MYYl+f5QiY8v5shiPPISbzzmIek7EVE1FCQ8RFBW?= =?iso-8859-1?Q?ZdScT6z6a5hxp6VqU+E9QP6LmJwX6ivozQKRAPiI9zEjergQtqTxWZ2uXf?= =?iso-8859-1?Q?rxl4ah01HZPu6MUz4G9X2i3eh3PNFHVP56MNHs6wzvz9u2oy5plNgdi7hr?= =?iso-8859-1?Q?V3Zm5OjS+TZLKZsS2hXix6VfoGHaVX97QAorExvZoH1hbJGHNhj8kbkwaV?= =?iso-8859-1?Q?rY67FyQ8mESX2YdkiS0W9OpW2ZjiDd987SSJtiz+DCWZMgAnyXwW7yXdeU?= =?iso-8859-1?Q?VcvG4pnwT8Dbdr2l7JohP0UeU/tVkraIAfyJl+Jxf7jZCBmA2H/2c3l3VZ?= =?iso-8859-1?Q?DRpztEeKCqP8XUMjqsXbhbg5DHdgE4EhwN?= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 8ba1c6fc-6866-4217-a29e-08dc4efc4585 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Mar 2024 07:54:18.4660 (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: h8Pnm0hP3t17ldhdJX9UDwYywRWuWmdhMfz3wPNkIQbQleH9rTXXJQ/zmWyBU0DiavASjnXm6zYKCBv2DwmZxRpoC9NnQpIWmfO+I6yQOUo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5548 X-TUID: FZXTegm/qm+f This needs to be in sync with the isar image.bbclass changes where the dtbs= are placed in=0A= their corresponded image name subdirectories. =0A= =0A= =0A= Signed-off-by: Nicusor Huhulea =0A= =0A= diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/= lib/wic/plugins/source/efibootguard-boot.py=0A= index 4e3aefb..86e342c 100644=0A= --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py=0A= +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py=0A= @@ -181,6 +181,8 @@ class EfibootguardBootPlugin(SourcePlugin):=0A= deploy_dir, kernel_image, initrd_imag= e,=0A= dtb_files, source_params):=0A= rootfs_path =3D rootfs_dir.get('ROOTFS_DIR')=0A= + image_basename =3D get_bitbake_var("IMAGE_BASENAME")=0A= + machine =3D get_bitbake_var("MACHINE")=0A= efiarch =3D get_bitbake_var("EFI_ARCH")=0A= if not efiarch:=0A= msger.error("Bitbake variable 'EFI_ARCH' not set, exiting\n")= =0A= @@ -210,8 +212,10 @@ class EfibootguardBootPlugin(SourcePlugin):=0A= uefi_kernel_file=3Duefi_kernel_file)=0A= if dtb_files:=0A= for dtb in dtb_files:=0A= - cmd +=3D ' -d {deploy_dir}/{dtb_file}'.format(=0A= + cmd +=3D ' -d {deploy_dir}/{image_basename}-{machine}.dtbs= /{dtb_file}'.format(=0A= deploy_dir=3Ddeploy_dir,=0A= + image_basename=3Dimage_basename,=0A= + machine=3Dmachine,=0A= dtb_file=3Dos.path.basename(dtb))=0A= exec_cmd(cmd, as_shell=3DTrue)=0A=