From patchwork Fri Jun 18 05:39:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 543 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:6456:0:0:0:0:0 with SMTP id d22csp201106oof; Fri, 18 Jun 2021 06:39:59 -0700 (PDT) X-Received: by 2002:a05:6402:d0a:: with SMTP id eb10mr5106531edb.139.1624023599016; Fri, 18 Jun 2021 06:39:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1624023599; cv=pass; d=google.com; s=arc-20160816; b=hnGAl7S810DTUoxGX2gBeGttrDM0N+X36J/kwv1haaqFYu9DkfqNF8F33YeQfUiHfB PPXkQNJtSlgAwi4+51cFyvKBw2OYstxSHfPrV5WT6DLgOef3ompmRLsgZJAE94fogs2g YQ/QfTkbcgfeKP/g2UW3MqApmk42AIzhW8aS9zD6oGXpUROqMRDs+UgEXyE5Z6lNkBC/ WX/AdXmJv0YFdWMiFvV7UZyteuFzw6YXo5AKUnzBFgsKSVk+EVuSAFqrpYFoVtfkfQBw QPkWmRp02e/BXQM+78X7E7f6VrT2QB0JMqp3w+a5Cc2+ISic1ekbWugqnXHzgf31EHLR MTHA== 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=tdfQi6YZK4IX3giqkzHMN9Ugo3G0Mo3YpMJabMfKD9M=; b=ulucW5+mnwAlIhmvj1SnsZQS44QsTqagjVNwB1pru2H0s3C08y0wZOkiFepoNJZnl3 2d1pNpbZjHMl/NMU323wx91FBvg+KFMa+SqfPyATTvGn7WmlVTukue5LYw5kFgq645vp Fw99BqZa/GJjH5hXXiLhkcfWb703/Z6byyNchR0BHMB5ZnvEBTwLfKFUihl1IL/MnJYT Cn6oz3WgaLwDOTl9NJue+/8tuirYs6oKFkgBeWbGiVPfojxEHVVsnRRuuSeodJePi/17 LPgNRJeho8h99B4zguhqcGDdnK3pNbLe1yw6+qAXm+OqSfMagyLWhCt2Gh9rASgH8k7C fcLQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="Ctnx1sv/"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbloewkdamgqexvpuvoa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBLOEWKDAMGQEXVPUVOA@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 l2sor1205614ejo.69.2021.06.18.06.39.58 (Google Transport Security); Fri, 18 Jun 2021 06:39:59 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbloewkdamgqexvpuvoa@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="Ctnx1sv/"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbloewkdamgqexvpuvoa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBLOEWKDAMGQEXVPUVOA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1624023598; cv=pass; d=google.com; s=arc-20160816; b=N0T16jYVxIsoC0ijQAPDsVx1+3GEeUmbzeWqO7TkvtBC8PRbq7XmnQfyWLyvc8IJSC sYcbqths6G/H7aMQYZu8azlHiuDL/xihj9WonbWstRxkoOEPdIiWf6wh8TBrrcb+b3Kc iDwOkUxSCXQjcWSjwz1VZESyORH68tRV/M1gHtZXlsfJzFCaxLARw62xWO6WMlabZvu8 I9gKJswQpSnIu+MdufQ8nRksmK64uhg04G+qRPXbAGm/bHvrOPfNfd7+Db4XnPaFNG1D Anb31SGH3pK6IHWgJ3MXcd5VDS4IpD7AVru60tBF7qJ9mBIAaSzB/Ln6I0UZla4S8maH vEfA== 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=tdfQi6YZK4IX3giqkzHMN9Ugo3G0Mo3YpMJabMfKD9M=; b=RHgTWX42VfnPBf8ezebOYKvCxKJ0p6Tfdu2ZIYuA56gifOJtDNRygbIwAu84ONGTtG Re+gjnYkYBCCLO/ooBFR7MfgKQuc8UjCOjqQIAlWRAF+WHygzqLfvOG+LpROc2RyE9zb HuzYPcNInrk6hQqMgEcAz4+Jp6GdZs+WRCACFXfB96wWqlZFUuKxF5UqkcpIpeeBQR+p L6ZeH+k4++nwGsWMD6scEEI5EhLJIxo0tEL3euMSUVKf5bW0yNcQQgXJjz9xY7QSpJzk +5OrVArmPHx/scElaBtXr4N4lERzgt/JIrwKMkusVh5hgyNXN4fRXvxWUtEOuplo2TkC +8Yw== 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=tdfQi6YZK4IX3giqkzHMN9Ugo3G0Mo3YpMJabMfKD9M=; b=Ctnx1sv/+SAeAJjMqOLxtFdfVFClGnGj6RdY8OgkQKqGpjtANgYlrgMiO10ZmpSWcO QnXYLQ9rqwiPU9uT0yFzUHyA0o18B96oGsPJT4h1M+0N9FFvTXIm/iYXeWw5Q6xdGlRj KHinzk61bvW1cleanaD8SuQXwWR9usccLVTrtjVWiSKKHHUd5opa9enFGrygiB2w9imB D0fNZ+B/wNI4hNe/oXO+5yuYwsFCsrv0EIMthtAHm4ES2L+A0+5qXs4etpy4aOf090lD 79LsMIs5AZs/DkbSx3qZKvxiHglYZYNX0cMZAphpyIGt8V9VB3FLm9rvQmQcxZMFJMYe Rswg== 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=tdfQi6YZK4IX3giqkzHMN9Ugo3G0Mo3YpMJabMfKD9M=; b=Ov1fB5GPRIvG/ztc69NRGKqBTVY+IMGEFB4AS4MJBnDlUy1tBsiyWWj/75RXI4fnh4 /3NxhA9jwnZZv4rhgpst5ojBugE4fi+wPviBuzfcXBatzAtszZ9RiBh9G5S3zY4oKsOv MmeokySziSBeOcd0oltNnqxHK/Ik1sOg35Mjp9RgjszeSqo/lW/rsU2ssQsqNzxa8PVK 3TM4X2MPvr1JzIGuXclkCkP2EmgKhxWQJ2WGue+aHfWwwQ+GVOYSlAZvCXiE/1Z2YOkw mpopehwzHic4dp1kf0Cpxt+d+E6BQ8+ZN16hcMCEGyNP9KXLrX4mzkjFO7dyCfohT9G0 xQ+Q== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533L+OozbZvsqCKQ7uh2Q6UGYmGDrAMHczUq7geM9Go+JzyV0JnA +fDw5XjrjTQwepUcCEHV6Q0= X-Google-Smtp-Source: ABdhPJxsE8ZUiTwQDKyypLDj1/f2zRX7Uy6cDYWGMaIGQ9fIlzjcevaGte6AEFW2cvA1dIigZ8sCWw== X-Received: by 2002:a17:906:3109:: with SMTP id 9mr10898916ejx.339.1624023597799; Fri, 18 Jun 2021 06:39:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:7c16:: with SMTP id t22ls1432220ejo.11.gmail; Fri, 18 Jun 2021 06:39:57 -0700 (PDT) X-Received: by 2002:a17:907:779a:: with SMTP id ky26mr11113586ejc.293.1624023596915; Fri, 18 Jun 2021 06:39:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624023596; cv=none; d=google.com; s=arc-20160816; b=pZYwteEsv+CYDnojTjcLjKNCTd1qsu/3BoL64gyXwPm+a8CYL70uEJWivuiXdOEYQC CZ9JzVT3aZu1KV8dZv9bqyR3izMv3/J5uRnMx2yLCWx0y4M4jOkebHZxQlnrITo8CyzH OmK7HFsfKN/BbQ9wGu3M/CuJ0jHYa+IOgTG4zKjyyIMiA3xiX4gg2tgqoQbnQZ0jLXZn 6e2ciWoO3fcrfAPKobSzoMSvShb4WstPYX9Nqjbt8RPhPfBNnRad8qQnC/TtzGVHWQKw OX17B0LzPRB9bgSekDBiC0Mw6RXlGJU7eVLnJHbv4RHiPOw84Rsm2lBCG2CcPTfKF4Tl ZYhw== 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=JegkkMML9t326V7UZkt6YECEa3vBHz84tYseUUmN4Qk=; b=porS3yfm8JrXoem8ukYd4DB85r1KObPEHvaeOIYlpEOy5V2YZffyDAzJL8jUmcgCLr zrldqDbcmbZxCSScbtgl2iyP0jQKvEIzpF4/uuvhC2lMGM/Hqj1ocVGdHMb3z82u62ql co6ZaVIa49tx1VrqSMZXrciBMSi79DSJZcuGDOjI4k4c8JhoMG2LjR89CX3chzai9z1L fZBuqI1gNLB21pre7ecNB5ACrZRicKSTqzcIE2f+Gt1SvTPZzCAMpHCpA7W4owMrv15q V4jvEs+chFomnhxf8YvfAiFjx+XN5y1YOq6XrAp2Z9cS0c1izUsh2Jc3Ryu+JHPSHVTY wp0g== 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 x10si133030ejy.0.2021.06.18.06.39.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jun 2021 06:39:56 -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 15IDdupG018061 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 Jun 2021 15:39:56 +0200 Received: from md2dvrtc.fritz.box ([167.87.2.150]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 15IDdtlT017493; Fri, 18 Jun 2021 15:39:56 +0200 From: "Q. Gylstorff" To: isar-users@googlegroups.com, amikan@ilbers.de, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v12 1/2] meta/classes: Generate ova image for VMWare or Virtualbox Date: Fri, 18 Jun 2021 15:39:54 +0200 Message-Id: <20210618133955.22505-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210618133955.22505-1-Quirin.Gylstorff@siemens.com> References: <20210618133955.22505-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?1702912169010010654?= X-GMAIL-MSGID: =?utf-8?q?1702912169010010654?= 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 | 15 ++ meta-isar/conf/machine/vmware.conf | 15 ++ .../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, 334 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 cf7dc2f..2f7df87 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 6cf1656..7b20a62 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..b20eaca --- /dev/null +++ b/meta-isar/conf/machine/virtualbox.conf @@ -0,0 +1,15 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +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..731559e --- /dev/null +++ b/meta-isar/conf/machine/vmware.conf @@ -0,0 +1,15 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +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 49d6aa8..b1bbe51 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