From patchwork Fri Feb 10 08:40:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2627 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Feb 2023 09:41:09 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f62.google.com (mail-lf1-f62.google.com [209.85.167.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31A8f8j0023050 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Feb 2023 09:41:08 +0100 Received: by mail-lf1-f62.google.com with SMTP id i2-20020a0565123e0200b004d5aee356dcsf2028018lfv.5; Fri, 10 Feb 2023 00:41:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676018463; cv=pass; d=google.com; s=arc-20160816; b=XBl4bqV7Okn/T9B5Q4K0YTOwnpqfYlRi7AKfBBRXHrd19Akjz2nXrbURENO/f5cih/ zfm/CHL2U8oLUC/HKYVQ3fcQFXiKQwwD0ACrqPUgVehTmFGI10fSscncqfsVzNQ3xgiZ q2oK8shvIOtEUkYxt8Iju0iW6DQjXkHIFRlT55NHwJf7slsRpT9sM3XYfU1F4MtiU86s ONq/I+VEFSsif8yZcVfwV5EbyOKJfxO9ZnZ1an+NGoN+IXst4TEoXsHrrkykLKxa1HXW IkLP0H23oRfeC6rchacjK6arunL2IQXqYuQG1rYCkkA8gKjxxHD76K0/wVIQ9sAEkBqn NFKw== 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=kUMgn7NjNwOXG4dufLYJ2w3Bw0bmwk8lPEDQvZixB4M=; b=hu/zMsF3V2Tz4aSQbQ3clNtDc2/8x0uvwXZ6ovS0uAO2ZaWXiV9YgTcHmdHyAUI9ix WRXmvmsnJxk0+YGmOyFeAJ/EN1R+4JTiAIJ0TagzCser/dwK99G3AygEH6YH6Y3cr2iJ cqNYxfcvKFfJgzXzJlB9o9ZVCeiXUja3wM502YQ+hG5Ev+SPok9IIdQD6TC0lWvVbzOu +ClhcKxcnQfGyNV7TnONsu31guxUWPrAU6jESL8mYG/DxdY2Y+8QkoYUbr3+TtSV/0yQ DE/rzrE5zCfZyNhloS9fkXAVdCK/iQCljcpoL0kjPvQUcDWXq08EEzBnO/PGylSJ5GMc NGSA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Or3Axd58; spf=pass (google.com: domain of fm-72506-20230210084100d69b520c52eef53b9e-ukqifa@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230210084100d69b520c52eef53b9e-uKqIFa@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=kUMgn7NjNwOXG4dufLYJ2w3Bw0bmwk8lPEDQvZixB4M=; b=kUqvolA3LE/ogabIjn0VfeqlyEJQhrIUXWwLJklbj/k8V/chCoQYyIfyrSw2RGZNc7 2WonRn/D458I+p7c4MxbrYk+zzu/8mDoh2qrosyKa5JV1m406uU2jTF+m3SsqMe8PlKB O74ej9SrYY+dbL6JFqkv9S3HDIKmQKXV/F0UgjnfdWtKtJkDIxT+Y5C81qs3MMUMy70r 9kgSQQ7ju4z/lzS/6+ACSyRIcVanCGfPPWZIQ+5n7qWIWL0+e8kyV6e7jq2wD9+Cvmtn ZCBmU0iy/snGDC1gsrDEUzoEQ5KyCAzAxbrsubo1Ye8EMT9UVLur6uoR4vBbmIaq1wzT jcvg== 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=kUMgn7NjNwOXG4dufLYJ2w3Bw0bmwk8lPEDQvZixB4M=; b=PJYVQuudxOPu6SJ0/7zuScoPTW8qm0+gFcqlgy4oPAxKpdHupr+22ypm+6PWGpea1l INFu7F63fMinqKW0kUVuY7bmQY4oPQQd9dJfdlcel4LZRc6m389PKuGTgi+483a3RruT 54GaEFolQMYhdjiM5VBWhYnCi9NUU3HTqzfYjhpkSAIEPvBGGiRdZaIhYUXcI8peDYTe OIpiIWbCzpeAgnFftljh3BQ9XH+I1OzO2hm29c7xajNKbVWOXAItpuo3hmvYBxxRKG1u hUcmVpQsKuE7Ldgpya0uL8MKl1SmUhQpEbd4P2dyrN4oC7KrEfXzyAygx/8QOoQFenQs HttA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXwqVEqGQmxRUw46aX3+8C0Lb7WXbS2NULHLa5f5UcwXiIr9vae /k6EF0fPTTsyXCa3kIEuu4k= X-Google-Smtp-Source: AK7set/0yamlV5sfn0ex7x41t0QJVX+EYqNkukAtnJKdRfT+7YovLE2NupTNucqScabyZON2lyICRA== X-Received: by 2002:a2e:9bcc:0:b0:293:2d3b:29d4 with SMTP id w12-20020a2e9bcc000000b002932d3b29d4mr1336630ljj.91.1676018462969; Fri, 10 Feb 2023 00:41:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3201:0:b0:290:51e7:45ed with SMTP id y1-20020a2e3201000000b0029051e745edls767248ljy.8.-pod-prod-gmail; Fri, 10 Feb 2023 00:41:01 -0800 (PST) X-Received: by 2002:a2e:a993:0:b0:290:6af8:ec25 with SMTP id x19-20020a2ea993000000b002906af8ec25mr6027834ljq.52.1676018461219; Fri, 10 Feb 2023 00:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676018461; cv=none; d=google.com; s=arc-20160816; b=RkJyRKJJrtD/z1AQaHRD2/Ifyz8Cf07KgaIYZSEYI3/0gruQ2ypYSmf3yMKiK7TVfz 7Vr7l5HyLgBuZY0kQ/ZX4kYAPtwxjTWCShFH9goTsZalCuFoslghO6ro2OL2fKduXLr0 yiB9BIY/buvdqNiqNZMN7hhETK55xPoTVFFLap0JLUd0dLpZ70Dv/J3j0jOM/4+sU0s/ 6gFF0oS/M4JDd1b6rqQRH3n9GQby13ilXxvrkelKyWo13y5a8Co3FpFg8eEmDbaqI7Wm k8brEpKdKi0VJmoH/v9wdDBnpuPSeAgNTDNgUXX6A/1PjYi6NPo1YXWUZyzA34Wm7Vee AHMw== 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=FoGyVJ4ydP/veACdTsxYsGJKYg2CRlIwB0sDFFj1CSY=; b=rgwKI/GxSIEiOvnBuMKJckyX9IlE2yq7MG7Fc9FTV3/3l1QdvI09yTcrWiqqgRoXEE SY6NjIgTKB6Zvv9VPxIiidRsNjOXk9sf4LRAcso7UgUb5I/cioJu1T4S0o4Pnpt74CKX fABTRIwKO3uhI417DY9k97X2Vpgppz/s9erEEAeAGy4CMFwMCZyZB/30CiK4V0HDmym/ 8UIiAvnT3xh5MtI5+LOa/zro7CAdEuFgZOwLzmkm9+uIF5elYAIu1lTRzdG1EdAJzwGc hbOXZx1QoSdTSB7f7rohSwVyXIyGq5jKrCOZmKunNCWbC5+0DHJY3gD5j/QDwfZntyEP O7dQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Or3Axd58; spf=pass (google.com: domain of fm-72506-20230210084100d69b520c52eef53b9e-ukqifa@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230210084100d69b520c52eef53b9e-uKqIFa@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id b36-20020a2ebc24000000b0029059a3a89asi193304ljf.4.2023.02.10.00.41.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2023 00:41:01 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230210084100d69b520c52eef53b9e-ukqifa@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20230210084100d69b520c52eef53b9e for ; Fri, 10 Feb 2023 09:41:00 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, Felix Moessbauer , Adriaan Schmidt Subject: [PATCH v3 1/1] replace custom OVA logic with imagetype logic Date: Fri, 10 Feb 2023 08:40:44 +0000 Message-Id: <20230210084044.714348-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=Or3Axd58; spf=pass (google.com: domain of fm-72506-20230210084100d69b520c52eef53b9e-ukqifa@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230210084100d69b520c52eef53b9e-uKqIFa@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. 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() {