From patchwork Thu Jul 8 00:42:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 580 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:e2d8:0:0:0:0:0 with SMTP id l24csp54277oot; Thu, 8 Jul 2021 01:42:42 -0700 (PDT) X-Received: by 2002:a2e:98b:: with SMTP id 133mr9814225ljj.89.1625733762028; Thu, 08 Jul 2021 01:42:42 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1625733762; cv=pass; d=google.com; s=arc-20160816; b=qm+RZBjzihrnTcUzW650P7Nmw3/yh+nEi732RX7lYAE/srFrbK3iHMR6GAlQ+uGr5I RnHY/5s+HwQOp4cYCE0xgCZhlIDfDzcmgzDzWh7ih+tAq3KGftYT4uv2Ic9VX4sS7Qhd bTZs3cMxG++yxwpvnuNAcskiyOYGPqVmIhBWs4Q+U2yC5DA8T0U2O7h3xcsRXvRBiD7Z CN4U41O9tB4D+VBfGYfWoVbY/mj+Pajjdr4c4Gl/iL0oYHGutrAKOO2Vau4hMWE+c6dJ Wr6+UPqjv8L0+i5Bw2F3tiF4as90s43RwHWbutahNSURDm1rHC9lkWctsXE8YBsLXre3 +KOQ== 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=YV986yyFPPc1fblZ2O1F28VbnO76tiilDE6f5ZR/fsc=; b=ljzWI03WXLeitn8ZTVBjUl+d8ZGB8I3O4V+Vf8pIEnckCzEXcwpXY3cZDTJ3uZdixO dEvRqAizyfAIPgAK3LC3HjLRs/CB+ba6myWcsft7y6ZmNfGU21PRk8FNRL0lFR7nxotG yQB+r+epe0Q4NSUiKalq/4R1BYO7FuQ2ZZx8VvwBT3TeaxQCi5+GdEP3wZ0NRDK3GF0z NZMNydrhlsfmxwbslumeMufq6rnU8W+6uykcbnV8PXmJcdTLx3ZySlnzFk5NehAZZEXQ ydop6YuY4pk4u1KtczbiN2tj55NXg9dL6JxY72ONEpDMzN9OhydzH+OKxULvWpx1QGZb IY1g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=E4LRWwFN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbapvtkdqmgqeboa2gmi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBAPVTKDQMGQEBOA2GMI@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 q11sor319339lfp.67.2021.07.08.01.42.41 (Google Transport Security); Thu, 08 Jul 2021 01:42:42 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbapvtkdqmgqeboa2gmi@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=E4LRWwFN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbapvtkdqmgqeboa2gmi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBAPVTKDQMGQEBOA2GMI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1625733761; cv=pass; d=google.com; s=arc-20160816; b=N1hyqq+FnpYrnystuzPMA8qIr8xBH2Maw8GcE9ROrqzzWG1t1sD1/r9dH+j/LbMDea GnDDbCLiHq7YtEFADSRuywIW5lF+iAsngYbOgc0W68Q4PW44LGVeP2R/vQSQvzs0MrhG Zpzi/LO5VKTXSKTaCwcvtwb54vAXT9kxQNo/lkAzg20Q+oc5Ie5Cq9AT+eSbnwO+N7DE 3TcCqC7PDzRXkTZ3j+gxCl5emJSCnKz6FLgWza8iAeNkcCr5xOygvT/wVXAbM6xCgeWJ G0SmfcEB5hHQypPOcUWmJfmoQd1xc3TIradZAY57SXaQtr9rs7WbaY+Fjs9dBp6wjMYQ yTQg== 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=YV986yyFPPc1fblZ2O1F28VbnO76tiilDE6f5ZR/fsc=; b=E2giDffTKPrhzJK4FEGHhdwgWbJVfPOQQTjrW1OiJyuCOLJzhLv2zEtOvKr3ciGZ9V XxB1I/2IU5/TVr8mmt7A3jhLMpFvydVAryyXGXOBPmgYrEv23927m1tnIi8Yq5wTQx+8 jXg7BGtUOUP8grNHyrFy9Y1M5y28UCFY6qRqsINPOR6JYGP8T1dv31YTNO/lEgrFEgzu uLht/0tzSn6dOrwT69RYZrN8ubBjHzZCO78c9yqWznDKBBGA4W1JQm49VCsl4eaSLL9s N6FcZw0b8xtbsqX2aoMN5SPhocKRAZkHG9xy1xO1qqQREgkOWTHhE/VEf9askmCF+KX8 MXqQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 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=YV986yyFPPc1fblZ2O1F28VbnO76tiilDE6f5ZR/fsc=; b=E4LRWwFNP847W/D7Pa3E8WgO6nsy7cxkyxYxW8jcuWKvpZDLYjQSwCgF36qSulhVmQ PqdJskoPHDDotulPlSMC7sTlufoZ1vuUapoDB1wfc6vxb9V8U5lsENvzKuvJdCx45K+A k8u1gnpifFdbeDVRAp9HifLCj8acvOwjRjHk6StYZzueyUErZRIWvoTMWecco1uAefC2 /qD7DFoRoYOEPY98H4VaymYCaXnYZA85tQn3XDxdrtDPKEtp+Sj0r8xxXLaAci4Pa0tR Q9aZW6lKoiGFHuZPNANosPkreDRyOhOu3p61YYDb+Wn/CqiVlSXBv3pobeCDC4OwP0Ei vvQQ== 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=YV986yyFPPc1fblZ2O1F28VbnO76tiilDE6f5ZR/fsc=; b=k0V+rAdDVt8wGnV4D+Z3/7+tqdGfI3hAhCeKiltJKuC+4Al9LUkTKuLSIdK+YM1bpN hpRLBdLog4VrDgUppM/g7LxngbIqVUxJn1SLUDGo6HDBes4lP5BprbnuxyA/BabJxPmt hCqXIGX1kvrbwVzNZvx6vI+pwKKSsJQ2Vf9Vutn+qsCyts3vy2iQeMFJAYDYV2V0uH5g ra3lbY89419CdD9O8XCfb2JmcqeqR+GZeWcQfQIGWagdaABz1hOzS6KvZl6DIIxmoisp T/4prqH2/Z0oLT/wFPR/BxOs/E9hcOYPpDDhqPVvN2h3LdrX7FcUKAes90iJ7HPnI8ic NSQw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530ax/oDIUsp8A40xLBSslVgse4EGMNaOW/Wwf6kwk1dw2Z7ojJb WNY/nnqqb7jCzbvbzuALf2Y= X-Google-Smtp-Source: ABdhPJwGlJulpx08+BUbr9v/6OUS3FmlH4onIVZq9A5tQzHGujfisMN0g+rdoJ4+3tbBHi5HYE0M3g== X-Received: by 2002:a19:4c8b:: with SMTP id z133mr22932072lfa.54.1625733761441; Thu, 08 Jul 2021 01:42:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1a7:: with SMTP id c7ls284100ljn.5.gmail; Thu, 08 Jul 2021 01:42:40 -0700 (PDT) X-Received: by 2002:a2e:7518:: with SMTP id q24mr23386179ljc.283.1625733760417; Thu, 08 Jul 2021 01:42:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625733760; cv=none; d=google.com; s=arc-20160816; b=sM7a1MH7OP9jpSlOwEAD62FhGRSFOGFJAjhB2cKnYhPGPFwiH5J94Tn0/cTa1Faz/E e7Wz7Xe80H4WCbLHS+hFmS2gZHFvCc6qk7M7D/ysWKBt4BxebBz62H2V1AfYUtpssEVX y0yG4pSNPMReWf+K8xK/WeQEO7qIc6Lbx+itFjT0PKlX0ZjGyrVLaVzOKcatOXmUszlP mlGY+l75laQm/ZjRV5+Ba/1RC9d3BYROWtRFTcJ04IWC0UGf5RI+n81Ddm4N+KxMusat 5Hx+HBFIIMen/BRbQwAznXZAcMrgiCfkaWFBFH/5ANoTk3VkXdB0gcITxjxjhWZg/du+ x9EQ== 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=lD8/NbC5mfOIzPIjogzcTHsf+K9gxKQAqxM0A7Oj2rk=; b=USsMvBWI3/J0iXy3C6G6NM34AKoKjJueYC9CGSEdeJ9jQrSLv4t7V2p80dtCefF99q 3X3KS8OyOQHed3kAxFms8hYdRlKVWwLhFu3MZY5Ys7k3r0SzOY2iCr62hrd90t5+wX4T +Uv79AM2Nx+AkwbL9QuhtUe/c07uFGjKvMzzUNjQet0edOI/aoDZN9O3A1Wc08/4RgiG z9RSlhj8fvrGQsf+XFBwKYO42RJiN70gzZrI3opMvMkmccdzED9jsU9MD439+HSlvuzL fWRE9ap/aFJNnZfc1oDEWiwOWkkNSMyiRD/mvlbSs3/a/cftY8dKWubPsfpFcjW9hsce 5DGQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id n127si52692lfa.7.2021.07.08.01.42.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jul 2021 01:42:40 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 1688gdh9013210 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 Jul 2021 10:42:39 +0200 Received: from md2dvrtc.fritz.box ([139.22.43.67]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1688gcWr014170; Thu, 8 Jul 2021 10:42:39 +0200 From: "Q. Gylstorff" To: jan.kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v14 1/2] meta/classes: Generate ova image for VMWare or Virtualbox Date: Thu, 8 Jul 2021 10:42:37 +0200 Message-Id: <20210708084238.2933-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708084238.2933-1-Quirin.Gylstorff@siemens.com> References: <20210708084238.2933-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.39 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?1704705405012929324?= X-GMAIL-MSGID: =?utf-8?q?1704705405012929324?= 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 | 118 +++++++++++++ .../vm-template/files/vm-template.ovf.tmpl | 155 ++++++++++++++++++ .../vm-template/vm-template_0.1.bb | 16 ++ scripts/ci_build.sh | 1 + 9 files changed, 330 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..7b774f4 --- /dev/null +++ b/meta/classes/vm-img.bbclass @@ -0,0 +1,118 @@ +# 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}' + image_undo_mounts +} + +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 +} + +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 LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") + + image_do_mounts + + sudo -Es chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} <<'EOSUDO' + export DISK_SIZE_BYTES=$(qemu-img info -f vmdk "${VIRTUAL_MACHINE_DISK}" \ + | gawk 'match($0, /^virtual size:.*\(([0-9]+) bytes\)/, a) {print a[1]}') + 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 + image_undo_mounts +} + +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