From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a50:d606:: with SMTP id x6mr13917070edi.124.1639561170239; Wed, 15 Dec 2021 01:39:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:6283:: with SMTP id nd3ls599968ejc.0.gmail; Wed, 15 Dec 2021 01:39:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtrVQY+6cfoWv62FD9i/SNKJCOR0LTmnNGjQN6NFOx2Tu3uONIPXZEfUQjA49KLq57J0pd X-Received: by 2002:a17:907:ea5:: with SMTP id ho37mr10417973ejc.133.1639561169274; Wed, 15 Dec 2021 01:39:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639561169; cv=pass; d=google.com; s=arc-20160816; b=LeS0554Bfv4c0Mly+/Kqt0JR77Hc3dCY64zvl2SvkfUI7I0g1A6Jv5NwNra6FZ5A10 hvsUlTV+To8m7NMPqa4MavJ+ziEZnCBe0mn5SP+bYIpWu7VaqF4pK9cuYuNd9Yz4mKNW kgcNrDWqP+SrMQdiToDE6d6pZh8aPCniaFPRdJfZXGPHNpX6KMMEZDqEMrVc4ALU2Y/7 Wsnpq7z0Nb+I2kObm4tRV1C0XFm7D+jWZ0SN0GUDwd9llUTfNEQ/3foBUWFoAxywOip5 OqKxKGUN8YD9Mo/6CGwDPzcXM5o1pD1Vrw5kzk4n7M11v7vOj13Gm+9WYtf0rf1/zy8y t4Bw== 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=KO2R6/m7vy3j+iDJb0Uxd1/wEeQaQPwRwYLbJ8r2EcAS4Yvr7gTgEnCYWPL49pf1Wj aHyjdMowwGP/vl5l344V+jq/Ig4AjnP/TMC3b33fa3Rp2Kc0MKDUVvuzsqyeotCIsOF8 PRt5SeVSu1XCX3PqnlFo5Nyvzgj/Mo0HscpmV1nEoyKvTP8zAbGZ8xq/bRylWXEKFkPn XjU6VrGBLB+5ffI2ph3ENcsVymTxxqZo9UXL0UVKXlDMvaEkucmRvPs/p1D3M2z2jjsw 4kiZXItKXucWzvokgMirOUwg5zPlj4B6O9KscXk93OA1TWTGbMSVEuk9tv8YfpyeOiej huhw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="xz4PL/75"; 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 2a01:111:f400:7e1b::606 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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20606.outbound.protection.outlook.com. [2a01:111:f400:7e1b::606]) by gmr-mx.google.com with ESMTPS id i23si86467edr.1.2021.12.15.01.39.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 01:39:29 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7e1b::606 as permitted sender) client-ip=2a01:111:f400:7e1b::606; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="xz4PL/75"; 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 2a01:111:f400:7e1b::606 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=WoTTtvE/TpSH9E/AjJjmONCI3AuOBt8aVWrJtTH/fLeUWaP8WQAsnzO0mWi1nxRjnNjx4e9Oo1C9Noca0a59UhqpB3UByrvzijGJVIRoP6sfWbQqcvzfOnFl8iDFmyL1LaLJeI+eEPRCrrhBxmEayrNyL9fnM7eEZSG2bfOVoERMreJ/SZTX+5VOvAnT5SG4LxfenpahsAC0VDf18qLWILm6X5E/LO/ssMySqO0JXlnYFR+fN7h2bpHXx9bTzeAJPafd8gTx6cR49fUARB/1WZ3Ky9ZqrmLyLM3RZBoCnD9H99jYP19zH3H53YwMUJRkLceoDl3RmuttTZRrHvr4Ag== 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=kKrdezN9f8R+Qk+7U9XCRlE6ZOKcQbGM0ofD4BJCAM1LxDRO6nWaoOOIq0rIh86gow+5F95oOPi9IlSemz6ZzVmtrqdX/Q/EzTvUMbcY8gfkP1c9IoZAEiFEFFr+AHGs96GHOHISs4D3FxPZFrgeLNcgVyCRIRS8A75Wx0Rm+WNyvX5NTpVB80IaLAj588WDeb10W3+XYM7DF0A4pe1UrtfIRBy3aas6vjd0C+8309qRBPt4LGjVzvObV4ZzMWWNVuyiae7YbLpxjemrs9akkYi8+gBq+zleQizVrymTOsO4YH00DRqKB8A9/qAe0JNha0+edh76U7tDo8j7mB3G9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=xz4PL/75GHvcZQ/zyC5MCaQskyfuoKgiFkbKHh/yXIL2R1y1V28+lQzRmfSbQe+J7OysRHW+qyP+7vkirO0exKmGC1UaTFrA9eETqyv8BVEAlOoe6Jans3tBolgFrbxJWiUBPVvWwZclXPxzswkQqflExLmdztvzynejWby7Hdxfw3aOgnPpfrpMuaF0EIKUBQmgn921CaMQbxSPq4et4+xaSUAlyerQL3v6tCOfSiRGYwFrmRifFp81W7gtTZFUSqRtTIHuFD9u+H5J5w7pJBY/SJz1MFJmdUfg8o1cKrK5W2oCeY3MWaR/CKYv5f6kjxzZMqGbXsR1kAeJh9XTyQ== Received: from DB9PR02CA0017.eurprd02.prod.outlook.com (2603:10a6:10:1d9::22) by PAXPR10MB5351.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:282::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.24; Wed, 15 Dec 2021 09:39:28 +0000 Received: from DB5EUR01FT018.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:1d9:cafe::b5) by DB9PR02CA0017.outlook.office365.com (2603:10a6:10:1d9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.15 via Frontend Transport; Wed, 15 Dec 2021 09:39:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by DB5EUR01FT018.mail.protection.outlook.com (10.152.4.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 09:39:28 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 10:39:27 +0100 Received: from localhost.localdomain (139.22.39.210) 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; Wed, 15 Dec 2021 10:39:27 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v3 2/7] vm-img: use two different ovf templates for vmware/virtualbox Date: Wed, 15 Dec 2021 10:39:13 +0100 Message-ID: <20211215093918.32038-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215093918.32038-1-henning.schild@siemens.com> References: <20211215093918.32038-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.22.39.210] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 98a92eb5-8d3e-4c82-861c-08d9bfaec9d2 X-MS-TrafficTypeDiagnostic: PAXPR10MB5351: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: yt0SOmm8OYb1kNau6FBG4wmkvSfT6Ctm/vgEY4w4UHpfbVVKkkZSHrovBpZyOkrdNQVn+MUGMWb1uDQNrWKG4XgyMIwF5s5wIpF3hPsjUN1nJFi+7AF0Ze9hIkA8clHJSEbJyKsx7t9uVKanNm92BtI8QISf2826PI/kZth/6KNR4XxbGdWQNEo1MVrWN0mZBJIAoIcujWIVQXVch88bEfA5K8ejlxw6ATGWcBjNYY5BNjPBycH5LFdUMfd9faXyHi+Yivn/6bM28KaU005Yl9Tas+GISzicpJ4zjnWUMi55YevXPnkikDLBpC4D/VzVIq+lBzRPmoCDqg1QPLqKbcaq0Bo10DUgjWo2rqYR0P8ffC6KoTZhSZdopm7MIsF4gBizbHCvpmKKQL1ONnMNp5OzSvGKPQkd7s8oPK8N6svjxyaMBCWQOdViY87Az2e/DHe9N0Dmq9iNcbuK1jZx8QElb+QxnMpk5DKVAsXjvexah37cNRQKVy8HrOx7EdQ4zl0fj7Eng5O8qylzzx6YwWCX4UrVbgEJkPK1oxs1sZDxhH7ZWMhwzflLF05WAU75EZ3TOum31KEadXGw73S2z1vahOS6GT8wJVysgyTGwV+2D0asXaKsR7J9VPI71ddQbkKeDNaJJFxnrAWu5raTh1TmI1nl4W1KHIV/E4ry1YR4Erv4ejgQTxZBWNzKsf1zLKuiLqTUkPU60RNgImU8OWX0DChpfd/pA8/dntpszuVSY34ae3665QfUQt9rhVCOYlzQ5fqncl9ZI2ug3Sg0DCNLOS+IR5NMoVV21mN/NvaQxSlM9m7Mey5v75ye3u4CWduxIdDP0S22Cmqy/EwyjOT9mHpyWpeNYDrwlucs9nyEdY2jQAannWNRpzC9C9O/3P6w2Z7Cn6CWS3bpgTj1eJBJQgXUnTNaJD3fzWlOQO9pPiP9QCDIXxAhDKXGVLmY X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(26005)(44832011)(8936002)(1076003)(508600001)(36756003)(70586007)(16526019)(316002)(107886003)(86362001)(2906002)(956004)(82960400001)(7596003)(2616005)(7636003)(186003)(40460700001)(8676002)(47076005)(36860700001)(5660300002)(30864003)(19273905006)(6916009)(6666004)(336012)(82310400004)(83380400001)(70206006)(4326008)(356005)(562404015)(563064011);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 09:39:28.0086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98a92eb5-8d3e-4c82-861c-08d9bfaec9d2 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT018.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5351 X-TUID: mWviCMCzNeIZ 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