From patchwork Thu Feb 9 14:00:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2625 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 09 Feb 2023 15:00:48 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 319E0lFp019544 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 9 Feb 2023 15:00:48 +0100 Received: by mail-lf1-f61.google.com with SMTP id g27-20020a0565123b9b00b004d861df2daesf968463lfv.13; Thu, 09 Feb 2023 06:00:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675951242; cv=pass; d=google.com; s=arc-20160816; b=R0cd/dK0okPD39zgNuvDfew3plBRAYE/fmRivb8qBqw0RSWbS6RpfmvdN3TEqJ17uC 99D09WcM99V4JVSfJB5x6UCyFpBDfFfR2HNT79CGmzDfRSLgZp2pEd6UcbXFlJ89qQPA 0/QE+aau2h6JwvDBZ9qePnO8XESQWx0fqyDjE0uxLHoJ6Tt7rXig9tsHdEuCFmFZkrOD lMwMycBNvZIHwk0afCVsh2nseVpILDvyEnyiLgVDQ0qRXd9rwFc4cgpkavaupaDh/FMG Zw2l6Cc5S3P7tmQSALbzZ7hTSaaR0k7UMR2SfWRJuUEz2ncZfMD+yJh8DOR1EgG38N6u Jh9A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:message-id :date:subject:cc:to:from:sender:dkim-signature; bh=zBvqC3YVhgwu+jE92xExoHu6BIfWado/X/6849HP8Fw=; b=CopYynsdTkoj46sM5ImDLS8qh7fmlQ0o0uwUFVWGvO7IvPAGxSBtwafm5T2pb+PRVz 53ynHvN8MHHjDcz8Ep40Nl8EO7yfjJCY6kT3PsYUUtLnFA2KVhIKqsCHow7ZvyVy17I+ YtUIxdRNTopdfZ7CrjffCw+bhYkO8k7mZ59MsrxT84eyRH6ceYM4M8XTaWF5yjJau6RC sOm5dJnFf/GGGqXJWhzhTBG1S9gcHPZeKERmHPv/l6lR/to4FnuDC5INS/mdcJYLTgfo Bk1tbmdsHEYCQ2gwW3Nh+kgmC0aplrItHXEnUuwsrUbkPCFI/bN6doaw0aQk5Eijj5lP K7fA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QljfNsso; spf=pass (google.com: domain of fm-72506-20230209140039a7b7cf373203bd3991-nnwje9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230209140039a7b7cf373203bd3991-nnwJe9@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:message-id:date:subject :cc:to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=zBvqC3YVhgwu+jE92xExoHu6BIfWado/X/6849HP8Fw=; b=XeDrpgN4XX9wD0CQtMhxBdrQNVE5cDqxu5nFzkLGP05XmKvxvq7TVUQhuyJyEz3c08 F4hutHl3Ki/NbMGoHmSjPo5tkx9YPuquewSsZ1AtqZiT29mBkcpsUQcAJMx/U4rJrWM2 P8eGmEbU+/glzJfW1+rKeDe0ClfT1h08+1hYggysKJ3wb92Aowk9MTQv+NmRMz15CxVd /D3iDWBF/6cdmcHIgwzgIqlkBBffmUHToX5i1rvZrqBLBblcjFUfGI9V0/30V3VRvPrH 3o/U1vuOLtlJrwoCcLuJEq9PK7uGNudBmbJYA+VzFFxWdKhl5JpIpGvZZB6+kQSfpwa0 0BTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=zBvqC3YVhgwu+jE92xExoHu6BIfWado/X/6849HP8Fw=; b=uX6X+HiPHZfzvceMwIXYQuWHmLcxFNvwWNBpKcnf62Y7Hh6wnCGdTS+ykHACnMeU85 KAdguNIiWIFeNgY3Fdw08soY8CbzoSlm960H5p4DN669C7WlfJA1noZtt97fnzfzwxQO oWFlxoReBu//Ly32wnlOT1ubvY1Zn9A4f9exjr54tpnWQK+byEeFEX9vN3cWrinjENdY xScijFIHenPGCXo+9I9npc+5M4V3e2c/rDxXAjUwCfEsnzE9D1yTBoIG9yRictik21Kk fbaQap1POOxWce35Uhlok735Fr3ZonMoP/9lE7pKvARNmxCKkWvZ5vmE6wZuu1a2Bl6z wd6g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKVy0kxpkr+7RqndJ0/xVGExfddPZiYAOGkO+k9yd29Apdrc7jgt eouHa8kmb17LiQcnEPP0XjY= X-Google-Smtp-Source: AK7set/BrmFwZPkPXMLs4Dmn8PjeHWiHkEApsUcQuQeVai1G9jjAfblju1ClMuurUdbrY9FSP0tivw== X-Received: by 2002:a19:7515:0:b0:4cf:d5bf:75c3 with SMTP id y21-20020a197515000000b004cfd5bf75c3mr1542793lfe.170.1675951242053; Thu, 09 Feb 2023 06:00:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:15a3:b0:4c8:8384:83f3 with SMTP id bp35-20020a05651215a300b004c8838483f3ls1420850lfb.3.-pod-prod-gmail; Thu, 09 Feb 2023 06:00:40 -0800 (PST) X-Received: by 2002:ac2:4192:0:b0:4b4:6490:cbf1 with SMTP id z18-20020ac24192000000b004b46490cbf1mr3197696lfh.15.1675951240008; Thu, 09 Feb 2023 06:00:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675951239; cv=none; d=google.com; s=arc-20160816; b=gGaWdfRdoMYXcon/uKUkXTyPFjdT/IeWHCR3nR+kR3C0WVbR8EyuXzlMbRVreiw2VP umbC1ULQT5QYli1UFIoaUYuqWO3CtoaH+OzxvzZNMrbeQldTQWvAtM4cVvejVam7Da3z EU0xdZHy25d7zjzL8xLgJ5/wcfuiZNHEO2Af7uU/UJEF5OyBy1WXawpMjRQwQ03pu4VG PTYC1vvfZLJYCeZILleadLMHzQFiJTGvFLx3iqRZamQp2m45VujSbUBWpf+KRpJ2y/sl 73YBXoOz9gmKpJDzrVkXWx4x6buOcJh1oGRTrLm+NN2I0dck9FMNKlfcUwI+ZAobGI5i VEeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=x4WAk8yhCkErGvHeebbfg+JmKz/6sQmt6JsVMUem0WM=; b=KV1OhANNscKjG8a+S1s2K7Tb8vhiLSHF1QK4ZWHir9jKFU8fT5NNMxFkRxyC7+UxQb /jYLQIghaS8Anp1rKtm9EFwcFoQkj1j7IIbL+DIw6boeO9sfAaGwntjLScLvDWnxwXHT HudfLi0wePskCMDO46g9SUPqlJFHgJQTovYYPVNrr/U2JrUN9NGfCL8Ll5Q6lejhVxUE LHN4xgmykSTW+YHSCBl6NIsvHGoGjW2m8/YSQH4a6LbQA08yOJW8uqXqb82Qrq4OWF/R ZtcPXrC6rV1QRjUxR1YvVTBoVjYfkKOGvu4iL3Ob4r8WeiPcpmuwcyXG2eOHyFSCULkE qqLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QljfNsso; spf=pass (google.com: domain of fm-72506-20230209140039a7b7cf373203bd3991-nnwje9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230209140039a7b7cf373203bd3991-nnwJe9@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id be18-20020a056512251200b004d09f629f63si92621lfb.8.2023.02.09.06.00.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Feb 2023 06:00:39 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230209140039a7b7cf373203bd3991-nnwje9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20230209140039a7b7cf373203bd3991 for ; Thu, 09 Feb 2023 15:00:39 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH v2 1/1] replace custom OVA logic with imagetype logic Date: Thu, 9 Feb 2023 14:00:24 +0000 Message-Id: <20230209140024.542384-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QljfNsso; spf=pass (google.com: domain of fm-72506-20230209140039a7b7cf373203bd3991-nnwje9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230209140039a7b7cf373203bd3991-nnwJe9@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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. Signed-off-by: Felix Moessbauer --- 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 RECIPE-API-CHANGELOG.md | 10 ++++++++++ .../images/virtualbox}/vm-img-virtualbox.ovf.tmpl | 0 .../recipes-core/images/vmware}/vm-img-vmware.ovf.tmpl | 0 meta/classes/imagetypes_vm.bbclass | 9 +++------ 4 files changed, 13 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/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 imagetype +logic. By that, the `OVF_TEMPLATE_FILE` needs to be located in a directory +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/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() {