From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7198076072096694272 X-Received: by 2002:ac2:5dc9:0:b0:4d4:fcdb:6376 with SMTP id x9-20020ac25dc9000000b004d4fcdb6376mr3277776lfq.218.1676021373958; Fri, 10 Feb 2023 01:29:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3201:0:b0:290:51e7:45ed with SMTP id y1-20020a2e3201000000b0029051e745edls790704ljy.8.-pod-prod-gmail; Fri, 10 Feb 2023 01:29:32 -0800 (PST) X-Google-Smtp-Source: AK7set+z+5wNG1Oax1A2gzthgTK9XrLMzjChjC4V9hzZHSkJG18FeAcRvBzg+Pl0FEv+EResrRDX X-Received: by 2002:a05:651c:1a21:b0:290:4fad:39ad with SMTP id by33-20020a05651c1a2100b002904fad39admr5189979ljb.40.1676021372373; Fri, 10 Feb 2023 01:29:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676021372; cv=pass; d=google.com; s=arc-20160816; b=GJU6VUgliHPgAMNmwByNfpBz4pVNcZC29BJKu8pTQcC/HMKxBYwLpCXVCaHSuyNqzE vZUtOZo8OSEZd51qsLuycfWeiYRWjyZJv0J0MQdQOY4c16nTFpdr8Ywl/SVRVS+i1YTs i6+uuQmZAyNvja37B4FCGUWbVLYwWe8MMgKu2sEDP5wlK9mPYylsgzYxKAlkkN/aHJHv ZbTWPIrmapBiCWV9QIomR8e5wsXHvj03vKS1SgZflJlLi5Eh6Z+Lyvmwten0Hxngl6Mu 2reaJDcCRKXHdNDBm9bFl1XO5fLpU/cq+cZOw+YLXoM98P4DO7EhAtZtyX5gb8RGvIIp INPg== 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=u7PczwD1JiAU3fGaBNs8DO31rvhtFh0POiyZAUDVEWw=; b=IFCmc8ozaXNJHgxV6r2r5jzTlxpsKO4zTJW2vYZ2qiRXihnCW7gDiTefvZDTfGnMxh 77bLMCy5O/7gEqFa4iNqbPA0XJMjPIbkvg93BbJHJQzw9RImAqgaQRpvPjEQTLyxEkE3 5j0bsuPKMjv6FXTp4xioyeSFDTHHSutk9qWfIt3l7pDO8bwJY8jzh1tUQ8E541mwlTx7 TsuM89Zak5a+0/qgKpOK6dwP0GRjKR96RFCpNj2+fIsXcQwjRYALdAhBt3b0Yb8s3Qsq Y/Wb9gC9NHgANqDIRuG/DgkTJ/lc34m17vsHNxnPBR3DrRhx7mzynL92vCHInjmLhXML 3GXA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LjEnZHf3; 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:fe16::626 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on20626.outbound.protection.outlook.com. [2a01:111:f400:fe16::626]) by gmr-mx.google.com with ESMTPS id z7-20020a2ebe07000000b002905672e241si188695ljq.5.2023.02.10.01.29.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2023 01:29:32 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe16::626 as permitted sender) client-ip=2a01:111:f400:fe16::626; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LjEnZHf3; 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:fe16::626 as permitted sender) smtp.mailfrom=henning.schild@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=nNSFC9NJyLETF9VrxbJl1I0HDf3xNwEFhhqK7si2XOW06mvIgY3bCREKOZ9jdWSTQMFyuvTGG+HantccTiKO01aoQN5gjTe/xgyC7VXJcl+mJPZImF9kLcvjL/Ho04i6po6sNiAu0oqAiMch9eSeNBBulOnyLKI6Bhh8wJ+gr1EVvWTNiR/eVZYuIb5GjfJaofv1d7LBBL3QioR2EvzopkI68J7HFT1buxWVSx98hky/eWaaQ7M14vBGmFIJ/Mj0aw8lDp1Bl1w5ux0/jPj5qkvarN7gQ1KReHZt32bPK3WdjDOuc5R/9xOg5HRC1uscJc4+9/38xbzbK4Oivv+MpQ== 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=u7PczwD1JiAU3fGaBNs8DO31rvhtFh0POiyZAUDVEWw=; b=Csb85x8NBX7XWdzZ7C4cOND1UOrQkAEYDlA85HcHF/er2l55h7NX4D41qTsUnXC2l4sSDSlFDF7zlNQt0lBJdiZ8RSB+HILAm1ZnkfrHXRsmdzh43azmDu4dVtrqwX6fbEwJHdvUk3BxMOOZS/SzK/vU9GCCg5yCHa4/tp/dAEfJDpXAg4finX9CudmGe1hFUyQgERJKSEcWkdbrUyMKxeH021/1T5m0j1CH4LsGk9dH67FDAWadBgurAgzlMLZBF/5X3/J3MEWjSLUY0wgdAAZEnSoeIxD7+F6uYat1k79LeuLE3wDtLcnZM99WEaHkVYsjaDpDjjniHqgmLlQ37w== 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=u7PczwD1JiAU3fGaBNs8DO31rvhtFh0POiyZAUDVEWw=; b=LjEnZHf3y4a/pGlyavRglTXd1ptyCQXHEQT7F/IzqWX0/rCuiw1Oyp1adUT1zM6xNNL2QBNLZ+//UgaClcSl26zBwe1bojTtpf91vpSmPq2zl3Cgeoy1gK02yvRB5/6yAu03m1gHtYUM3TTHdD6FuAljrtspjgHOXI7scGC4tb9eLbJXKts0WR8iL08DHGiGHvqdyMFnqSjJVVw4UPLxuABTpI3hUk940OwK6/lV2VzzNYs+z2ab6a0tWB5P0zn9q+AUCNcxM5gRCMtLvggH+Jbc69JWbLgj10UQC9CU3xlHdwXbd8KyflLFWyYv4agOSg3pp7svu/QXVaHATfvRdw== 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 AM0PR10MB3121.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:18c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.18; Fri, 10 Feb 2023 09:29:30 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::ee44:171b:4c40:d42c]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::ee44:171b:4c40:d42c%6]) with mapi id 15.20.6086.020; Fri, 10 Feb 2023 09:29:30 +0000 Date: Fri, 10 Feb 2023 10:29:21 +0100 From: Henning Schild To: Felix Moessbauer Cc: isar-users@googlegroups.com, Adriaan Schmidt Subject: Re: [PATCH v3 1/1] replace custom OVA logic with imagetype logic Message-ID: <20230210102921.55ebda09@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.0 (GTK 3.24.35; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0413.namprd03.prod.outlook.com (2603:10b6:610:11b::11) 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_|AM0PR10MB3121:EE_ X-MS-Office365-Filtering-Correlation-Id: 7376145c-ff87-4a0b-77ce-08db0b494fcf 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: /mQy7hayu0e9ENuipZB0q73YneCu6A9Xdxju6asFpvgkUjawkEt8voTKU1QB1PuvCG46L6ypTu0pHsgsbfhs0S4e9lcIY2mFOV6TTjx7Uw9S5iQKjlpaE1mxMWF9lLIPFG6Fn9oaoMsJvqf4UsJzh9ZhdaMyY3iZvBGucTP/a7wqQVdB60FCme3jTp8vRDNYs0ofjSV0dEvSwyd6nXnBXNGHdjI44O0KvO4um1bCLcw9r5KixjX1cNlsJT2nH2GE7aMqo8Gcs/weRanHHQlADxxlDj0mpx+V+O8TkpINgzG5le0ShSTB7nh9+g664ChAKe9vYhJlmXJB06puMS+UPdapS0HHXXD6wITkkD9DtVkrqjXfl7Dp2sfJgPUhEuL6o/xeqEbHLGu5rAaz8PRL6mBYGdU62uyZFe6edKIU5B4etpgW49878u6hnoMpylJV3fpJIox9sdsDMOImbv9+1P2k5ciDHDHOCE1hR7NiFUcaVoqfYjP7JQNYNkXZwWCaQ8kSFzQ2UFJlRmdgjZwXpb0VaGrKJ5HXja3GWx6MMPNqC/Ur3xgiJerhKGipg0aLeHXzAaswAIVoQnVlOatwBgqB2o4S2G81Da481H+qXWQ+GYL+cgbb33tqGnFCVnyedJ0qA4kv7GrKJR+PmjblWQ== 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:(13230025)(4636009)(39860400002)(396003)(376002)(136003)(366004)(346002)(451199018)(44832011)(5660300002)(2906002)(83380400001)(8936002)(316002)(38100700002)(4326008)(82960400001)(66476007)(6862004)(66556008)(66946007)(8676002)(478600001)(41300700001)(6666004)(6506007)(1076003)(186003)(26005)(107886003)(6512007)(9686003)(6636002)(6486002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vn2P/+ibeyqRTy5PzLfydlg1zkDlaLtmyITm75vOQle97jx2hSFoK82NA7US?= =?us-ascii?Q?nle1oSJIxJMmxGE8bKqSA2SVOTYjd1vLzBnor/gf09pnOvSxHF/EL1QhFuys?= =?us-ascii?Q?Wv7nYCkcX2kst922uwl77T4ESZ83kZJ+3fGvz/jhJUFvuoSayDDEJUlewbDN?= =?us-ascii?Q?B930Wb35n0HQaPQ/dCDMMDLaRJW3VMP+FTpOVpjeccEdIQuBEghMU8+2XASC?= =?us-ascii?Q?0JHQHSxstdoR+b2TfBuLHaPNwcGT11isufP4BfLnXNxr9/6cTi9CId5pHshp?= =?us-ascii?Q?hm1MBtIFWU7VFO4fM/NEv+FLGlf6s0rCnIWae1f8lTNX0srRgCvKBDuo7TY9?= =?us-ascii?Q?2nobp+YrTFKjaSIzbC5YQoLna2KWng0ybvyC5ezGTC8OWdBQfsaoBOhZKkrk?= =?us-ascii?Q?BmZ3EIcJ2Gqlswgag9/qMNgNBYH3P98P1SOCKDsyqy5ws354pcHn/7rh2ngI?= =?us-ascii?Q?FpCBXW5CbLwaxLILMsPYOMTchIA8NYaD4oJIAbADbwomzVbXaMEuslItut7R?= =?us-ascii?Q?o2SCAIJsZKED9XEMxjcbBC2VshuZXdYKYZz6H/Xg2SLkXcq+il9rmzf8L5CG?= =?us-ascii?Q?AFslcng/Fai8j01RJs6qShvhuTP06CK5Rsvt7z1RIzVqQxJWpxSSPbmHLpD5?= =?us-ascii?Q?Wx/kMDBxIg614e83N0c7F0263L4Qs2PuPrIV+nAgik5l9fu+y/wtQJAglfg2?= =?us-ascii?Q?PljX/laWQSuusJUe2pDEzYoQEdHBw8UPrAVaAzBB3R2ANPSHIy3dgiC5Wjb4?= =?us-ascii?Q?ionUwaTDhUHkcIi6p/1FqyDqi+nWyQbdNyn+5tY6msct2lJh9CcdW6IXRA5f?= =?us-ascii?Q?KAEgpUKpVp/flbAxmEsWegu9s5dHrmPNI2quRNO4QFGkN/0Wzb+GPLpkxBdT?= =?us-ascii?Q?7TIrafxyq95DaoK3ORnu3l12gvlhVfqcCuf/6C+FioRWejo+ZXfUzMCMpC9d?= =?us-ascii?Q?2pTaw0Ub7/0o9XZL9nPhlSFyhLUMJ9HkvIbxgZmzUemyL1tMa9EmQF5P1Zit?= =?us-ascii?Q?rd0/Wmp/U5thh6stBnrasrt/eHmxGAMMp83ttM8bZSL8TaeVtWUg4M/td7t3?= =?us-ascii?Q?zOIUofVnLvmxRX9VOJVEM/WSCxS6GDMTlF5MDE1qbm9lthQpr5mzKNyThaLN?= =?us-ascii?Q?f2g5YDXeTWNdFzjG1RrubxD6jAHAecs/vqJGYNO95afXqSq4lEA8k/e0lGDI?= =?us-ascii?Q?15R3vEMOHAvpp8DCdjhWHEjB5tOGRZwwIPGFRywibYaWqEaH80IbbxdbpUvn?= =?us-ascii?Q?OlYgWbe4EE7tmOvm3BzKbu/xOlQyiWBMPofl+LJEYPnim8OjbC7HifjEHDGD?= =?us-ascii?Q?YQEGy61lT709C6vHAlB6f6dsldfJqFkmpSo2jf+XgUKa7Qxfu6Qq54iuZbBZ?= =?us-ascii?Q?XOhhf7K820AGEruONrSg1lhCe3e4KZvg7dvaBs+AytwyEh+23UwAVeW5pRvw?= =?us-ascii?Q?/bv8ipLtfj+43ZP6BrX+KYrFnpe+uI15Jkxd9UgmqphymOVgCqPe06384uoE?= =?us-ascii?Q?vcTddHSys5ZAvsTwFhS6YUtUEh72/E3sHw41xrdq3lf4/2SmfMuCHH/uzfIb?= =?us-ascii?Q?QLFYBASDQV78x8a/QpAA+0gObxNL1y+nq7cNbB2RZW/+gZH50hN9GDqoPtf/?= =?us-ascii?Q?6g=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7376145c-ff87-4a0b-77ce-08db0b494fcf X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2023 09:29:30.4915 (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: ECTs4LpcYm7oMjXphKTvDkd6bp5627vfkGLm3+X9McehWjF/c35E3bkAWtPZLKdNvdzoG6UV9jRgjsbv2wxcG0dPz/T0CYgL7Ug7UgcOz5A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3121 X-TUID: /OpgU5AK14BH 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. Thanks! My understanding is that it still works, even with bitbake2. But it always generated nasty warnings and with bitbake2 there seem to be even more of them. Nice to see them finally go. Scenario is: Layer2 builds a vmware image with ova from Layer1 (product) Layer1 overloads the default template from Isar (product line) Isar ... some modern "next" Henning > 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 > +++------ 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() {