From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a19:f603:: with SMTP id x3mr5569380lfe.222.1639498695079; Tue, 14 Dec 2021 08:18:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1320:: with SMTP id x32ls981861lfu.2.gmail; Tue, 14 Dec 2021 08:18:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxrCQas8329jL+paeUlEH12a6gtpaOdZBY04xP8JWyFcO+e3B2VWFoUqOmk+QEdHyNOnf6q X-Received: by 2002:a05:6512:ac9:: with SMTP id n9mr5541613lfu.59.1639498694103; Tue, 14 Dec 2021 08:18:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639498694; cv=pass; d=google.com; s=arc-20160816; b=FO90W6x2ghVLY2x+LmSplvxGu02v3tXvrojzIcRcjwpVRKt2f6qyflbMCUKt29BniD /sLcoEs5YJehm8dRLJBqMaPB5YXsEV3GyCYII+eFTDze83vLpJD62lXDVzKCEZ9V7xgY bfuDXayeUaldeHUriSaIS7NisHx4TTWniZtVFKhIvnrzd8szzuUrhhJ96fJMGqAxQ/A5 WmFiiYORyHIgTwnxSwPY07SqvdEa+eAoab+XU/H72z3rOPcOvitav9U0+6V02c+VgCe6 29Ru7EaRTVYGwGgRYP5jQFPaa1esHfg8tsze8MTTREck08ylypm9iZuaODwGS8yNnlDP 4NLw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xDXcxkjUup7GmD3sagSgrwx5gbwaSxFBnOwzPc73nQo=; b=GHoh/ldWjb57zKUoiGMCQACfQ5E+JHnebi54YCV5JYwTZ6FrUKbRFJunqhHaoOYEF8 AzGdUsSlgJGE7uZypEby7uF+tyDVI2tmY4AQqAg0pr6WwHVmeaUI137v+PVBCQZ310rE iibbw6LJS0/v5uByI4tIhE7SfievFBZCt41wgCUKljejazK+yG1kI6gxGBrVNdpNdoTr K9X4jLMP4VD60AfthiAiK6hUS4ehqs+OmdHedDVYrlG7bw4BHiEPWhCzLTeVEy5oxoO3 q0m2ukrvOqOyTL0I/CxbMEJ+p+gEnY0XZ87ZSDhmuRZFuF5lJ3Sx8WssQLUymmFkmwEY EdHg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=m1QvmQtc; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.1.68 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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10068.outbound.protection.outlook.com. [40.107.1.68]) by gmr-mx.google.com with ESMTPS id l13si10289lfg.1.2021.12.14.08.18.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 08:18:14 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.1.68 as permitted sender) client-ip=40.107.1.68; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=m1QvmQtc; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.1.68 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=MFCWv2Dk8EptW9u4eWyLLccMTa2jMHX4ybXxOG6LMBtdh/pnruryz8H3xxg+7t1tHv/Pgbr0Wsi1dCMMcYq/gnusFnePR3zQU9rCAHACd3ovepT0VGl0E+dx8WyGVX2BkTMY9xIC/S9bSJ4jqzJVescEPZBBvZryD2FdAVNuTFykUvaARW0U4UhPgDlpodbx7iQJ48Fif/dRshZ4oPnJCg3WRwIqwd1yjRdEGAb6C8HZCUJzIOY5CvRLldGuKjPswI94gqnEmNLf+90g9rqLWqDpbcMTZoFyuPBP47Gy0eXKw4vWGrZKcWs6V7nvPyCosMjhWKITxy5iiYSoiEIXbw== 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=xDXcxkjUup7GmD3sagSgrwx5gbwaSxFBnOwzPc73nQo=; b=gsHzYGf56ujKQCd3Jbr+F7qToTlrwCy3z1Y26wnjseaTyfe8tRc27MRewynsWyI97co6EG9kFbWh8tZRHI70PqNUbvfF+OMSgTGnGolWasMqBd6itZzbTIW0WUlK/JnWyYm4Q1M7iooVPQUanVes8nH3/ECRsYS00QLhGIe+Scda3rYGm30pVDuLIqITY/06O+5n2AgadFfAm+7fMs/0sax+HIAOQ5hMKEZwp2DkKQ+x0Q9UgRSs+7mQcqcN3d0JbCO02qoUkiY1nbNZjffb1OFf6y0jyLLnFBk8u7x+1XRqR5J/kbyBZFowfux2JqTg1CGQGuC1qO79eCpHK082rg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=xDXcxkjUup7GmD3sagSgrwx5gbwaSxFBnOwzPc73nQo=; b=m1QvmQtcJgouo73kkRMKG/84upuKUZs6gxKe/98+XhBtJmRxppIEIhvyGIw/lBCOHBhyiOp71Db2lfQlmPQr9zIksGdogVpV3bbAfLaRptt8SRKVJ2mz0FaeciRAXHMmQ0qprspFki0CxQIhN/5E3spr6wXrdcZ6STPMORtVyteiQk633gDbWYX9tVpL6MBMfm/++LlCPntYSfMapqJN5PuiZWd1ixKryGn6nv54AOx+fNz2mACVgePOmMYXJdqLOod56Rhl/RAF3smqKY/QbWCazo+aPefeHw9IarFSpInLbgSDedD1FtMJZDyCIU5GuOceVgjQqODtKqnklwZhaQ== Received: from DB6PR1001CA0033.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::19) by AM9PR10MB4944.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:41c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Tue, 14 Dec 2021 16:18:12 +0000 Received: from DB5EUR01FT049.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:55:cafe::d0) by DB6PR1001CA0033.outlook.office365.com (2603:10a6:4:55::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16 via Frontend Transport; Tue, 14 Dec 2021 16:18:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by DB5EUR01FT049.mail.protection.outlook.com (10.152.5.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Tue, 14 Dec 2021 16:18:12 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:18:11 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.69.80) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:18:11 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v2 2/7] vm-img: use two different ovf templates for vmware/virtualbox Date: Tue, 14 Dec 2021 17:17:59 +0100 Message-ID: <20211214161804.5789-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211214161804.5789-1-henning.schild@siemens.com> References: <20211214161804.5789-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.80] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef861948-8925-41ad-eb9e-08d9bf1d5344 X-MS-TrafficTypeDiagnostic: AM9PR10MB4944:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:655; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?J8cF4euUoTkYpdxG4ucSyz6/DVpDMIX187OdMf3G9PPrVFV9K05ZCMGUcWEn?= =?us-ascii?Q?xz8aHqRpOMpDQ2y6GWDE2ixROWXMdLYtRvTmSwXoc5oBntLRUfh51Uwkyl8i?= =?us-ascii?Q?XxfC6x+x0PIDfyNozmw5j4AAC299+Mmp54NcoxsOB+nnZ/cw4kobHvlPAMLT?= =?us-ascii?Q?C2LGblUYNFDnY9KtN3XPO79rJ7hVeSnkAqCGYPHSf6SuHZNKppCZMV8RruNN?= =?us-ascii?Q?mbSnqPZjytHfgGdm+SRM/hgvlasm3IwZg1Q0gW9jTv9Cf3pq8kzFpUi4iyoF?= =?us-ascii?Q?J58TwxCLwLOyabBKjBhxas0RjkbiVnOtABR5BAyOh0durHD7Pq0/0F7EbtOY?= =?us-ascii?Q?lmiqTiE5p6tUUFFZ7595HjGjwXpUT6ZGKnXNy+59Z+cVl8WfQZHYltAFVtie?= =?us-ascii?Q?0cRxOzhzwTC5ipVMRjRkx61jnYblRY5b7KkWa2lvGm1hoTtwXXgoJvgBxfP4?= =?us-ascii?Q?7Re8jvcC8IIlIGPImx5Beg/QDbkOb6/ElZjHF5YPx3RyWPbwgCPqx+rgSelh?= =?us-ascii?Q?uQGAS5TbiFV8c74xuqdfiLPXCY2uC3r2zF9KrI9mZkq8+BfuN8OUr9xoAnQ6?= =?us-ascii?Q?Y5kVeP8Wysne+XFjjSIVaSux3R4mQg0xCN4b2EVCB0wtvEnISmTCLw1S1WUf?= =?us-ascii?Q?bMD6z9qh4VtgzOtSRs+1Xvl6oxPwQd7yKEUtCYQp0Grk/jU+jIoQD0JeCvIt?= =?us-ascii?Q?jpXwri2YRC4SKwt1mL/8wc0i26NhBudD5DAA8hK4Je9mUdJRqSwfgAlRmG95?= =?us-ascii?Q?sIe2fQEBBeBvLCNrmmRndq2ZPc23VZglg0JwHk5hWG+ZsxgHR6CcaVyJO/dn?= =?us-ascii?Q?BusYGh/U3vHlkNP712YjyoiqBff3fsO9lgr0sV1vBRY75n2SsvtJ94n/2b1r?= =?us-ascii?Q?/N0ySrGuQ78sssIPOh2YBNVMpgWC5dsa9GUVqKYM/M9W2XVanUKiG98JxXpF?= =?us-ascii?Q?Dw4N+KyQkSHGL3tYWcfHyg=3D=3D?= X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(19273905006)(82310400004)(16526019)(956004)(36756003)(47076005)(508600001)(4326008)(356005)(8676002)(30864003)(336012)(2616005)(26005)(6916009)(5660300002)(86362001)(70586007)(186003)(6666004)(107886003)(44832011)(82960400001)(70206006)(81166007)(40460700001)(36860700001)(316002)(2906002)(1076003)(83380400001)(8936002)(562404015)(36900700001)(563064011);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 16:18:12.0993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef861948-8925-41ad-eb9e-08d9bf1d5344 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT049.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4944 X-TUID: 6ZWuVx6vVBkn Both vmware and virtualbox have their own dialects of "ovf", there is no common way to describe things. That combined template was trying by mixing both dialects into one file. But the result caused parsing error on recent vmware. Instead of trying one size fits all, this patch introduces two templates. Both derived from ovf exports done on recent version of vmware and virtualbox. Because of the vmdk sub-format it was anyways not possible to build one ova image that would work for both VMMs. We also now set the uppercase version of OVA_FIRMWARE, which is needed for virtualbox. Before it was called OVA_FIRMWARE_VIRTUALBOX but was not set. Signed-off-by: Henning Schild --- meta-isar/conf/machine/vmware.conf | 2 + meta/classes/vm-img.bbclass | 6 +- ...te.ovf.tmpl => vm-img-virtualbox.ovf.tmpl} | 132 +++++++----------- meta/classes/vm-img/vm-img-vmware.ovf.tmpl | 127 +++++++++++++++++ 4 files changed, 185 insertions(+), 82 deletions(-) rename meta/classes/vm-img/{vm-template.ovf.tmpl => vm-img-virtualbox.ovf.tmpl} (54%) create mode 100644 meta/classes/vm-img/vm-img-vmware.ovf.tmpl diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index 5832b29955b5..9bf1fd96c5cc 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -11,5 +11,7 @@ WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" + VMDK_SUBFORMAT = "streamOptimized" IMAGE_FSTYPES ?= "vm-img" diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass index 79f3b7e45e83..debdf3b2fdf8 100644 --- a/meta/classes/vm-img.bbclass +++ b/meta/classes/vm-img.bbclass @@ -8,7 +8,8 @@ inherit buildchroot inherit wic-img FILESPATH_prepend := "${LAYERDIR_core}/classes/vm-img:" -SRC_URI += "file://vm-template.ovf.tmpl" +OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" +SRC_URI += "file://${OVF_TEMPLATE_FILE}" IMAGER_INSTALL += "qemu-utils gawk uuid-runtime" @@ -93,6 +94,7 @@ do_create_ova() { export SECONDARY_MAC=$(macgen) export DISK_NAME=$(basename -s .vmdk ${VIRTUAL_MACHINE_DISK}) export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") + export OVA_FIRMWARE_UPPERCASE=$(echo ${OVA_FIRMWARE} | tr '[a-z]' '[A-Z]') image_do_mounts @@ -102,7 +104,7 @@ do_create_ova() { export DISK_UUID=$(uuidgen) export VM_UUID=$(uuidgen) # create ovf - cat ${PP_WORK}/vm-template.ovf.tmpl | envsubst > ${PP_DEPLOY}/${OVA_NAME}.ovf + cat ${PP_WORK}/${OVF_TEMPLATE_FILE} | envsubst > ${PP_DEPLOY}/${OVA_NAME}.ovf tar -cvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.ovf # VirtualBox needs here a manifest file. VMware does accept that format. diff --git a/meta/classes/vm-img/vm-template.ovf.tmpl b/meta/classes/vm-img/vm-img-virtualbox.ovf.tmpl similarity index 54% rename from meta/classes/vm-img/vm-template.ovf.tmpl rename to meta/classes/vm-img/vm-img-virtualbox.ovf.tmpl index e6b53058c1c7..c9561a2c3e53 100644 --- a/meta/classes/vm-img/vm-template.ovf.tmpl +++ b/meta/classes/vm-img/vm-img-virtualbox.ovf.tmpl @@ -1,7 +1,7 @@ - + List of the virtual disks used in the package @@ -29,7 +29,6 @@ virtualbox-2.2 - hertz * 10^6 ${OVA_NUMBER_OF_CPU} virtual CPU Number of virtual CPUs ${OVA_NUMBER_OF_CPU} virtual CPU @@ -64,92 +63,65 @@ PIIX4 5 - - true - Ethernet adapter on 'NAT' - NAT - Ethernet adapter on 'NAT' - 5 - E1000 - 10 - 0 disk1 Disk Image disk1 /disk/vmdisk1 - 6 + 5 3 17 - - - - - - - - - - Complete VirtualBox machine configuration in VirtualBox format - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + Ethernet adapter on 'NAT' + NAT + Ethernet adapter on 'NAT' + 6 + 10 + + + + Complete VirtualBox machine configuration in VirtualBox format + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/classes/vm-img/vm-img-vmware.ovf.tmpl b/meta/classes/vm-img/vm-img-vmware.ovf.tmpl new file mode 100644 index 000000000000..5280f33509b4 --- /dev/null +++ b/meta/classes/vm-img/vm-img-vmware.ovf.tmpl @@ -0,0 +1,127 @@ + + + + + + + Virtual disk information + + + + The list of logical networks + + The nat network + + + + A virtual machine + ${OVA_NAME} + + The kind of installed guest operating system + + + Virtual hardware requirements + + Virtual Hardware Family + 0 + ${OVA_NAME} + vmx-18 + + + hertz * 10^6 + Number of Virtual CPUs + ${OVA_NUMBER_OF_CPU} virtual CPU(s) + 1 + 3 + ${OVA_NUMBER_OF_CPU} + + + byte * 2^20 + Memory Size + ${OVA_MEMORY}MB of memory + 2 + 4 + ${OVA_MEMORY} + + + 0 + IDE Controller + ideController0 + 3 + 5 + + + 0 + disk0 + ovf:/disk/vmdisk1 + 4 + 3 + 17 + + + + 1 + true + nat + E1000 ethernet adapter on "nat" + ethernet0 + 5 + E1000 + 10 + + + + + + false + video + 6 + 24 + + + + false + vmci + 7 + vmware.vmci + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.32.0