From patchwork Thu Apr 22 00:32:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 449 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c543:0:0:0:0:0 with SMTP id j3csp258707ooq; Thu, 22 Apr 2021 01:36:04 -0700 (PDT) X-Received: by 2002:a17:906:1b54:: with SMTP id p20mr2200332ejg.477.1619080564093; Thu, 22 Apr 2021 01:36:04 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1619080564; cv=pass; d=google.com; s=arc-20160816; b=gMXUemaHvn+uGkU4Ag9XpFYkZOfc37WKLlqICJddwYM9lkFqO2ms2Z/fQBc5S7BfTb 9CO++yFgWYQE3QZCRloK9XrYmweAAT0vCrUno6bn3MkwgxMMQcHdIBKmZ5v3b0uYTVK1 KlQSdVlDUbUavldIbcNaj9sAN0sx57LGick6llXQ11g2uoxKWd/7jv/PkI+gzJ9fTij5 2UYTghcdEUMbVdMqYWHukdE7ipzc87l0zaGegFymHXoEdjNiA7P1igUK3cikgDRmJk6Y EjPGn6/dG8cR4ft8qxzO2tNyT8WeYarXSjqET5LjkXmhakPFLFTrz/bRYZZDVarrA8kQ meYw== ARC-Message-Signature: i=3; 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:sender:dkim-signature; bh=dnCz7GfR2w/52ulqgyRCa90kpejXMdbwh+FfNK6FbAM=; b=HzVeGnIs2cZxmzzj7Ds79o6C1ibn1Rcvcil5JmDEvbcZ4e/jZ3xdU6DV1/ID62tSqi BBHLIjTA0fHQxmHECSR5VjBTl962lx8ZDloB9Kpaf3tel3LZ6xaFypEpUWrONt0BEh08 McoAk0vndrri6VqSQap26RO1cVld4GaZx7vk43QMCBrxn3a1+1VBsxYUvWnDDRWGxaJO HxEApFFjXPliJ8O3VtXgZhssFKXNn1zDr8o5FVKq6CRXhJYWpR3vswoahZLVSMUpI0E/ 2Vtt+DZtK7nxht02afOo2HkuxVEtCs/vr8Ynm/6cJQOoqZmUkwAUbe4b0By7phiDhxlQ gokQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=kfrNt2LW; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrb47kqscamgqeykn4aea@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRB47KQSCAMGQEYKN4AEA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id v4sor3015623ejg.76.2021.04.22.01.36.03 (Google Transport Security); Thu, 22 Apr 2021 01:36:04 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrb47kqscamgqeykn4aea@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=kfrNt2LW; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrb47kqscamgqeykn4aea@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRB47KQSCAMGQEYKN4AEA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1619080563; cv=pass; d=google.com; s=arc-20160816; b=mEvNy6PINehRgPlS8Ws4ZNGSGH/kwgtk1VdF25WfIBy8l7EmZJ152+rdd3CgYmVE0k WIno+RqkuflOvoRMuTRMhJ8MEJql8YaYTudNzqJ8xddTUo/W1f5piRws+bcetV5r1oPo ljjQcIxZrPsRO03G1DilU536jbl2kn9OqsB3rVuuefrTBR49wgIs21sZHWxRx/rOWJQL s548HnK/Qx5CIsIhFV/hL4VgJL1X2ftMCY1z37kwt3Gw7HODD5/iiGavuhtixCF+e8yH B3ED5c4laZn9O4MjPm5jG5QK1J7H0F/TKeRccgZ/jr+muCeOSI70PK2GdkQbsUiSMxaj omnA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:sender:dkim-signature; bh=dnCz7GfR2w/52ulqgyRCa90kpejXMdbwh+FfNK6FbAM=; b=jmxUjjstYITAPuML81XHNbqrbFdZZI35dJEUsfj+ES+jPcKbpj3vdIv7AgXeCmADr2 ljQb6i+WXwvo7rBDUsQSUAhgdQ+czQtXEAZ+9KAnrWsvaHTRx0KzOM5XRD4TI2bKNrHs O8VzYIgUtMlbiOVRc3YyB3xluIjfW8iVgGBH03FgpG3+EQCBbfxZQbCwKSyUHW2gycND coSzI8gVCXO/T1Pbfre28dIrf0ZPYsbPVA+pAbVdWajotcDAcS0mNzBfW7IW4AYkq7sA BDeLTjnfJ9cEKRMeWOWw77OZnhLAfquhbKzpbQE73+g+PWQOH0wWtzbdTg8P5KD8clVo UiuA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@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=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=dnCz7GfR2w/52ulqgyRCa90kpejXMdbwh+FfNK6FbAM=; b=kfrNt2LWKy/hpor4NbZ4iqaCRZ1jlZhzQBvG3PFVAMddXCpgu941VV/JHVd5SdgISD acU1Ng+bIfVHWXNYmmOhxElSzAc4xnov+VsAQpDj5dq2ydQl5zpd17m9GKupzuOmzZne Lh+MLQ4tTH+EzbrePbxw2cElo6xNkBewKAtIdT87POdGOBuNEVHN2WHQ4CI/hTtkmOmf QHSQEtQ321C/ZorJcWA8L/Xh5GWRweeGlJDUjv1NKRmDu+E3219zntV/BWLJ4a4TjLAd DYxd8kPADbv7lsRvW5wBP9raLSJ6xVHykJXzbGkohn+Y3K0c4f9gWaBoo1+If+G6veR4 hIcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=dnCz7GfR2w/52ulqgyRCa90kpejXMdbwh+FfNK6FbAM=; b=L+UV/cHMHJMZ3F9OGVEfQlYPi+Ic8awbZuuAGfBQJr+mD9Y1Ds+l7P7eOXXK8n/LNB N8uk4t2nqtuIi/AIEKzkBskO0rCzrvxJTPdjLlLgGqW5x4mu1BYOrFGxkdBVOm+ckeoV FZxPff13z0CSlYx18f9GpZpOgSdMoGhRhrVYkQ1dnWb0E0viJPRI9AM2bvcYpDvTwLwZ 5vYMrJ9zoh4sKgm+sSaEA9boohGYqTK7pmV5PKJQzsHO9Ta3JjZj0vTPopiQRWsRDjXM hkIU03mB3+BDGQC/XWfHlr86z+/qXRfIxWpVVHw29hpuutLSlyS52u1PlA8fFOVJZhT+ 9XYA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533LVhNqvY5WVlSh2knXBcDF1LsLpvvvsNva+crjFXrUewcVZlAE UFCwUtcTB1lhUB5snVcTguA= X-Google-Smtp-Source: ABdhPJzf+VgqxDv5xjpiXM0UU8E42rYsLG/BHgQDy81Q8CF+kJcvuiVZXZL+6lZwqEvWJ1NRFGCdEQ== X-Received: by 2002:a17:906:cb2:: with SMTP id k18mr2221662ejh.183.1619080563619; Thu, 22 Apr 2021 01:36:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:970c:: with SMTP id k12ls2430127ejx.1.gmail; Thu, 22 Apr 2021 01:36:02 -0700 (PDT) X-Received: by 2002:a17:906:f1cf:: with SMTP id gx15mr2230628ejb.143.1619080562801; Thu, 22 Apr 2021 01:36:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619080562; cv=none; d=google.com; s=arc-20160816; b=PCFa4wJcYt4efVzFUPAVkENcT58jdYaKn/FIgqu9AJmALYIXFrt2nQGVs59QO++aXc wyULQzthMO62v5MB8P0P88TXnEOSLe4MJ/yMkWpmKfSh0obv4IPJwdWIh5LL/v3VUcKx nHAbl/ptt+MbOitKxb/3TkhLfXYEP91GuvkOIIUaSyWjSfTv/pCOnoXLCtf/K7rbBFG/ zbVOE4m9kwJhE7Jdkb5zn/Vfh1fciZK0yDY/GKLZpO2na1bfWdfcGdKH8lXQvBao9fuM yVVwqY4YeZ9/wyWstHov8+kc/kXdEOgsiAfYftyOeBiGdH8j4d2B6LiwVQo70tTj1LZh 7UOg== ARC-Message-Signature: i=1; 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; bh=8qfaXd/pSrvhSW4ouiZx0JfI6C+1D6qVFzyowILc64c=; b=GGqrqHqeqeNhZA7j3nQAE7zfI0NtRs1al6WhFDN0jxObr/OqYcnjtxfUspzTs6yODG R///5yNB8xrehsZs0NXAfbIxluM6M9vQuuOoylR1reeBR82Kk61wSVothsY0kPX96B3Q Davh9eT05T2QsTsP+fSo7eA69Vh4zD+FYcPkA5vfoGEopUl94FGbnGQ0cLwUNtGC+Vyb q8QVl9bImSKwK6R+j6zG+4i14Q7rEkK7jTu5W8nwumyK1vpPrF8KsI3JcThCg3TMbaTf juY6m888JhsKl55TXDOQK802/NS/F3C5ltSDicO5JZMYszj+IC1kIWVbxAWkED/qNFEF Tt6A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y16si506100edq.2.2021.04.22.01.36.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Apr 2021 01:36:02 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 13M8a2ZI031015 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 Apr 2021 10:36:02 +0200 Received: from md2dvrtc.fritz.box ([167.87.28.149]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 13M8WOFq025851; Thu, 22 Apr 2021 10:32:24 +0200 From: "Q. Gylstorff" To: Jan.Kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff , Jan Kiszka Subject: [PATCH v11 1/2] meta/classes: Generate ova image for VMWare or Virtualbox Date: Thu, 22 Apr 2021 10:32:22 +0200 Message-Id: <20210422083223.2751-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210422083223.2751-1-Quirin.Gylstorff@siemens.com> References: <20210422083223.2751-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1697729021686452419?= X-GMAIL-MSGID: =?utf-8?q?1697729021686452419?= From: Quirin Gylstorff This allows to generate a ova file for virtualbox or vmware. The images differ in the setting of the variable `VMDK_SUBFORMAT`. - `streamOptimized` is used for Vmware Workstation - `monolithicSparse` is used for Virtualbox This is necessary as virtualbox throws an import error for a `streamOptimized` version. The ova for Virtualbox is also bigger due the disk format. The default machine settings are: - 4 CPU Cores with 8GB Ram Signed-off-by: Quirin Gylstorff [Jan: shortened named, reformatting, massaged comments, added to local.conf] Signed-off-by: Jan Kiszka --- doc/user_manual.md | 1 + meta-isar/conf/local.conf.sample | 1 + meta-isar/conf/machine/virtualbox.conf | 16 ++ meta-isar/conf/machine/vmware.conf | 16 ++ .../multiconfig/virtualbox-ova-buster.conf | 8 + meta/classes/vm-img.bbclass | 122 ++++++++++++++ .../vm-template/files/vm-template.ovf.tmpl | 155 ++++++++++++++++++ .../vm-template/vm-template_0.1.bb | 16 ++ scripts/ci_build.sh | 1 + 9 files changed, 336 insertions(+) create mode 100644 meta-isar/conf/machine/virtualbox.conf create mode 100644 meta-isar/conf/machine/vmware.conf create mode 100644 meta-isar/conf/multiconfig/virtualbox-ova-buster.conf create mode 100644 meta/classes/vm-img.bbclass create mode 100644 meta/recipes-devtools/vm-template/files/vm-template.ovf.tmpl create mode 100644 meta/recipes-devtools/vm-template/vm-template_0.1.bb diff --git a/doc/user_manual.md b/doc/user_manual.md index fec9896..2749ef0 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -454,6 +454,7 @@ Isar can generate various images types for specific machine. The type of the ima - `rpi-sdimg` - A complete, partitioned Raspberry Pi SD card image (default option for the `rpi` machine). - `wic-img` - A full disk image with user-specified partitions created and populated using the wic tool. - `ubi-img` - A image for use on mtd nand partitions employing UBI + - `vm-img` - A image for use on VirtualBox or VMware --- diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 77585ec..6c1d299 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -64,6 +64,7 @@ BBMULTICONFIG = " \ nand-ubi-demo-buster \ nanopi-neo-buster \ stm32mp15x-buster \ + virtualbox-ova-buster \ rpi-stretch \ sifive-fu540-sid-ports \ qemuarm64-focal \ diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf new file mode 100644 index 0000000..8f33ae4 --- /dev/null +++ b/meta-isar/conf/machine/virtualbox.conf @@ -0,0 +1,16 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" +BOOTLOADER ?= "grub" + +WKS_FILE ?= "sdimage-efi" + +IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" + +VMDK_SUBFORMAT = "monolithicSparse" +IMAGE_TYPE ?= "vm-img" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf new file mode 100644 index 0000000..02a349a --- /dev/null +++ b/meta-isar/conf/machine/vmware.conf @@ -0,0 +1,16 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" +BOOTLOADER ?= "grub" + +WKS_FILE ?= "sdimage-efi" + +IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" + +VMDK_SUBFORMAT = "streamOptimized" +IMAGE_TYPE ?= "vm-img" diff --git a/meta-isar/conf/multiconfig/virtualbox-ova-buster.conf b/meta-isar/conf/multiconfig/virtualbox-ova-buster.conf new file mode 100644 index 0000000..3042556 --- /dev/null +++ b/meta-isar/conf/multiconfig/virtualbox-ova-buster.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + + +MACHINE = "virtualbox" +DISTRO = "debian-buster" diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass new file mode 100644 index 0000000..d5fc3ac --- /dev/null +++ b/meta/classes/vm-img.bbclass @@ -0,0 +1,122 @@ +# This software is a part of ISAR. +# Copyright (C) 2019-2020 Siemens AG +# +# This class allows to generate images for VMware and VirtualBox +# + +inherit buildchroot +inherit wic-img + +IMAGER_BUILD_DEPS += "vm-template" +IMAGER_INSTALL += "qemu-utils gawk uuid-runtime vm-template" + +# virtual machine disk settings +SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic.img" + +# For VirtualBox, this needs to be "monolithicSparse" (default to it). +# VMware needs this to be "streamOptimized". +VMDK_SUBFORMAT ?= "monolithicSparse" + +VIRTUAL_MACHINE_IMAGE_TYPE ?= "vmdk" +VIRTUAL_MACHINE_IMAGE_FILE = "${IMAGE_FULLNAME}-disk001.${VIRTUAL_MACHINE_IMAGE_TYPE}" +VIRTUAL_MACHINE_DISK = "${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}" + +def set_convert_options(d): + format = d.getVar("VIRTUAL_MACHINE_IMAGE_TYPE") + if format == "vmdk": + return "-o subformat=%s" % d.getVar("VMDK_SUBFORMAT") + else: + return "" + + +CONVERSION_OPTIONS = "${@set_convert_options(d)}" + +do_convert_wic() { + rm -f '${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}' + image_do_mounts + bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${WIC_IMAGE_FILE}" + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + /usr/bin/qemu-img convert -f raw -O ${VIRTUAL_MACHINE_IMAGE_TYPE} ${CONVERSION_OPTIONS} \ + '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}' +} + +addtask convert_wic before do_build after do_wic_image do_copy_boot_files do_install_imager_deps do_transform_template + +# User settings for OVA +OVA_NAME ?= "${IMAGE_FULLNAME}" +OVA_MEMORY ?= "8192" +OVA_NUMBER_OF_CPU ?= "4" +OVA_VRAM ?= "64" +OVA_FIRMWARE ?= "efi" +OVA_ACPI ?= "true" +OVA_3D_ACCEL ?= "false" +OVA_CLIPBOARD ?= "bidirectional" +OVA_SHA_ALG = "1" + +# Generate random MAC addresses just as VirtualBox does, the format is +# their assigned prefix for the first 3 bytes followed by 3 random bytes. +VBOX_MAC_PREFIX = "080027" + +macgen() { + hexdump -n3 -e "\"${VBOX_MAC_PREFIX}%06X\n\"" /dev/urandom +} + +get_disksize() { + image_do_mounts + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + qemu-img info -f vmdk "${VIRTUAL_MACHINE_DISK}" | gawk 'match($0, /^virtual size:.*\(([0-9]+) bytes\)/, a) {print a[1]}' +} + +OVA_VARS = "OVA_NAME OVA_MEMORY OVA_NUMBER_OF_CPU OVA_VRAM \ + OVA_FIRMWARE OVA_ACPI OVA_3D_ACCEL OVA_CLIPBOARD \ + OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE" + +# the ovf template is updated with ensubst +# this function adds the variable from OVA_VARS to the environment +python update_environment() { + template_vars = (d.getVar('OVA_VARS', True) or "").split() + if len(template_vars) == 0: + return + + for varname in template_vars: + value = d.getVar(varname, True) + if value: + os.environ.update({varname: value}) +} + +do_create_ova[prefuncs] += "update_environment" +do_create_ova() { + if [ ! ${VIRTUAL_MACHINE_IMAGE_TYPE} = "vmdk" ]; then + exit 0 + fi + rm -f '${DEPLOY_DIR_IMAGE}/${OVA_NAME}.ova' + rm -f '${DEPLOY_DIR_IMAGE}/${OVA_NAME}.ovf' + rm -f '${DEPLOY_DIR_IMAGE}/${OVA_NAME}.mf' + + export PRIMARY_MAC=$(macgen) + export SECONDARY_MAC=$(macgen) + export DISK_NAME=$(basename -s .vmdk ${VIRTUAL_MACHINE_DISK}) + export DISK_SIZE_BYTES=$(get_disksize) + export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") + export OVA_FIRMWARE_VIRTUALBOX=$(echo ${OVA_FIRMWARE} | tr '[a-z]' '[A-Z]') + + image_do_mounts + + sudo -Es chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} <<'EOSUDO' + export DISK_UUID=$(uuidgen) + export VM_UUID=$(uuidgen) + # create ovf + cat /usr/share/vm-template/vm-template.ovf.tmpl | 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. + if [ "${VMDK_SUBFORMAT}" = "monolithicSparse" ]; then + echo "SHA${OVA_SHA_ALG}(${VIRTUAL_MACHINE_IMAGE_FILE})=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE} | cut -d' ' -f1)" >> ${PP_DEPLOY}/${OVA_NAME}.mf + echo "SHA${OVA_SHA_ALG}(${OVA_NAME}.ovf)=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${OVA_NAME}.ovf | cut -d' ' -f1)" >> ${PP_DEPLOY}/${OVA_NAME}.mf + tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.mf + fi + tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} +EOSUDO +} + +addtask do_create_ova after do_convert_wic before do_deploy diff --git a/meta/recipes-devtools/vm-template/files/vm-template.ovf.tmpl b/meta/recipes-devtools/vm-template/files/vm-template.ovf.tmpl new file mode 100644 index 0000000..e6b5305 --- /dev/null +++ b/meta/recipes-devtools/vm-template/files/vm-template.ovf.tmpl @@ -0,0 +1,155 @@ + + + + + + + List of the virtual disks used in the package + + + + Logical networks used in the package + + Logical network used by this appliance. + + + + A virtual machine + + The kind of installed guest operating system + Debian_64 + Debian_64 + + + Virtual hardware requirements for a virtual machine + + Virtual Hardware Family + 0 + ${OVA_NAME} + virtualbox-2.2 + + + hertz * 10^6 + ${OVA_NUMBER_OF_CPU} virtual CPU + Number of virtual CPUs + ${OVA_NUMBER_OF_CPU} virtual CPU + 1 + 3 + ${OVA_NUMBER_OF_CPU} + + + MegaBytes + ${OVA_MEMORY} MB of memory + Memory Size + ${OVA_MEMORY} MB of memory + 2 + 4 + ${OVA_MEMORY} + + + 0 + ideController0 + IDE Controller + ideController0 + 3 + PIIX4 + 5 + + + 1 + ideController1 + IDE Controller + ideController1 + 4 + PIIX4 + 5 + + + true + Ethernet adapter on 'NAT' + NAT + Ethernet adapter on 'NAT' + 5 + E1000 + 10 + + + 0 + disk1 + Disk Image + disk1 + /disk/vmdisk1 + 6 + 3 + 17 + + + + + + + + + + + Complete VirtualBox machine configuration in VirtualBox format + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/vm-template/vm-template_0.1.bb b/meta/recipes-devtools/vm-template/vm-template_0.1.bb new file mode 100644 index 0000000..1d474cd --- /dev/null +++ b/meta/recipes-devtools/vm-template/vm-template_0.1.bb @@ -0,0 +1,16 @@ +# This software is a part of ISAR. +# +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +inherit dpkg-raw + +SRC_URI += "file://vm-template.ovf.tmpl" + +do_install() { + TARGET=${D}/usr/share/vm-template + install -m 0755 -d ${TARGET} + install -m 0740 ${WORKDIR}/vm-template.ovf.tmpl \ + ${TARGET}/vm-template.ovf.tmpl +} diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index adc22e4..a77cf5a 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -43,6 +43,7 @@ TARGETS_SET="\ mc:nand-ubi-demo-buster:isar-image-ubi \ mc:rpi-stretch:isar-image-base \ mc:qemuamd64-focal:isar-image-base \ + mc:virtualbox-ova-buster:isar-image-base \ " # qemu-user-static of <= buster too old to build that # mc:qemuarm64-buster:isar-image-base