From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7198076072096694272 X-Received: by 2002:a5d:630f:0:b0:309:4ad6:b3ec with SMTP id i15-20020a5d630f000000b003094ad6b3ecmr4105755wru.0.1686139353144; Wed, 07 Jun 2023 05:02:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b03:b0:3f7:e4dd:c60d with SMTP id m3-20020a05600c3b0300b003f7e4ddc60dls28155wms.0.-pod-prod-09-eu; Wed, 07 Jun 2023 05:02:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71ZS7m6OGUiamItFZkjFBqE7WjgHc54o727rBR8vM7GLDgtYQGjoGSmMQDCwAkkR/72D3+ X-Received: by 2002:a1c:f60b:0:b0:3f7:effd:83e4 with SMTP id w11-20020a1cf60b000000b003f7effd83e4mr1809904wmc.38.1686139351441; Wed, 07 Jun 2023 05:02:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686139351; cv=pass; d=google.com; s=arc-20160816; b=Rc5MuAyjSXqEQdna9Jx7Jk5SI/G+z8AnEGM9IfUR6SH5Ik4DHPGBOM4stxYNxOEtbo Pf1l+CMlDhmUhxjIgLII3HStMKVkftKzABssQq6s2dhZx80I63v0gzQjO+eLiDROKl1+ F/yZRi3/iKDZrvYT/sCrzAqxX+jZNyu1sv/QpRKNxNDlo55co1nSodN4susjPbBbqgsd ORodKXX2MuOiUvmMIZjwyMdDQ/KIc50j0gevNRWOYXr1Yrn5NK6W+/RVePbgBi743oA8 7tbXbCMpz9GCDpTjxhto842SVcfzfF0Zkd+0xNydW5/gcum+B88LezDrboZrMwt6Wvpf HfWw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=4/AD6r1KM1NKjrgS1MWCTUt5YxAYoXo6zm3VDh64z1Q=; b=KQ9D/jXESTCBt8oP9/RJC7BLn+BNs38oeNNppBGxYN/SXwlEbFQN/BmHbWgBHforTN Uifgqhb9I1Qhx7Vgmi4YLqka79LKS1PRFJXZWfrnUmVFbwT0jUUwKIYX2p2B18X4h+Hn P5lVhnGsnxw0mqCUuvtg+E2CEyq0WTruTM8OtcGBrx0sEXf5h2RXtjLaK9DOLX2Xxy/g RvEc9e9ekoUir/DHxtEa6lZlpSWTHSIGOQVAELGWPVP6CUIpadK82kH1HWPBR46c9tre vMUy3Q+NO6moxYHpKwklExImyi0unWAq8EeZDn6sInI1lDMgnVgv0Br0uzqQ+IcY0+T3 f0Fg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="slMuC/e/"; 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 henning.schild@siemens.com designates 2a01:111:f400:fe0d::628 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0628.outbound.protection.outlook.com. [2a01:111:f400:fe0d::628]) by gmr-mx.google.com with ESMTPS id bu19-20020a056000079300b0030adcfaf029si1064542wrb.5.2023.06.07.05.02.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jun 2023 05:02:31 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::628 as permitted sender) client-ip=2a01:111:f400:fe0d::628; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="slMuC/e/"; 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 henning.schild@siemens.com designates 2a01:111:f400:fe0d::628 as permitted sender) smtp.mailfrom=henning.schild@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=X+N4Rmd07Oweqa2KAgpcbFnhauBWsFeYYL2oC1fWnYHapIA9ft9tCLJaIxr2v3IDf0eI9m7f95gCAycUnwEk3OqEGP5TZtYIQ+9j5XXKk6I7sqOnCe4UzvVYrKx23VEWnbItojTgnavhdJu0XPhqt8xBK8+A5rOlXRX5jFclCvMrkixhWX3vcv9CYnl5zm5J8YO7BZw4x9RS+KgW7TeCf9oCrtoe05uxBPVDEDmnMBbPQ/MD+y0MUx/hmW8gcScx9WR7K1pSUeqa0n926nXL7y4aJ73QanSK8Zh666XtdQA2p47d68Py14iCHoW8otSY+Kc1QkbHVM+7LbaIZJVzsQ== 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=4/AD6r1KM1NKjrgS1MWCTUt5YxAYoXo6zm3VDh64z1Q=; b=Wl9IUVxLQ/1i2qCjfyvjo11MAJ0GQO2EzdAtG0LAjOfXromNcdERxs6D1T+COqOSMtVwPaZs5W9ysy59gi6tQ1OUyJWdsLOyeVAmVHPZUzWlhabmYNkvDoAPeU54Qq0n/euBZvbaxpP/Qc7Z9TU2lCPNssgEBh3ozvrj0He23+fZml80JSXq8oka+Pj5UHKPfZiQ3TK/K7XZONRX1Gvesm+qV5eI70Pq4P6+MAVMWDc/gM4J0BmU+uCkV7kfpcRPCipHB+LNIuAJ3jqjdCYw+dSbtznPhLse4/Nd702wveTveDvcrLB3MreHtp63uEh/F0jU/310fX2YBIbeS+GCAQ== 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=4/AD6r1KM1NKjrgS1MWCTUt5YxAYoXo6zm3VDh64z1Q=; b=slMuC/e/gfACbpu/k8huLVtnOFXjiM7i1DgwtZLsUK9yXFhlXjj/ruA8upIR0QYZ9jk3BCXFnTuyzp75v8cpjJ14O5vqXrhmUzkz57IXZmXdkL/d5Lx4knevd+s7+MrsxOmLeDXHNXtJrB4zdq0NruBD3tTlo5iLnXhtehYGTEhpuyPZfpfWUqV3iUeN3XpNSCLqm5e1Ktb3VbgT+SAD0vdYCTD01/y3eppYQFjjXPTmdIi7B3MlWhrprNayuxCpt4tEVvE8/0/pYFBq6xAlvhYrR/B3PIfCnWPK6xy0MwK6qD9Vj/07L2eTXcc7zoXuq1KTOsLNCllyeoRXpsbPrQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AS4PR10MB5341.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4b9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.19; Wed, 7 Jun 2023 12:02:30 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::a171:a3f2:99b7:5f29]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::a171:a3f2:99b7:5f29%6]) with mapi id 15.20.6455.030; Wed, 7 Jun 2023 12:02:30 +0000 Date: Wed, 7 Jun 2023 14:02:23 +0200 From: Henning Schild To: Felix Moessbauer Cc: isar-users@googlegroups.com, Adriaan Schmidt , clara.kowalsky@siemens.com Subject: Re: [PATCH v3 1/1] replace custom OVA logic with imagetype logic Message-ID: <20230607140223.5d375f2c@md1za8fc.ad001.siemens.net> In-Reply-To: <20230210084044.714348-1-felix.moessbauer@siemens.com> References: <20230210084044.714348-1-felix.moessbauer@siemens.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR02CA0010.namprd02.prod.outlook.com (2603:10b6:610:4e::20) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|AS4PR10MB5341:EE_ X-MS-Office365-Filtering-Correlation-Id: 05f45e7c-ffa9-4ddb-a6ef-08db674f11a5 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: co/L+dZMywTkyppWY5C6Z8QQAjHPTnUPRSUO2gYKpdPLKO4S8MAGl74VZlyrifomyaDkvI4+zEC91yhSwii1+U/9lH2X6bhfqtmfoMBUo3NRVhd5NQ2L7fV/Yc9q2d+HtpOGFX1mXISfLl/b4Cs4F1AFQC9aGYnDOsW9hBvNzNEQs4Qa2dC0C9nt1rsERhFP9HCpw+uHwBHr3TGujk7vzEp4Kq2GMj8oFdT74mQjXrzGjnjSTzC9JUN+3Mvb8858AfyHB/qCg1bUNkClMIfjz/kui/d+ESUtCue+UJYsVCdStRFRxyGzlHIlQ9eY1R6XRG6gpOOAeELmfzIfgRHv4HtOk6KB+4aOLu1LjWF/3QHzX0HI3OQWXTnvZPVpL77I8aRwh9uXiDw4AUaJPQoQqTbw3LVaSvcD0pg8FpMI0lpCuUn+72D7XPJ1zpBkDPBrh8z4BFqrOpYLeup8of+65BRkQ+KkDg/t+O6OoEkGeWL9Y3uPvWhgRVrrV5CXrfsRyARDtajtB7ZcEowy1GDNeVLY5D458QAMXOfIInMcsBf+7VupaE3uOU/6au3MAY1D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199021)(1076003)(26005)(6512007)(107886003)(186003)(41300700001)(5660300002)(6506007)(9686003)(44832011)(6636002)(316002)(4326008)(66556008)(6666004)(66946007)(66476007)(6862004)(8676002)(8936002)(83380400001)(478600001)(86362001)(2906002)(82960400001)(6486002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ps8Zjp9vE5h5t+63ean4y3q51DR4HP/bnsArB9gKX+s/rTBkVFsNTDpx8/Y2?= =?us-ascii?Q?aBL3Qn3JIDCbQNI5DS1aF3UqGYwZMCb7iqLO2aFRkbfpnq4Jy3BIDvDcL9AF?= =?us-ascii?Q?IlMR53SETJkJk7ttdGsWscoV2iGmGUuHpKd3PKdLDVT9tb3Nxvj4SOke45lz?= =?us-ascii?Q?NeeMUcf5xb8pm//Go548/93h56At16kdeLeW7Q1zCXW+peBCRmcGwQnvQ1f5?= =?us-ascii?Q?D3A9sNY4Y2V2RFyi63ymF4XVKysrK6RuKjYdnE4q8K4R3BfIybrQ4LDEe05s?= =?us-ascii?Q?NqwPuZHqmmJdV+MaDndPTCslDSgMLfeXU6V/HolN3vEmpImonGttt3UkUKst?= =?us-ascii?Q?ARWehaRir9EY5e1vZML5v6rpowSytm93BDlbW1/nTKuiik/HxuqHPYqP2AhP?= =?us-ascii?Q?GTXiSBhybpisKXy8W1fLN/VBHqUtZaX5DSY94OCoWBQajd147kQ7XevXJ2SM?= =?us-ascii?Q?SgaF4ZKe7ITyXe5FCcTedaUrCQVLxiUHEfbp+kulyXMSkpPwNfnnJ5e7IwAY?= =?us-ascii?Q?yIKqmv9Nw9O3avHb8yDVAYtVQLhfytnY9FB4orCor+D1R9s/yoKq+ZypMtbe?= =?us-ascii?Q?iijNbQJLSxpOPAVs73uCyZJ1osXCCKpImkXyCPhxVg1/z+wOKbo5dMQgruxN?= =?us-ascii?Q?B1UIjYRl3vtG9lnChTw4i1pCzazFtaXW+3o5G0G30oHKVqZ0drga57keQShF?= =?us-ascii?Q?1cDiJz7YslWUn4AQNdC8SWoxBhkUG6KNp1AzCMmBvzfj+6cp/Vc+9R44tA1A?= =?us-ascii?Q?9GpN9dZ2FFgyE//gqPoaPVbP/lTqH0TsSq4sOynJgoBotUQJj48qUWHeFWO1?= =?us-ascii?Q?E1HxPUlUIakj7XY/oYf+lnR17gQy0mV6Xl88lt6aNnTMGmrVxOy/BmHMHLIC?= =?us-ascii?Q?2W/4E1qkp9zke5wSMo4Td1U1ru30JSsgLhJL5IgobRMh5Rbzdd7RMau5Dqp8?= =?us-ascii?Q?ZYLubJRwVXXH3wBDr+xmWGi3VFHdinJ9knX3n/5DLo3Z9JMIZZvE4fZmg3kA?= =?us-ascii?Q?EjM74xqO7df/7++ZAO4Qvuf/Xz3nj/tEJCL6grqc6K5PHQUV4wvkF6yX+u8c?= =?us-ascii?Q?1KvuX1VRX0SsU/RKsKoeBV5jvFG/93hZzYYt2dLQmFzjVHnZfxIud8ORSABB?= =?us-ascii?Q?MVsC2kexdT2c6HyuCNuOyJfhDtcF3+zhwX0p6ERMYC7YK0EiQIfS7SOj5zDY?= =?us-ascii?Q?jSvvpCg8E2xjsUSQ6v8gAhinJqcZxX1GkECqFPQeeU2Pb7sLXpWXInpO/rqT?= =?us-ascii?Q?hEBx9UPgXY+anHxS7tMQy9aVT4qn0bHKd4NQqkIfAZ9chHw4/a62ihdcdUmK?= =?us-ascii?Q?A5/jNrC+6ORTCog6bpMIJ49xzx7r55nOBQ74s9cEwDJvhxqJMqQF/vKHzTPC?= =?us-ascii?Q?9zd2nyj01/x1op8/odtWp1TCqL9lWNXt2Gf4MQ+dcKkW4/F2Rgh+SqDJFAsg?= =?us-ascii?Q?R/XaUmlw9Bom2WbJSIc7SCHbbFtR9iJGbT9jC5mQyzykB+P84dKhAX0icxGa?= =?us-ascii?Q?TAArY11y6CGzTVEN/4KiX8DGJ0Qqzssndn9nTY6y4pTlbFKPcp5gU2wsgbCG?= =?us-ascii?Q?EA84PHaI5bQbzvVnnC3PtpLI26GwruvGFRDNlppgyWZyjsa5pfKYVGPfO7dq?= =?us-ascii?Q?BQ=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05f45e7c-ffa9-4ddb-a6ef-08db674f11a5 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 12:02:30.2127 (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: 7ClE3ylgA0ncxb5Vppd6uMcd9jS7z+synhd4sOziuh2OVob/HN3IaYaaktoWK0tQo75jy0V1qI4/M00raisdu7xVckusMlla54lSb/ddTgY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5341 X-TUID: qeVS3rFBq64v Am Fri, 10 Feb 2023 08:40:44 +0000 schrieb Felix Moessbauer : > 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. > > Acked-by: Adriaan Schmidt > Signed-off-by: Felix Moessbauer > --- > Changes since v2: > > - removed API-CHANGELOG-ENTRY as recommended by reviewer > > Changes since v1: > > - append with += to IMAGER_INSTALL:ova > > Note: > > The following pattern does NOT work: IMAGER_INSTALL:append:ova. > The reason is that we unconditionally append to the variable in > the machine config. This pattern is known as not supported. > > Felix > > .../images/virtualbox}/vm-img-virtualbox.ovf.tmpl | 0 > .../recipes-core/images/vmware}/vm-img-vmware.ovf.tmpl | 0 > meta/classes/imagetypes_vm.bbclass | 9 Why that rename actually? This is an API change for downstream layers who do not overwrite OVF_TEMPLATE_FILE but only have meta not meta-isar. I think it should be moved back to meta so other projects do not have to include meta-isar as a layer. Henning > +++------ 3 files changed, 3 insertions(+), 6 deletions(-) > rename {meta/classes/vm-img => > meta-isar/recipes-core/images/virtualbox}/vm-img-virtualbox.ovf.tmpl > (100%) rename {meta/classes/vm-img => > meta-isar/recipes-core/images/vmware}/vm-img-vmware.ovf.tmpl (100%) > > 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/recipes-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..41f2af06 100644 > --- a/meta/classes/imagetypes_vm.bbclass +++ > b/meta/classes/imagetypes_vm.bbclass @@ -6,11 +6,8 @@ > inherit buildchroot > > -USING_OVA = "${@bb.utils.contains('IMAGE_BASETYPES', 'ova', '1', > '0', d)}" - > -FILESEXTRAPATHS:prepend := "${LAYERDIR_core}/classes/vm-img:" > OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" > -SRC_URI += "${@'file://${OVF_TEMPLATE_FILE}' if > d.getVar('USING_OVA') == '1' else ''}" +IMAGE_SRC_URI:ova = > "file://${OVF_TEMPLATE_FILE}" > IMAGE_TYPEDEP:ova = "wic" > IMAGER_INSTALL:ova += "qemu-utils gawk uuid-runtime" > @@ -67,8 +64,8 @@ OVA_VARS = "OVA_NAME OVA_MEMORY OVA_NUMBER_OF_CPU > OVA_VRAM \ OVA_FIRMWARE OVA_ACPI OVA_3D_ACCEL \ > OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE" > > -TEMPLATE_FILES += "${@'${OVF_TEMPLATE_FILE}' if > d.getVar('USING_OVA') == '1' else ''}" -TEMPLATE_VARS += "${OVA_VARS}" > +IMAGE_TEMPLATE_FILES:ova = "${OVF_TEMPLATE_FILE}" > +IMAGE_TEMPLATE_VARS:ova = "${OVA_VARS}" > > do_image_ova[prefuncs] += "convert_wic" > IMAGE_CMD:ova() {