From patchwork Thu Feb 9 08:50:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2624 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 09:51:35 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f190.google.com (mail-lj1-f190.google.com [209.85.208.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 3198pTxW018574 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 9 Feb 2023 09:51:34 +0100 Received: by mail-lj1-f190.google.com with SMTP id v24-20020a2e7a18000000b0028ea2c1017fsf206100ljc.14; Thu, 09 Feb 2023 00:51:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675932684; cv=pass; d=google.com; s=arc-20160816; b=nO8uDva3vJjNavwtROyU/LAz01vMuXyeSzYdn7xiez/1kRqyxQI0oygSzbs54W+z4k h/HhDN+IqymX1lli2/UL7tm/22hPiu3AunqyBEK5LeOTjYKt8FcbyKZnDUGnFq6GLVm+ wzGWI/fSJdrxnoVVthi9yLdOn4tVCKwBLaFutRQGeyNIVV6OvnIecd6Cz/VB/TwPIIWf vq+k26/++qsVphmmDKEm8JXN1C55myMjyhAYjU0Iv+CfRa389ZB/36RLBg6y6+lQ0LZP yaDmAS20CziR0tyiQ2+D1Z/1CVAdZbPQnJvVVPb345beyPLrDKvJjaKECHYATF8LInC8 XW0Q== 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=6y+YEZkPNdAScgEzeUVOuC0Lr+njlxW46NSl6fqvTVU=; b=b54FYX8991dm3eqNxkxMg8v3DtQ2b2ySuk5779hRVhaTmRTI842w+3ilaSFhzTWjsp K3lthGtHkH/uYSzMkxC7GDGTKas3JaFIFqZOqrlqBY6dYPKkRml96d7tcRrxJrojBIVZ JsYDzjN5KS58YqxJmEfUE87bO/m90Pg+8boDzMtx/VpMkpc6sIYZ25cnOlBbPOrxXevz iwW8EvkVQC4fv3D/KvTNVTESA/JrfkIlZ3GWfM3GSIHi6n/rsMUkYUvKwbrw7DMzpmVW 81c4RqideSjH07LrLL1FJ/8+JKbph92n+naqwTFSXYjvDVTwM4B/VWhY4bx8NY7/Ihwx z5jA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hyDifd+T; spf=pass (google.com: domain of fm-72506-202302090851212242073de3755083b5-pdazs3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202302090851212242073de3755083b5-PdAzs3@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=6y+YEZkPNdAScgEzeUVOuC0Lr+njlxW46NSl6fqvTVU=; b=tX5JUpQOCQiy8ScM9WPcb4M2AYMf0HLOln4pGMm3c5VX1Asp9s/9kmv/FbCf7L8jxQ 8XeBs643GSxeQV0fA8HzApjv65zzAVhV5wftBZrSbgJEUc77CEiBI8YVafHZHr5mS1Hx Wql/I3p/bYpltDs//or78a0jVUIy1CSQTa6b8VfEvMPdYbR+iBPIHc3YkpsmGgzvbEMD rVh14VMM/kmNiOKUX2nFt8JR1T1x/8A+xI9liRa32VNk+IoIZCm/N8u4wkJg56c7UN3w iZ7hi0h/GGhtjQDRGSn6FDF+K8flAXmiX3T3+kNjrohAU5+enpQfTOXTCYM+fLXF71Vb 6IFA== 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=6y+YEZkPNdAScgEzeUVOuC0Lr+njlxW46NSl6fqvTVU=; b=gjaTGyRk3fTJMAy4WZK5gH2vDJuOXycszb9Rn9TRQ4dBGBRywBZmN5XANpzqUtpGHQ ehZi4karUZTuU3+jzrqGKW+AmXYanE07DwmMPA5ckw7OTMZRR/K1/aI3+4rA3d0l1zlG XE4uk6qv2WXfb/JdgKt/i7lIjhMix62/jyHaKYje5OMCTXkC+PN2aeN6HlmeKeoid6xR zcO2fGamLq2B3bQ6lZ8hJPOihOmZ9QsSQ4nC8cTQvbHqxKCgeNRPyW7zM4XhVPkRWEep 41bnC1AvE7RIXv17es6EKTKNSa93YwSZ6hpWptuSTibs0xdhkD5puXuhoV6ehHG9jrTr d0uA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKVte9+bmvy6nK6q0r0R7Mrl585riFaTV+OJKZxw95mS9BXgfeBj xE/ljOzSRCkKha/Jqe7yi2o= X-Google-Smtp-Source: AK7set9uW36tEeUyvB+gmNnh+lJQii5dRdwHohx2mkBKCDXf60NNKnICpO3eEQbK7U4/HI/rlMwLUQ== X-Received: by 2002:a2e:9384:0:b0:293:1468:e054 with SMTP id g4-20020a2e9384000000b002931468e054mr1784165ljh.150.1675932683967; Thu, 09 Feb 2023 00:51:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a178:0:b0:293:32ba:16c6 with SMTP id u24-20020a2ea178000000b0029332ba16c6ls87296ljl.3.-pod-prod-gmail; Thu, 09 Feb 2023 00:51:22 -0800 (PST) X-Received: by 2002:a2e:b7d4:0:b0:293:2e06:8444 with SMTP id p20-20020a2eb7d4000000b002932e068444mr737035ljo.10.1675932682030; Thu, 09 Feb 2023 00:51:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675932682; cv=none; d=google.com; s=arc-20160816; b=PzpmgrcyfG1GL01XwLIshrpnAVFw6J+9fVB+ZZ98Ux7J+EqXg0WAVuuFl7+WKiiqeS 67b6RS7Ldk3Q7Giqq2VHbEb3W1SqqEptemQP3Jo+RQkfpJyqW6sBXsy+l66gi3D6P+vb 4q5msrDdfaOptktK/fjWLyKWHyYUkj8xnf6heacbS4bo3MLir37Yv1nhG+kHSqZfUpRV JFO51BnkpPwHkxXUV6xg6U31YgSC55z/uodYFLozP5CHGTNNqbPym+CF987R7RWRKz2u n95paSJHf4UG5KSXnTQJ5kA/FNzjapKqGJlFlJ7JZIoS54DdxRGJ8rJ79ehBAHvW/SR4 FxVw== 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=UVqwWQS3jIEziQyWEZu0SPe3sQTk0ZPcrSCx13GJd34=; b=xvCEjBtHZd5uau30lcuxsuTwfOs73Wk1rq+m6gXbbppRS9ONJJt3UUrQR6FK5w+XS+ PMRPHoAW3zwWqIjXQTdtEMdFKkvLduBk+bVnuy/7Y7T6x37y7V0P9LCYmu1hg9y+0Rlm 8jUYKCP4X4ssgdnrNP6ObqzaXL/Oluzi4JFUjoraoSH1Z+UJr6k6ydRAw4TJVFTTAOFT YMTWV9TfZAY/Zx2CX7EOOcJGt42xUOldDAOjyO+5tEFeBlgfL9I/spMtteqBk5tiogAk V3nCo0DybaFfmJGF9CQceFc2BSQAm4+MHM0oYL8AL58KHwONjvf0hfe+aNEGJtXQia1P 7a9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hyDifd+T; spf=pass (google.com: domain of fm-72506-202302090851212242073de3755083b5-pdazs3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202302090851212242073de3755083b5-PdAzs3@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 b30-20020a05651c0b1e00b0028d88cd79a3si33783ljr.8.2023.02.09.00.51.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Feb 2023 00:51:22 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202302090851212242073de3755083b5-pdazs3@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 202302090851212242073de3755083b5 for ; Thu, 09 Feb 2023 09:51:21 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] replace custom OVA logic with imagetype logic Date: Thu, 9 Feb 2023 08:50:42 +0000 Message-Id: <20230209085042.420572-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=hyDifd+T; spf=pass (google.com: domain of fm-72506-202302090851212242073de3755083b5-pdazs3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202302090851212242073de3755083b5-PdAzs3@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 --- RECIPE-API-CHANGELOG.md | 10 ++++++++++ .../images/virtualbox}/vm-img-virtualbox.ovf.tmpl | 0 .../images/vmware}/vm-img-vmware.ovf.tmpl | 0 meta/classes/imagetypes_vm.bbclass | 11 ++++------- 4 files changed, 14 insertions(+), 7 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..c52c96e5 100644 --- a/meta/classes/imagetypes_vm.bbclass +++ b/meta/classes/imagetypes_vm.bbclass @@ -6,14 +6,11 @@ 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" +IMAGER_INSTALL:append:ova = " qemu-utils gawk uuid-runtime" # virtual machine disk settings SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic" @@ -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() {