From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7198076072096694272 X-Received: by 2002:a2e:4619:0:b0:293:2ed8:60ef with SMTP id t25-20020a2e4619000000b002932ed860efmr1190116lja.165.1676017831815; Fri, 10 Feb 2023 00:30:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:19a9:b0:290:6183:37b4 with SMTP id bx41-20020a05651c19a900b00290618337b4ls771327ljb.0.-pod-prod-gmail; Fri, 10 Feb 2023 00:30:30 -0800 (PST) X-Google-Smtp-Source: AK7set8tWR5HKoMFbXORWpr+dM3hvrGdfuHMuy94IYISLvbLjzx+Vk0MRn2h4WQb2fgw7OdnRJkr X-Received: by 2002:a2e:a584:0:b0:28b:e337:7c0c with SMTP id m4-20020a2ea584000000b0028be3377c0cmr5997253ljp.43.1676017829982; Fri, 10 Feb 2023 00:30:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676017829; cv=pass; d=google.com; s=arc-20160816; b=k++49UOvxUG1V4h3/9vKNtKr8zOJJXuJsqR4oyANVSs2kLc4zvMWlpc/611rCytpbD ZlvuCK2abhq9F+buFuyClrse4io2LLTxRrDxxWiQkmcx2m9I4tFFQmxuSxzohOnjpalf X6I/z+7nzo/tpYu3cH4xi7FMTvrPXWwThTY39iAhSuBSCu6V8pBh/c3tflj7iDqzzjav NgFir7UEHGq4RQnzGKhBW0GhsiDCzfrPG/zUxrREnMjnfmbksGtsvLRxlxs1u4ID1PG+ j05z/C0KaaAIx9vo7KVqtqpUzct/BJP6eOgTC9kZnE+yy7I0lw4d3FCpmT9hWs9nJZXO ie4Q== 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:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=htWG7GtTIE2NPAEuKNZBSF4bSHdbcrvj308rcny0ugg=; b=nN9IOY4BzwLX9WyB5jdcb8pD8kTl+i8JKq0/BnldF5vOUQBdZ9g6vr8vrxHIE9W8gn zHtG9ld3LnhNPltlDQiMnLwiM3JP6NkVWNzk6pXOQkbYVWxeosr632s/64m37lXoWUgZ kPkr5oJ8sljNG7/Go6TM2P3KUUDnRltmOWsqr8Hb9QRLoDB6022MKiebEZJNNPC3JujF jDyclobSnH+k9XYjWZwjthQJLFlJc3qLpSh8750GHGvF8GNQ27BafgHlOtMX5wsx7Ywo v4q7B2RbWrY65Pn3/F1AwG91YNdO2qz4ue2Gzr8Sw5ZaJOz2/vS4QY5aDHLGPDEKTUuw 0rLw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=a94GQQq9; 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 adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::606 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20606.outbound.protection.outlook.com. [2a01:111:f400:fe1a::606]) by gmr-mx.google.com with ESMTPS id z7-20020a2ebe07000000b002905672e241si183691ljq.5.2023.02.10.00.30.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2023 00:30:29 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::606 as permitted sender) client-ip=2a01:111:f400:fe1a::606; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=a94GQQq9; 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 adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::606 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iOdLKBu/1H32v+biL/utaue2K9haeUkzNGGQ5A2UnxtuDr9kMiTu8Fy8nt4aMUxi+tCk+Cx6wH6T26NONhZL1KBU4o5Rjl6nfp9StWPZWoXKbXGYCyd3npAXKA90CPuYJzKOc5INsjslx23sHMm15BwscYfiY0s4Jbv2UDDSZ5G3LG4jiU70HUN5JNF0E13z88k8uFKnTb7/eLEGbGmVkLYsbHv7IDqzAWoBKX+Ik++eC0x+wYwO/1mzoKyaeBiNiG+YFp03UWBjHsz1qJbqM51EzBApVLZDZlnvimTLQDnVbj/T04mPerW+UhRNdlO6Wl38DzQnMiGJnRFbJh6JzA== 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=htWG7GtTIE2NPAEuKNZBSF4bSHdbcrvj308rcny0ugg=; b=dt6sQlYXWUy7Ck1eKVgsvAvVKZAiLdQPYbkNFPeQfS9wEXp4p501GTbsDqPYNZn0IhPbO6S/dsihCM8as/Jw+uyD14Id2HtnZKbFoD0eKrx4oYb4FMQV0QDCCRk07xSGdHpXT9dBLDNoZcVH6KbiCZUbcRcfwQKXcj2eixxD5bziItMOROSEw99OEhVY8iNbXTMiF8SLvyS9r9/t/jEObpf4MLmpd6eqFdB8IAb1dazOaaVoRo+NitLbcarCGEnbz6kkQGycgbFPU9x1a9BdXAwst0I9PQ4ytp55rO91y407Y0jsaD2tHAJ2kYS/0+htk0HzjJCOKUTOtni7u9qSeA== 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=htWG7GtTIE2NPAEuKNZBSF4bSHdbcrvj308rcny0ugg=; b=a94GQQq92rOonlTl5akd8aHWvh12nvQcm6f7k5MgNQo1L3XN2lwKhukayPK+0OzILUlxqdP3nljHQvG57YgACIBr+KRaevHNKOhTpgrywTIu4hZEI8vi/s+BZf02XQISqA0KUENH0KqRbaVC+UYNOSnbO/ohmApnGgP8HzzngQBAGKzCPIlQ/tosn+bZVZwba6Xsuvv8Tq/DqHqVBQbZcdvY5D3W0YXibDWxzR7cIFL2J/dQQPSjj2pjg2hkQbB2GnzMLgUmAuOmFlCdf6RvbSiICTMvCE30xI1FhUcvdQxeH/IYwSCPMv0Uymv5PM93hp9A+5e6x51y+zjES2JH8w== Received: from AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4b8::15) by DB9PR10MB7266.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:461::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.21; Fri, 10 Feb 2023 08:30:28 +0000 Received: from AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM ([fe80::ca8e:2edc:4314:adca]) by AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM ([fe80::ca8e:2edc:4314:adca%5]) with mapi id 15.20.6086.017; Fri, 10 Feb 2023 08:30:28 +0000 From: "Schmidt, Adriaan" To: "MOESSBAUER, FELIX JONATHAN" , "isar-users@googlegroups.com" CC: "Schild, Henning" Subject: RE: [PATCH 1/1] replace custom OVA logic with imagetype logic Thread-Topic: [PATCH 1/1] replace custom OVA logic with imagetype logic Thread-Index: AQHZPGOvXN7RBX6XIkCHwVk7OHQl7K7HyNcw Date: Fri, 10 Feb 2023 08:30:27 +0000 Message-ID: References: <20230209085042.420572-1-felix.moessbauer@siemens.com> In-Reply-To: <20230209085042.420572-1-felix.moessbauer@siemens.com> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_ActionId=ae5ff7b9-aee3-4685-81f3-3fe32e5266ab;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=2023-02-10T07:25:11Z;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SiteId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; 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: AS4PR10MB5318:EE_|DB9PR10MB7266:EE_ x-ms-office365-filtering-correlation-id: eace722b-61f5-47c8-6bc3-08db0b41107b x-ld-processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: tp6AyAAYxmrP/CfYuFYNHiFvKRALthHQpjYA4mLOwSnn55XCVFLhpCQwIay5fcDwAY5386/lba+cjc7VqQYW6aH0JN8JZJ63fIhzH6X94daOjfZPlK81LsKetNtTzPGiL6Y5+KSXuEVbnZVCiGlPmkpVnAgOr5k25HFlZtrU1qcyb0vbcuWaYdTJyV+I00L05zC/emgoZB/qwYgOg5rvtmS5yUyyMfqDwyXiQa4qZWDjHZW427kPR4uRk8XqOHHAZ7ZJk2WLL7AA05sSaf7M66q1BYtB1QDOWq0ddZ7NPYbk0yDI9pMf9s0twu1aY6ZjNDTO3KceV6SX5NzrsS4vkRFo5sDEqU2hRG+vq9KVLk/yAywr6K+icTbmRrZ2vM/hZM7UTyorrniV3bgE2cFy33f839Wg8Qt8R2Z/3wwXCpRgJgnlmntdmXAG+SgbFG7NPc6MnuCE8U9EwkmzUrvTEC18mo5CYDROmsvJ6SxgkV7PV53BTlJxw/Da5KnfLdBIsdidBgeStNRZge8Hr7eOroOY8laD3UW+LoGjbuSkK65sqL+r3zsBD49yfA69wzZx0gEAmd3oE+6iVzZcBlE5LxZkA0JWknLVEOfUBeyWZkXp8gE1tbDgTsw4QdGtJI58BwPqUjiApcYoR6ynorwdgFMwJggYXdj7zfwb9n2SsDfv+ckMZoiu+kh1WQHEOT1QqGZ0Ln4T6BRD3g3K4f+6mJeajaE2ea3SCyDMje/zAqE= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230025)(4636009)(136003)(396003)(366004)(346002)(39860400002)(376002)(451199018)(86362001)(33656002)(82960400001)(38070700005)(38100700002)(122000001)(66476007)(66556008)(66946007)(66446008)(64756008)(52536014)(41300700001)(110136005)(316002)(8676002)(4326008)(76116006)(8936002)(5660300002)(55016003)(2906002)(83380400001)(478600001)(107886003)(71200400001)(7696005)(186003)(9686003)(26005)(6506007)(403724002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?lOJ7sv+O5EFTjT6efNUqS/7t2WOZoIJHSW7B4t9uwBBNm5NZa7Wlvl510p/1?= =?us-ascii?Q?z5BTzxx37cWX42xSG2jCVvFcd1UCeoVY4tjWILxOjxxbR58pXgKj4XeqV5DF?= =?us-ascii?Q?WoHKkRxGE55ENKnPmEyJBMX/iwUcWmRJz6sCuXu4ZrZdtrWmQyG9PLTNMdC4?= =?us-ascii?Q?tDoXvBDt58al7IHkW3jziofbBsN1cOnIEFwWuGXFKP1ggZ7aiP1KsNsFrAyr?= =?us-ascii?Q?7sjbypRPKNLbH1RHmwiscmDzx8XEYzNRqtM3ZeBGg+VCffFkkWaq370X5awh?= =?us-ascii?Q?rQtpMLOnUELXKjTm8o5p7Mucn0sC9Q1S108OY1JCBX1a9eK6mKb8QVxrFVyo?= =?us-ascii?Q?OXSkOJ3UFBhi6C8dqAOTvo9hbsWNKVv8l9u0ROAPRtoF9Ucs2TkDIq9CGEfn?= =?us-ascii?Q?Y3svGfueTDgDZxwlVOYakfCNDM5ybi6BJi9IsAkJiyeezTW8z5jClPxoO9/m?= =?us-ascii?Q?UJFKYHr6sH5gnzdvSVzIOS2d7Zh/4QwwvpMVClTiIziVW0ozhCq2h+Fs7+BW?= =?us-ascii?Q?l8ubATQkI8UT5Y2r7RAjlslamfmPOUczjyEvYPqDbCkdtbwHFsAoBlHHhXf3?= =?us-ascii?Q?dY2VqDSRLHzYJfyqUg2lnze+rxENFLpxNfMg2zTRWFrXI2IaDYFCr/mIZVK+?= =?us-ascii?Q?WeNm/woyKD+VCBWt1YpIi6kTZtm7RS2I2NpbNS4nQoeEi5pvyQHemnzDz98e?= =?us-ascii?Q?GdrsbYPxJLOQk6v2IGHgZpCZwKp6RCF3oyiX5c2aof9VxjZioGwFcF8lBtlt?= =?us-ascii?Q?f4pU2Ms2sEH+le5P2MGVye+DGOOuwm0K8b5KFd7NL21b7MAj0ZkjVCJ45Ks7?= =?us-ascii?Q?ZKvU9ofDpzxlLF48FPU14V27rzlgUeF4JxzjXXo4IerPZ1XbBIplcQdNwQWX?= =?us-ascii?Q?I8DXMlAOvycXNKKeGmc+/CgizuRQG1aRoA7hUTSr17oD3m8eOJ9zMzuDxdQL?= =?us-ascii?Q?hlloNZG+zNP2nlTTWObgh7aqpBAzzDV6xFpHAOyMKH5T4QpyklDyTzBL0cn0?= =?us-ascii?Q?TBGvvzRHXd9V7CH0jGWNdJ1VaJmC1QfgQ0N+ar26ptzxYBY+C9jUmMZp4/zx?= =?us-ascii?Q?YvFFkEE5J2Ea/x51euxQZbSVyMzP3JjCmfJfQlD3sVPKPy9YZi1rsgmljwVF?= =?us-ascii?Q?OUrZssnXAbTkDfO00dU1HTzoUhvgBOS3d7dTGgildyKqursNPEY1CYnfTJmE?= =?us-ascii?Q?Jme2yL4JmrcOPwcqNqDle72VP+tyRXdQJK+xUcWY3znwdt/hYiH15sHU8SI5?= =?us-ascii?Q?741r2viliy89FGB53tWCNWIm2o2yDlxiohT2dY9dyAch0em2yscj8XpiPmei?= =?us-ascii?Q?Y4sVJ2nI7Ee40NEFCdcBvEfXvsuPpPvbJQh/X/RTKCdij7nb8P7o47/mJLDl?= =?us-ascii?Q?OFLMaoRqfUGHn2m6H0hWjX7QpNc59dIEnderTcdQ/Fpe/WBCp0vjInSlgiBY?= =?us-ascii?Q?2XoQtPS/Q1SA83wUrB2IMuPgfy82rVyyWjF85Z5BtbQFGSaa9yNRW3xKbJJu?= =?us-ascii?Q?QDCUT4RANRn0+efDMlLlU8G9P2LJK7ulnws4TrtWwfS81orCMBd4IZVAVgyy?= =?us-ascii?Q?PAqlCCYycPiiaIYrbQ3XAoCjTNh9JRwR4XgQdQMQ6V+wkkssZWwf6qkUf5jL?= =?us-ascii?Q?Cg=3D=3D?= 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: AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: eace722b-61f5-47c8-6bc3-08db0b41107b X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Feb 2023 08:30:28.0204 (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: Wa+8uaTM7BxHiUXFQb8HikIiTOtboslYrWv9idQtFEeD1H2FtjN6QT9oqO/cOnfaHvnMhT/ImZscarSE+Pad4/+vTyGiEPRnLBwJSlpO664= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB7266 X-TUID: E7JN5AH4rKgd Hi Felix, nice cleanup! I had to look up IMAGE_TEMPLATE_* and IMAGE_SRC_URI... somehow I missed/for= got that we had that infrastructure. In this case I would leave out the API-CHANGELOG entry. OVF_TEMPLATE_FILE w= as never introduced there (and is not in the manual), so I think that entry wo= uld just cause confusion. Also IMO you're not really changing, but rather fixing, an API here. Adriaan Moessbauer, Felix (T CED INW-CN) , Donnerstag= , 9. Februar 2023 09:51 > This patch refactors the imagetypes_vm class for virtualbox and vmware > images. The existing manual implementation does not work anymore when > referencing ova config files across layers. Instead, we now use the > imagetypes logic, which avoids the problematic changes of > FILESEXTRAPATHS and SRC_URI. >=20 > Signed-off-by: Felix Moessbauer > --- > RECIPE-API-CHANGELOG.md | 10 ++++++++++ > .../images/virtualbox}/vm-img-virtualbox.ovf.tmpl | 0 > .../images/vmware}/vm-img-vmware.ovf.tmpl | 0 > meta/classes/imagetypes_vm.bbclass | 11 ++++------- > 4 files changed, 14 insertions(+), 7 deletions(-) > rename {meta/classes/vm-img =3D> meta-isar/recipes-core/images/virtualbo= x}/vm- > img-virtualbox.ovf.tmpl (100%) > rename {meta/classes/vm-img =3D> meta-isar/recipes-core/images/vmware}/v= m-img- > vmware.ovf.tmpl (100%) >=20 > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > index e48c98c7..b66a4441 100644 > --- a/RECIPE-API-CHANGELOG.md > +++ b/RECIPE-API-CHANGELOG.md > @@ -476,3 +476,13 @@ Bitbake 2.0 for better performance. It also requires > isar-sstate script to be > migrated to zstd. > Mixing old Gzip-based and new ZStandatd-based sstate cache is not > recommended > and should be avoid for correct compatibility. > + > +### VM Image > + > +As a result of the Bitbake 2.0 migration, the vm image type has to be > reworked: > +Previously, a path to the `OVF_TEMPLATE_FILE` had to be somehow injected= so > +that the description file was located. This is now replaced by the image= type > +logic. By that, the `OVF_TEMPLATE_FILE` needs to be located in a directo= ry > +named according to the machine, next to the image file. If this is not > possible > +(e.g. in cross-layer scenarios), add the location to the FILESEXTRAPATHS= of > the > +corresponding machine.conf. > diff --git a/meta/classes/vm-img/vm-img-virtualbox.ovf.tmpl b/meta- > isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl > similarity index 100% > rename from meta/classes/vm-img/vm-img-virtualbox.ovf.tmpl > rename to meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.= tmpl > diff --git a/meta/classes/vm-img/vm-img-vmware.ovf.tmpl b/meta-isar/recip= es- > core/images/vmware/vm-img-vmware.ovf.tmpl > similarity index 100% > rename from meta/classes/vm-img/vm-img-vmware.ovf.tmpl > rename to meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl > diff --git a/meta/classes/imagetypes_vm.bbclass > b/meta/classes/imagetypes_vm.bbclass > index 81ef866f..c52c96e5 100644 > --- a/meta/classes/imagetypes_vm.bbclass > +++ b/meta/classes/imagetypes_vm.bbclass > @@ -6,14 +6,11 @@ >=20 > inherit buildchroot >=20 > -USING_OVA =3D "${@bb.utils.contains('IMAGE_BASETYPES', 'ova', '1', '0', = d)}" > - > -FILESEXTRAPATHS:prepend :=3D "${LAYERDIR_core}/classes/vm-img:" > OVF_TEMPLATE_FILE ?=3D "vm-img-virtualbox.ovf.tmpl" > -SRC_URI +=3D "${@'file://${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') = =3D=3D '1' > else ''}" > +IMAGE_SRC_URI:ova =3D "file://${OVF_TEMPLATE_FILE}" >=20 > IMAGE_TYPEDEP:ova =3D "wic" > -IMAGER_INSTALL:ova +=3D "qemu-utils gawk uuid-runtime" > +IMAGER_INSTALL:append:ova =3D " qemu-utils gawk uuid-runtime" >=20 > # virtual machine disk settings > SOURCE_IMAGE_FILE ?=3D "${IMAGE_FULLNAME}.wic" > @@ -67,8 +64,8 @@ OVA_VARS =3D "OVA_NAME OVA_MEMORY OVA_NUMBER_OF_CPU OVA= _VRAM > \ > OVA_FIRMWARE OVA_ACPI OVA_3D_ACCEL \ > OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE" >=20 > -TEMPLATE_FILES +=3D "${@'${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') = =3D=3D '1' > else ''}" > -TEMPLATE_VARS +=3D "${OVA_VARS}" > +IMAGE_TEMPLATE_FILES:ova =3D "${OVF_TEMPLATE_FILE}" > +IMAGE_TEMPLATE_VARS:ova =3D "${OVA_VARS}" >=20 > do_image_ova[prefuncs] +=3D "convert_wic" > IMAGE_CMD:ova() { > -- > 2.34.1