From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7198076072096694272 X-Received: by 2002:a2e:b4b2:0:b0:290:66b3:53e5 with SMTP id q18-20020a2eb4b2000000b0029066b353e5mr2681024ljm.57.1676018463028; Fri, 10 Feb 2023 00:41:03 -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-Google-Smtp-Source: AK7set+fk75vxU12FjFybVu7oMQzpzskadXY7v8VZ4uqqJjL3/Fsb0FPZC84bj137WTzZv9+LE+w 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 Return-Path: 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; 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 Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20230210084100d69b520c52eef53b9e for ; Fri, 10 Feb 2023 09:41:00 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=FoGyVJ4ydP/veACdTsxYsGJKYg2CRlIwB0sDFFj1CSY=; b=Or3Axd589BM7e4bnkkAznZoeGJavoHn1OpECp1Tzj3xz2DmKJCRRpBr6umaWf3YEL7CcJA nZU+C8vHTSFoviG4qyhTBJEy75AL6JNhtxIb87Mq2O6dZS0qSzPTxLLgHS9C9TrO2cl8CFaE pWXO8qyS2ARDSxNqIf6lqaPd3iOJ8=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: eoCz8eB/kiMs 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() { -- 2.34.1