From patchwork Fri Feb 5 05:57:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 305 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:3788:0:0:0:0:0 with SMTP id r130csp2310010oor; Fri, 5 Feb 2021 07:57:16 -0800 (PST) X-Received: by 2002:a5d:5544:: with SMTP id g4mr5636591wrw.59.1612540636158; Fri, 05 Feb 2021 07:57:16 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1612540636; cv=pass; d=google.com; s=arc-20160816; b=NanX2O/RoqS89Sai3CkQFrV+pbVqnk9TIi9REfH7Ynxq6g5olovrNmR4O5l21UIqMn TtCvp+7tcnxbg8tGgioWP8MOYslsI7Pw6/ggaImf4lVR8oO7Xg10iHLAWRK+kIIhlOsO k0HbX0EN1CIh+hm4Y4dRbU/H7SEh6XT36qU81xUVOoDvwWkuJj745ugazU8vHykJkM1u L2ymTjB6WLry7hfRPyGtQ0+5QX4NozCQKPeUx9Uc9vZluURS9bopNwn9ICkwtzuyRcAJ bNkb9JC6+HmWdWgkiUQhDKQ4kwHy3mxbRosyL3ILbp4rRbK41T9lA/zYleHJNPfjN51U pOFQ== 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=Up73H2yOEPRbGfj23Ve2O5ZOzZr/ZL2RiW752FnzudE=; b=dKtgaZ7b5k9VzUT3/JMchkUNHZw/J04ohqbkBMe/KgR/C9MEBAjatbeIYTM7+LMS21 /JbZTBMjLfx1j4QHg84H7hFSJSu2XjV7bGwTWKDslnI5a1zFGgIIrz/42MwfcodIUWZf pM+yswZBGSruLjru3EHz7dn2KweKzlobXxsBbXVKNyuS9kQXay4FK1+IQnZgs/JsCVv5 gHhMvTrF836JoPvi/zEulnnia5s9p74TyD78y2Unitqz8rvud/X8SwFFLWXbgR630IKS SRUaE4TXFO4yuNSv3yhrSmOn+ZSxnzQbJmB6ykzpNdH672weYHPKkAd/Iauht565G0Nk qZww== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=qe91Oopx; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbw6v6waamgqeknw6gei@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBW6V6WAAMGQEKNW6GEI@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 b14sor5126601wro.17.2021.02.05.07.57.15 (Google Transport Security); Fri, 05 Feb 2021 07:57:16 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbw6v6waamgqeknw6gei@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=qe91Oopx; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbw6v6waamgqeknw6gei@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBW6V6WAAMGQEKNW6GEI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1612540635; cv=pass; d=google.com; s=arc-20160816; b=XUFoB5c/SqqHNL+bszB4o8z1Z+A1iNLznIx6HMjyr5312jTz4ycd2a3ShtGdR7jlj5 60MAOIw5BFn6AGWAQeadLSqySbVm5XRNjd+zvf0opQgK8NvB3z3M2W4R0Qh/9HAEnuiN t0IhpUDWsm9b499MBufyNqOnrYPRiXZPxGTN+v3QmU4tViWHbcxEJ5khB4CPbwPpGUUO CONqAzgJ/+N3zdrjiRv2AYeQaGUzZblRKooMMZIuRCiSRvhl9BLIPPNtYRkyfEGSLFr5 M8JPciv/m3mDgzOm6mJI8220jpYvxLHIJFYOxeHGVLFqw3oT+uYQLeza8GAcgnK9xu/3 nDlQ== 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=Up73H2yOEPRbGfj23Ve2O5ZOzZr/ZL2RiW752FnzudE=; b=lbMHj8UTilmOG/X2+pUlFjcyLMbM2QqEweNPHjNvE38LZB3geKZMCH7R2zazXpK6zL 6EWBgJ5jroM3dYbpj/7lgbqcqzymRi5Pg1ppC9rXkwtnO4769AScvvQiS6IqsuIyRRSK taKMYof7KHBzXxwgDb7d7grzmWq3/3FDQpJmW2s0ss+nq/LzuJzo4Utx9bPh+GWLVRhw PS/bKxG9MOQB1pD85omxunYprfeEY6WQs7acsxdNiPwpeq0bj4xsM9M8gqnWUKZpBG5l H3pPMknPWR/o6ItIwV8+jRY5LmvouiHN+ywvc762dpRX91n5/Izz6JdskqG2pSFe3IR3 ZQWg== 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=Up73H2yOEPRbGfj23Ve2O5ZOzZr/ZL2RiW752FnzudE=; b=qe91OopxBWBIY7pRhbgbAdGaguef219HIH82Lh0iIGXTthbcpaubrCVgPAtRnxS4ty mKgso9YTX1X8os/skn95qaWC0LemVpK/D92cxcwilZgO0HuV5jhHbFSOn4vAfB6saHTB gLssWrbDuPk3fTiyCzBORf9KRaOcDsvDX845zs4qDaAFOWmysxERbMpTvZ+sSQ2C+quq 5/78rguwckFu56jswkyg/4cadxA/52VCPP8bwu8LcDFcToHNMgnfvMpkYo5D6hYuUni/ LN8Xl/JWUDccWAQpKUbSEfcVnRO/UDcg9zB5NUFcdHdD4j7Gq4HJ9VJJEIWw9bETSh/y Cpow== 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=Up73H2yOEPRbGfj23Ve2O5ZOzZr/ZL2RiW752FnzudE=; b=dMC/EAfuihC/Ib4+N9V9+1kAGyPFWg8qDHx4UHJKnZiC6VvWDU04ucKPC+dZ75KNsS 9ZjCB4xV51qxsMjHG3TrTxqX5PMY2LXG6bJ92NmLxpAQ/QquXs3ssdiaQ2bp6098PzCk u9VAIk97bHZczVlwLPQmEDyHwCwxQJm1gV/VCNjsXURf/rCjCkoeY0LrcyPg66tRh93X gJ2xDfxy2fY+KFiB1huZ0o8DBWNpVto4cUTdz/gKmQCNKFAdoIYcUehmuBXO/6beEQDu PNrwXGHL0VJ4r5QUXoVO8lTsxr2kIGbePPOdBl/nE21aKsPzXzj49QYALF6yotKin8vp MaFg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533GRRYZoE7819jLoHRhx/kNr9EP4M1Bzm875A1h51hwOPOVMkix YjMYtHipDItuGj5p99hXERI= X-Google-Smtp-Source: ABdhPJzXW7EJeTBkxx7MJf6DUFwrjPdAYLjjpeB3v4gox7SUWyzKeON9OgsTeuidbCGaufbJF760nA== X-Received: by 2002:a5d:66ce:: with SMTP id k14mr5692677wrw.397.1612540635308; Fri, 05 Feb 2021 07:57:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:60c2:: with SMTP id u185ls4370806wmb.2.gmail; Fri, 05 Feb 2021 07:57:14 -0800 (PST) X-Received: by 2002:a1c:f70c:: with SMTP id v12mr4083332wmh.77.1612540634506; Fri, 05 Feb 2021 07:57:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612540634; cv=none; d=google.com; s=arc-20160816; b=sTE5lJGpKEHooUkMFcbquEIYXLfM562B8rfUESl9PNYbKSEHgZewvmAndsyVvLEo6/ 7w9c8N0G2V86Y7xp67z7W2oVX1XPet5xtD5QihhEsoKayMv3MCE12qYsie1Mk2Mm/KrQ ifjq6BjKYu0UZDgSn4+vHoEwEoh7XXEtlbS8G6zvfQpznxUXbuhJBO1ggeNSVw0kP21A QDLGA1xcHHLcxDFjjdB9CWiNldasAYHUb+EcQ1rRt8BOhn1Ep2Yk1ldwCncefRT7GyIq xqZihwTW48GA5H7vT7XbJ14qAb7SQTGpmgC+TnN7XkkSB/AOKfkPQwEZzu1DXjq7w+9X cAcQ== 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=mcQspqCs2cf3ZSFjlJ78EytYU658nM6Yk/x3of8jfOk=; b=jPAjmvt+h0aYTm1F6jGYo2wsRJYqx6QK9CPS1TcI+GxsmKRHYFW+5KJY5S9We+y6X4 Ipl3apOIINit1fhBKoEGeuGSDVIDx5LM8vjyki8R2luwSQP5dZA1dvm1Fmya1mcRpa7z Kne6C9UnL7XUVvwykRsSjQH98vVg1GGZJjAxnp/nAuhYEnylKC3UlwfPGmTGdG0nKRGW YIMkOlkUQBHb/Tbl5Rr3WhHqIlmDZDSHueFciwUG4EmilIS99T0u5A5eeq0Gdg7hSs7S JRrYOVnlLgkjYkxNh6vxRwCR6HL8KBdzV6n2DUrvCcSNig+OFkzCw0yTYy+XYFySYHEY vDdg== 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 e11si571032wrd.3.2021.02.05.07.57.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2021 07:57:14 -0800 (PST) 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 115FvE6n011613 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 5 Feb 2021 16:57:14 +0100 Received: from md2dvrtc.ad001.siemens.net ([139.22.33.9]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 115FvDVg013323; Fri, 5 Feb 2021 16:57:13 +0100 From: "Q. Gylstorff" To: Jan.Kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v8 1/2] meta/classes: Generate ova image for VMWare or Virtualbox Date: Fri, 5 Feb 2021 16:57:12 +0100 Message-Id: <20210205155713.29133-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210205155713.29133-1-Quirin.Gylstorff@siemens.com> References: <20210205105235.29169-1-Quirin.Gylstorff@siemens.com> <20210205155713.29133-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?1690871409724024788?= X-GMAIL-MSGID: =?utf-8?q?1690871409724024788?= 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 --- doc/user_manual.md | 1 + meta-isar/conf/machine/virtualbox.conf | 16 ++ meta-isar/conf/machine/vmware.conf | 16 ++ .../multiconfig/virtualbox-ova-buster.conf | 8 + meta/classes/virtual-machine-image.bbclass | 104 ++++++++++++ .../files/virtual-machine-template.ovf.tmpl | 155 ++++++++++++++++++ .../virtual-machine-template_0.1.bb | 17 ++ scripts/ci_build.sh | 3 +- 8 files changed, 319 insertions(+), 1 deletion(-) 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/virtual-machine-image.bbclass create mode 100644 meta/recipes-devtools/virtual-machine-template/files/virtual-machine-template.ovf.tmpl create mode 100644 meta/recipes-devtools/virtual-machine-template/virtual-machine-template_0.1.bb diff --git a/doc/user_manual.md b/doc/user_manual.md index a4f3d1d..8b8ac7c 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -367,6 +367,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 + - `virtual-machine-image` - A image for use on VirtualBox or VMware --- diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf new file mode 100644 index 0000000..9b823ff --- /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 ?= "virtual-machine-image" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf new file mode 100644 index 0000000..b6b4cc7 --- /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 ?= "virtual-machine-image" 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/virtual-machine-image.bbclass b/meta/classes/virtual-machine-image.bbclass new file mode 100644 index 0000000..2d7bbd8 --- /dev/null +++ b/meta/classes/virtual-machine-image.bbclass @@ -0,0 +1,104 @@ +# 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 += "virtual-machine-template" +IMAGER_INSTALL += "qemu-utils gawk uuid-runtime virtual-machine-template" + +# virtual machine disk settings +SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic.img" + +# for virtualbox this needs to be monolithicSparse +# for vmware this needs to be streamOptimized +#VMDK_SUBFORMAT ?= "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]}' +} + +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/virtual-machine-template/virtual-machine-template.ovf.tmpl | envsubst > ${PP_DEPLOY}/${OVA_NAME}.ovf + tar -cvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.ovf + + # virtual box needs here a manifest file vmware does not want to accept the 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/virtual-machine-template/files/virtual-machine-template.ovf.tmpl b/meta/recipes-devtools/virtual-machine-template/files/virtual-machine-template.ovf.tmpl new file mode 100644 index 0000000..e6b5305 --- /dev/null +++ b/meta/recipes-devtools/virtual-machine-template/files/virtual-machine-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/virtual-machine-template/virtual-machine-template_0.1.bb b/meta/recipes-devtools/virtual-machine-template/virtual-machine-template_0.1.bb new file mode 100644 index 0000000..dc67355 --- /dev/null +++ b/meta/recipes-devtools/virtual-machine-template/virtual-machine-template_0.1.bb @@ -0,0 +1,17 @@ +# This software is a part of ISAR. +# +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +inherit dpkg-raw + + +SRC_URI += "file://virtual-machine-template.ovf.tmpl" + +do_install() { + TARGET=${D}/usr/share/virtual-machine-template + install -m 0755 -d ${TARGET} + install -m 0740 ${WORKDIR}/virtual-machine-template.ovf.tmpl \ + ${TARGET}/virtual-machine-template.ovf.tmpl +} diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index a8d9ad9..005bda5 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -32,7 +32,8 @@ TARGETS_SET="\ mc:qemumipsel-buster:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \ mc:rpi-stretch:isar-image-base \ - mc:qemuamd64-focal: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 # mc:qemuarm64-bullseye:isar-image-base From patchwork Fri Feb 5 05:57:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 304 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:3788:0:0:0:0:0 with SMTP id r130csp2310012oor; Fri, 5 Feb 2021 07:57:16 -0800 (PST) X-Received: by 2002:adf:ee43:: with SMTP id w3mr6052817wro.200.1612540636277; Fri, 05 Feb 2021 07:57:16 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1612540636; cv=pass; d=google.com; s=arc-20160816; b=N65QECG4QoRsVTLqGG/qcDJyNPjt/9XCp7JFx4vqE36h94K70xcyzrGgoa8ju+AgIp E4DGKU/JXHdMdFmZp3dmx8rII0p96cfHN1dve1RSzuZWq4oaHHXLt+wyCXzbQIunKurG 9lHAMWEV7Qm37V8er0vVD5LLHRt/2q5fVTMgTQYbc4sx9Zxu1vgTXCr+ar4BftHmJuK+ 4nQQ9cdov1onzfRu0BOhWHwGuGt3IDcRv2ZMlSCgeggU4jqv5GODSJkJGHxzlqbTOUL+ O40X2Ejx3ptj5RHxkx/4XCiT/qtE17Nc+JzgbqkqvfZDNEkaXHhPpswYjLfCH49krW3R gWRg== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Aj+LNLElcDV0rqyEC1/2KsDfbXzPUV7U1pvZn3Y2fMg=; b=Dk12IweaGs52+xp5Wk4AF9QLPr9zHu9i+jlNT1mSeOLJ6MCi6O/Lfs0tp1cX47lsMq h7LBuP/PeZuQZ0s/odbm5VXmegirHdEF4Gh/OUI3cSQkez96tRtwonaqwUMzcjPmMZu0 0JmHvkAL0xBIxb0cRI8x/syVi6QpUUvgZjFVsItbtoF/9yjZ+nGNmdIhNQ0hP5k8Lsvj AB76448L8S1Y1ra8QVsu/UxZ0/+AlNat+W5kWCmx0LmmY4D5r0XvQsvu+QygDKYwhC/G N7oAbO2K+Meh7YSEoHkcxy7BVVF84O1ylKEUdqoVc8W8Bym4It5ZdJVJ+5MvAi8M7oCT ZoBw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ZH2lo5Fr; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbw6v6waamgqeknw6gei@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBW6V6WAAMGQEKNW6GEI@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 w10sor5261534wru.11.2021.02.05.07.57.15 (Google Transport Security); Fri, 05 Feb 2021 07:57:16 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbw6v6waamgqeknw6gei@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=ZH2lo5Fr; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbw6v6waamgqeknw6gei@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBW6V6WAAMGQEKNW6GEI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1612540635; cv=pass; d=google.com; s=arc-20160816; b=IZWOvlWDaV1LoNR+8xbvfbwlZtQKVVc5+gH3HZLzMJr28BBaFY0qbQpbClhslBPMYE v4u6JiifeQvGZk3rqT5OhhGpTwymwJ7nc+w7wvivQcciIW2ykxgWSh7R0u5FiS5rKiuk qoKS+5IJNxV7B3lsYljlkyYgmh+IA1uk0RKpshZWBc96nRDn5ex8T3zib/6In8QHZzht 5G9pyalmKhXdZq72bsNjtUkJXC/h+gWpCAQ2OaYThgbIDIsHgc8Eoiko5AdKmYse8TOI 8x0sLNO4/i5/kPu9rJtxpRfvZYe70RRaXerTs1uns+txjEjMQ/ndSjSAeXG8ae98vy12 MZLQ== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Aj+LNLElcDV0rqyEC1/2KsDfbXzPUV7U1pvZn3Y2fMg=; b=SrFAuWTlN0230G5tyaLNp77Mhh+gYrhSaLloiRczmJjZ2D1E9R68PmldBTeZ3X5ay7 K6Rq9GWb6MhfCz4GywnSQK2rxWOONfSGJhCOXsNXaZ5fUy86rvJk1+/bzvp2844A2I4s pT3GGqwWva/dSGEbZJ3XJfiX26vOPcDweW7Ybxq8wtaeeu4dt8p4cpdnV3+qb7uiT925 UMy7vKiXyZIaROSGsdeeJd1lkP9h2F+T//p4L53QWRfWcnjW6NInB7LPtMLsGenzWC3F i1Cw+MnEfvMSbqtL2sXMQMEIEaCX1zDqxjMXCz3BLQeoYW4FQ5CKlySahCAQmzbCclPR 4Qbw== 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Aj+LNLElcDV0rqyEC1/2KsDfbXzPUV7U1pvZn3Y2fMg=; b=ZH2lo5Fr+FYnd+/t8DpQBY5WueGPXXpUgAYVaWnBBYDRgKQuvsq406xOwIeMGE/2On n/rS6L0iDqi5tmlx7mLJApXqTBdhWuuPptFM4uHLe6Ri1RrAAKyWxU8QSTzQBlmb5pHp Dn66iBRuXXqWpUGsJyfLqEyqvc0krb83IiSImPk9r/OVrfrPJkB27nNbSw+WXYIqg8HK 5i8ToSBK3Zew0/Y/f1ODDYZOZG4SAM7piL051eP5dgtbZPXTuC7+gTzTHoSMpOHxoc5w sMbKAA5Q1ai653oF0ntX6Rxdvm/wlmfHuTHa3a2VfpQ8PalAYxZ/ZWzwdTIHhedbLY3Y zU4w== 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: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=Aj+LNLElcDV0rqyEC1/2KsDfbXzPUV7U1pvZn3Y2fMg=; b=pGdOBSoH4xsVnFbPymwVkGnxnFAjgpoaK4yxipKLj9ZjHBPhM/C9c/DKEusK3MNwUr yVxB82InNhXzQIIK19WpgmzNgO/tujO6GO+4wSJK5bArt2i+JP8Jb+PAqpZCXZWTd9CK qwROgAY97T7E9/T9elIpmH+iQwC/OBYqcTTvSt3Jx2cczUb8eCwm+NfHOS2bscdV2gqF PVdzwGBMcfK1BmXABZBH89hZzyrkU4QQ1GXFf0PVmpzZ0vLOStepPNo/6x1Ft6NO1lIX iX589iGrsPw7bYGZ+wpIr/db3ciVc4+Ud5h0hkTjBA2rAmvrqaLQUHQj+WFqWUJtE+VT aCSg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530PZR93r3tyNp7JCo3O+LtXgWnjjZkzem8uyaCb/6z9CvwRwb8Z BmYrGMHtNXedtb7e1LcwpoY= X-Google-Smtp-Source: ABdhPJymDQr9ftiYxDCSXlo8I85yaU9YO9I2YFhzx9d677tB6SpmLxQO/3YiaaVUJdHfbwf9cCYFVA== X-Received: by 2002:adf:ef03:: with SMTP id e3mr5958231wro.98.1612540635471; Fri, 05 Feb 2021 07:57:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4485:: with SMTP id j5ls900660wrq.1.gmail; Fri, 05 Feb 2021 07:57:14 -0800 (PST) X-Received: by 2002:adf:dd10:: with SMTP id a16mr5755976wrm.207.1612540634711; Fri, 05 Feb 2021 07:57:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612540634; cv=none; d=google.com; s=arc-20160816; b=B1KbYFRYsjoSORFCxS1R9i4OLKZvV0NWLny+zr7W1hhdhnGhKqY9e4OoyVOsyuPGrG t9HkaVE3OBbYQpNLD2Ef0wrT+rKpGrgbMmiqGostzDNPlcFRHzj80fdKctCWaAVSJSxj HZbx8N9l0jkVGy+TKzgRHlvTf89TJNEJQPO5l250heHs9qw62OulcbYD1xTHXCUCceka A89sBkHYo+w1VxM++x9ptE0YWxXrKadu9RpHHy/gdGcDXWHTNQVlNl3YQUyL4ggwcJw0 EIjECF6LZAgibe3Dbj3lTutWZX1/PwYHpHdplm177Nhw/zPop3GO+fcGvTIuRBwVhEr/ VgIA== 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=+u12S9JjsYuX4r5BOEBcmsX4CA+l85yi5my9DM+qP24=; b=sFaJ8cn9Mv81FqjkQ9CP5q36OXNivV/M7R8MlA1Qp82IfUm/tnOr7p+zyb7ZiLnxjq cufmHBM+nDFrwNddTJMcIAzcMKylLjrTwKmjLEMFDmSnr/JHa8jsazVqy4LL1Q1Q2dRN kVR/rZCJKT2q5HGsacHoWXXPPBh+5hEP/hCjkzXIri4WtiqF7uoccoCrO1iC5V1Brh/m /ZLpxmXWsmaI0wgQsgYJ0Pbh1bFnA31uyUWLWwlcJb6xn5G/AicIkZzC5G8mMS96qgXG v2vz3Y7nBm0lLnUB6q4t5S/ARVYn2cV047/0UesAM6gLw+G4ZpNM36AbZNTjJZdb0uh8 NyHQ== 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 15si294868wrb.1.2021.02.05.07.57.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2021 07:57:14 -0800 (PST) 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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 115FvErn005074 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 5 Feb 2021 16:57:14 +0100 Received: from md2dvrtc.ad001.siemens.net ([139.22.33.9]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 115FvDVh013323; Fri, 5 Feb 2021 16:57:14 +0100 From: "Q. Gylstorff" To: Jan.Kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v8 2/2] meta/classes: add cpiogz-img Date: Fri, 5 Feb 2021 16:57:13 +0100 Message-Id: <20210205155713.29133-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210205155713.29133-1-Quirin.Gylstorff@siemens.com> References: <20210205105235.29169-1-Quirin.Gylstorff@siemens.com> <20210205155713.29133-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?1690852245632122735?= X-GMAIL-MSGID: =?utf-8?q?1690871410303137162?= From: Quirin Gylstorff to create a initramfs like filesystem. Based on original patch by: Michael Adler Signed-off-by: Quirin Gylstorff --- .../multiconfig/qemuamd64-buster-cpiogz.conf | 9 +++++++++ meta/classes/cpiogz-img.bbclass | 20 +++++++++++++++++++ scripts/ci_build.sh | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf create mode 100644 meta/classes/cpiogz-img.bbclass diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf new file mode 100644 index 0000000..cadcdac --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf @@ -0,0 +1,9 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "debian-buster" + +IMAGE_TYPE = "cpiogz-img" diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass new file mode 100644 index 0000000..8efdcb4 --- /dev/null +++ b/meta/classes/cpiogz-img.bbclass @@ -0,0 +1,20 @@ +# This software is a part of ISAR. +# Copyright (C) 2020 Siemens AG +# +# SPDX-License-Identifier: MIT + +CPIOGZ_FNAME ?= "${IMAGE_FULLNAME}.cpio.gz" +CPIOGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${CPIOGZ_FNAME}" +IMAGER_INSTALL += "cpio" +CPIO_IMAGE_FORMAT ?= "newc" +do_cpiogz_image() { + sudo rm -f ${CPIOGZ_IMAGE_FILE} + image_do_mounts + sudo chroot ${BUILDCHROOT_DIR} \ + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o | /usr/bin/gzip -9 > \ + ${PP_DEPLOY}/${CPIOGZ_FNAME}" + sudo chown $(id -u):$(id -g) ${CPIOGZ_IMAGE_FILE} +} + +addtask cpiogz_image before do_image after do_image_tools diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 005bda5..83461e5 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -28,6 +28,8 @@ TARGETS_SET="\ mc:qemuamd64-stretch:isar-image-base \ mc:qemuamd64-buster:isar-image-base \ mc:qemuamd64-buster-tgz:isar-image-base \ + mc:qemuamd64-buster-cpiogz:isar-image-base \ + mc:qemuamd64-bullseye:isar-image-base \ mc:qemumipsel-stretch:isar-image-base \ mc:qemumipsel-buster:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \