From patchwork Fri Feb 5 00:52:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 301 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:3788:0:0:0:0:0 with SMTP id r130csp2092946oor; Fri, 5 Feb 2021 02:52:38 -0800 (PST) X-Received: by 2002:a7b:c305:: with SMTP id k5mr3014395wmj.57.1612522358569; Fri, 05 Feb 2021 02:52:38 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1612522358; cv=pass; d=google.com; s=arc-20160816; b=pUCLGj3vUQn18yyey26d60k9sMEWTdF1bwEP8XY2o2bXj4YLcSiWEYAojX3zNTh39U NZ8PZZbK8AlgGYO+NTKHK1/4skXNJnZBusnsIfgo3YQx21F1egTxNkEHMJcHReuTuOpA 6scvmZtRQz3/IoUbA4AsyFaN4TuUc3pUr1jmlCneBihfNbqzoYySmZS7QVQ0qYr02K7G KSRpHWTgwEoj8B/dO39Xw46sVl1Em7TTdpA7N8agXFIp+qZl6ZS7E0Ml78HecXawPSs2 qQa8QPc3hfA1ZWtlSyDHuPWsKOZdMAo3Wwg/k+kbeMu7M1tX9kE8xoStGo4yA00261ta A3Zg== 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=NQczBXuXCtoRuv9GmwsFWcN39P9YvlB/kNXMHWo4gFI=; b=zyA27b6u/QP268wB0kWstaXnhzpLhYXjBdimO1KNxCMGTfi2kWE2LPIvj1cChkCW2I Lyh9lhJadXFe0r32v6JVA48deyyaCEz8t6YlXJvhlWx7F5qGPlpp1U0NQhZ13fzH/3Av 4r2MXPETy2eTpOiX+xkJYE31j7lIQNbjdb8bsuZvJYD3sgAIT8YD7rx3V8KgdAjYE1Xo uDC5jGIH40OqAHXgm+N9rbWR8KRPpAH6RZQqpyXwe4voRA03Wvpo9yCrYf9wBBUG+dr/ piYUWKNs3kXNvXv9o4nMF0mVbPchM12P0u3G7QhGxpL+HwzpnwHk1JDrwT8N2RsNMB+c y5+A== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=N0jXsZlN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrb5wg6saamgqefbbddly@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRB5WG6SAAMGQEFBBDDLY@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 y4sor4909806wrp.15.2021.02.05.02.52.38 (Google Transport Security); Fri, 05 Feb 2021 02:52:38 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrb5wg6saamgqefbbddly@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=N0jXsZlN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrb5wg6saamgqefbbddly@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRB5WG6SAAMGQEFBBDDLY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1612522358; cv=pass; d=google.com; s=arc-20160816; b=VM3ejpzaKFc53FUIRZvHI5Map1z9aKXG7vuN3ufId8umz/GKWaAyrrWEBiqJTWleB6 2n7n6faPCHakHrW8QMn2nOxjLvJtQpQsx2lHk4IEGMMCAKEZjjZ/gyEt9R2Vn3BOeMkl PZvgAmWHF2iF2I9wESYfEofrRZ2+CQKf69G/pUCFImaUhR2qsw77UZ3VSP9mnK9NeaZk 3Tk+IwNeL2haEGD2su2MMuJJweVnMX8Yj5zRESJknQMgrzme+SFLO8FymnynCdJZjUJs NfFOxXN84W7rW5go0ryFEE7VAPpBuOkVXPNi4ER3u0A/UfxGAtufFimuImFHFr6AwCAN KyUw== 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=NQczBXuXCtoRuv9GmwsFWcN39P9YvlB/kNXMHWo4gFI=; b=tvd8Go4lSpfFolG7ar7P68GUeyppVHtxszOtF38MKY8TZwR+4CWcPLUjpUKhxnKNo0 h7pYlH7HXMS7dgolg23PtHu3+lfgZ9Bu/Ke7xHBwg9WHp6RmIpC+DKLp4QMjvLWgwOS+ Xa4R8QElySfM7VYO1UaSnTq7CqIkQ9nKGzg8g552qqZ0DaO88rxjjr2YdXdFSJv1S9MN RnOZKEgynMC3eKiDS/vbfUglrVHDdhCNtrq1QMAYVOOLeKAczhm08P4A6JnDUvzIYPzf Ax7HI3s2+QRlG++UkERe0nYVfDNGfHssZniCE8oOSOcr2Dou2gjwiKxBnKGWx7RkFtf9 CuhQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 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=NQczBXuXCtoRuv9GmwsFWcN39P9YvlB/kNXMHWo4gFI=; b=N0jXsZlNQey6v0wGGo31mhipCspBe3HgiQUc8bH7vYVKjGRmfsrMwHFggnhKqkndZZ mDhV+lDs00UCpE03sQTJLOEhfRhnl4/HLZtoDkO0LWqidxzQzukrKwUs4rcNFdnXuB+/ +PqW4aiBGOByhmrc+SmeuHq8+XtjA+vp6R6sWPn/2y618Wl0gaIgPs+iWwIBUAyLel9D MZreoRA+xdjNmmLiFLPQmduTVFL7ted0Eb3mJyilLvU1XKHdhPqVxF+tWnt8IbIQzajO 3IZbBaee1vl0A2OAXcHMx8ZuxQ6bm7met3sK0/evmwc5BJuUk4AePTVuFxkq4ygc79S+ ltXQ== 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=NQczBXuXCtoRuv9GmwsFWcN39P9YvlB/kNXMHWo4gFI=; b=I6p0+aDj2likOaerlsh68prF84BCk6JHc2krLhIzX5NZ6rWifMyvpB7KxjG+kr+AEa BN/uRx7kSBIIxt2kncCpR1WU07Id90p3AMOjhCAiaoSseND/aLHcsuivcy22guGIJeYU bJW7dUBzWn45Ojhpohcn+PlSjav0Jj+JAIeEn1KCXcDuxOCRb4Hx0M6LjqU7k0xkoeX1 kJ5sMxbsAzShtDVaQUVDm2+Mrc7tkh6Frvi8sc5ognUUlWpHf5ctVpKlaQbOuppONWEc /MBDuGHIquA7vZwYlGJRH3YuIH5jRS0MlEErYinW9mfYChz6ewirZAEa7kTcS5naa1P2 4moQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531hy0nGAxgmIN2/G7XgUK8K2TAWX82Gzc3uSoGxPIqs8b7cTu5+ eGoi5Orlt0O7VtiYqG0buLk= X-Google-Smtp-Source: ABdhPJwz+1vQFyxNMuY2SFKghqNFRKtI/+LEK83dDtVdInUBmriVqiux0KhzjBIs31tphFqpfFV1cw== X-Received: by 2002:a5d:4988:: with SMTP id r8mr4403776wrq.26.1612522358235; Fri, 05 Feb 2021 02:52:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4485:: with SMTP id j5ls3881841wrq.1.gmail; Fri, 05 Feb 2021 02:52:37 -0800 (PST) X-Received: by 2002:adf:f004:: with SMTP id j4mr2493586wro.413.1612522357258; Fri, 05 Feb 2021 02:52:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612522357; cv=none; d=google.com; s=arc-20160816; b=GOAG5snVx7yUj7/LeIWYAwgbQRbOnjulB3xXIh2iSEGZ1ytpWSYKcCdwudns85+Zz6 OKCNwBtUx+SpNzKeOXbfwfMIMLw+h5LunpGXWFnaPihshPEdWYt5HBA2boUlYacENF/v rSbKCKp5iDXQPcMVTmJ6yg4atr6Mubn8QIzxSSpOxXcYahCOF8NbvNrynXEzemFV0YRp 1kDdxXtDRylBjdbRwGjOBk74at2+LtDWn3TQc+arNW7SpS1qDW10TxQv55BF5gElLCaw eUklNLBSF0NpMiL2IAsAQfeDJxAT2/WXvM8wq00ycScNCiEUpUzDokXm22ymiYQ+bYRw GhZw== 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=+HNAJdeilNU3Eui7B5LvZDBxCCYJDr3g6NCi4RidByk=; b=Dm0nRjoEUt7rWdru7/4InbpkO29HPq+xFhSeMGpjsUmVhp+fl+e7aZooiob6UG9FP6 NZru9fLmUkRKiSEG5n+f81JxgLZx/CssYI7HRNFmvx+HV9a4oqAFUlgn0g44F1lkP9vH rE48RL6ESO3kKpBBbkVSBPFuSdPkL50n64yhxUt/NTAPow4rdJ33aMnTuGYphp6i1q5S 6faXliyxWKwqyeXmLLa3Jbhn3C2dDT0yt04RJm0j09g17NXo6Sb89ULQDGvKfLxKoqAK yXfbls+eDey80ymTD7ErFjx3d+4u7OzxPlPJlL8bFN/M1ADFJsD+Kd44uRk3KcScksIG G2Iw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id w11si588976wrv.0.2021.02.05.02.52.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2021 02:52:37 -0800 (PST) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 115Aqauc006107 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 5 Feb 2021 11:52:36 +0100 Received: from md2dvrtc.fritz.box ([167.87.55.90]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 115AqZQJ029686; Fri, 5 Feb 2021 11:52:36 +0100 From: "Q. Gylstorff" To: Jan.Kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v7 1/2] meta/classes: Generate ova image for vmware or virtualbox Date: Fri, 5 Feb 2021 11:52:34 +0100 Message-Id: <20210205105235.29169-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210205105235.29169-1-Quirin.Gylstorff@siemens.com> References: <20200423094636.24511-2-Quirin.Gylstorff@siemens.com> <20210205105235.29169-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 192.35.17.28 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?1690852244363221964?= X-GMAIL-MSGID: =?utf-8?q?1690852244363221964?= 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 | 92 +++++++++++ .../files/virtual-machine-template.ovf.tmpl | 155 ++++++++++++++++++ .../virtual-machine-template_0.1.bb | 17 ++ scripts/ci_build.sh | 3 +- 8 files changed, 307 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..10e86a1 --- /dev/null +++ b/meta/classes/virtual-machine-image.bbclass @@ -0,0 +1,92 @@ +# 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" +export OVA_NAME ?= "${IMAGE_FULLNAME}" +export OVA_MEMORY ?= "8192" +export OVA_NUMBER_OF_CPU ?= "4" +export OVA_VRAM ?= "64" +export OVA_FIRMWARE ?= "efi" +export OVA_ACPI ?= "true" +export OVA_3D_ACCEL ?= "false" +export OVA_CLIPBOARD ?= "bidirectional" +SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic.img" +OVA_SHA_ALG ?= "1" +VIRTUAL_MACHINE_IMAGE_TYPE ?= "vmdk" +export VIRTUAL_MACHINE_IMAGE_FILE ?= "${IMAGE_FULLNAME}-disk001.${VIRTUAL_MACHINE_IMAGE_TYPE}" +VIRTUAL_MACHINE_DISK ?= "${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}" +# for virtualbox this needs to be monolithicSparse +# for vmware this needs to be streamOptimized +#VMDK_SUBFORMAT ?= "streamOptimized" +export VMDK_SUBFORMAT ?= "monolithicSparse" +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 + +# 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 00:52:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 302 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:3788:0:0:0:0:0 with SMTP id r130csp2092954oor; Fri, 5 Feb 2021 02:52:39 -0800 (PST) X-Received: by 2002:ac2:4d9b:: with SMTP id g27mr2144520lfe.79.1612522359377; Fri, 05 Feb 2021 02:52:39 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1612522359; cv=pass; d=google.com; s=arc-20160816; b=x9DBIQ0CJK377EWEqA3Z47RMe/zqmBulgNHKPKrK56DGbtwlgjVaQHID6nlscaVorj N2wlbN++RBMec6JZkNf6xTi7gL936GOXJaG53XntlyUXA8zJWI8lvvwLZlLnj0AwdAMR KVaPGoApqYjgBAMxpw9ybsDf/Gr1JSE3F6xHGC2fY4tGA04lasRp7XB/SwlK586tYipb MYUS6uyuAw8Rn0wp0R/FYdEZKUivqv9HguimwDp61djTRDGnqi1b4uHG5eeAk0CF8Bzx KOiej5U4urgCPEXgL5eQJx1pZxjqWQxdmm8iSNFG6CccicmA2LP0XPdbKDXt6g2kVKdG idQA== 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=7+Sh8M2V24fcIbpR47hayykzyPQ278DMnCClYeeUmh0=; b=UfRuCyWTZnZkZvq+edPFrk1wZ8BDGgfyYdSdKQTuPMcoyjHP84UQuTfRixKyYC4XDw BoFIboMLkCJp97MDKGn7wvNLLIdsYjTcm63/KSGHvp4hQ193mc4dq/eiT8N0braIbHMO 97iR2YG0vwfJR84/WuytqyLn2K+FlBd/wjY1N54VKjBRgZaBEUoytUuPVKSEA+fTKrPj BKZoobj4RMeUjxkFDk79gihkHhmE7T8ylImumnebRk3woVOzU/S1idnu4BPNE2DxLA/5 PiJmbTuujim94eMzdSuvoWGCKjJkDYTi7zHP8s0M1Q9TzLsfKPWdULKSJFVGpfEsvMQd F+cg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=jnMXM+wz; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrb5wg6saamgqefbbddly@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRB5WG6SAAMGQEFBBDDLY@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 r1sor4050189lji.46.2021.02.05.02.52.39 (Google Transport Security); Fri, 05 Feb 2021 02:52:39 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrb5wg6saamgqefbbddly@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=jnMXM+wz; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrb5wg6saamgqefbbddly@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRB5WG6SAAMGQEFBBDDLY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1612522359; cv=pass; d=google.com; s=arc-20160816; b=i6sl9abfi3bJEQA485l8AOQgB46awQZtAoZRzT2DUFO7akpnIHaSN0LSm/+9pgCITd q4eZhun49g+pO527f7180Ue/iap4hpHipSG7r/2QMrNV7hM6Psiw9y0WDJieKb0Xd3Cc k4ZdLUtl7FoCaVG4SCuL06XKByVRcWKTdVWe3/90DcrE+1HcznpgnUzBjBrzZXzXDr86 0CpgxAuI+nyMXLBqVP59kz4qxPm4hOBE9s1uh73y+pGOS11x2/OshnZRFLAHb/PICgYo Xp9QeQTYZHbJIVHsiTmVCxQjwKhzKwFN/gTabNswMGkP32Btk2CXJ26h/HB18RQMh+ZF 7F0w== 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=7+Sh8M2V24fcIbpR47hayykzyPQ278DMnCClYeeUmh0=; b=vO+wLAOV4TyPIpfK0FjWW2a3mEh0TC3EPcnEuoBbbsQaeXjBbLy3qYRRWvO96nYyIz R1ryFVYjk3OxAd4iZ7OxQUwada77/UwUOg3nQhYrc6rl0vDgsYeLdf/2+zpj1AxjZdxY 4XiFzaQ9X3YOhmo1sCLvUO9EOLmBTcwiHrYN+JSPV9MCKVllvNFHJRlEZ1W23/Bwh/yT P/rVyVw2aRenjs7jYqSrgAbuPnYU7SzhHgR2AqpylzmX7yx531SCa1ToDIdg06HVkpNH 354G4254nkF9ErXlPm/EIvmUYr7KYzfHLvFZLd1AJJmuhcZ0bXyDxEsFmHggztGm12/a BZkw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.14 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=7+Sh8M2V24fcIbpR47hayykzyPQ278DMnCClYeeUmh0=; b=jnMXM+wzf0e36jSFos8KBvuwRnrBb4+J/dJTX4CPK+ZjX6XhTX74XrNYQI+IXqBs73 5aFRmXq3sVy+QmNTVB0FViz/ExfdsTJJNC4iT1mVFRzT/gABnrqXWvwYMCumolsFLJqc ugJmpZ7AuHTm4qlSLxJFbza9rNa5PVXolNGD36CbxNrIEn0+0fvbVmd8D7opxf2YgYDS 1ubpRQurtZpKKinupJKonNijjX8yTv0aBvZo+qyb15CPf6Jq4cBJOjd+j1vj1BPEAWDW FleBy+xeBzSgDQtSskv8LmH18v3ISu+eF2wVzUWFELwx0OUgkoTJxPyHqirir3qvoM2o 0LJw== 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=7+Sh8M2V24fcIbpR47hayykzyPQ278DMnCClYeeUmh0=; b=Ia/SDjcnRn5Yeif75CF4FaQVrciOeoFlVFgEr1ia5YHTuZ1MKc4v1HL0loEcP9Rj3K zPaj+jAdlV0gdM37iqyHN4Fg4S80NMps+PqbQ8/BrDVzuBhr4Y86lmgRU9J0cGEOlXQK PYoLh+28Ys2IkFn71xNAJDt4wJGnYFx45xcIHFfi4BOsQOPbI+VJfU31BgzbIO2E+DUU 9L0ZxTwRU8KYcCk9GfX8KTxVmHGVkKzabNebHW0mUr93wZRkyEUb3IWJxxs9Owy/QHnM fdhaFQ08UnPLKfzv4DOvqPbiYSdUNdGiZDHC4qObA9Iwu+yb43T/QA3ahT1aeV1EQgM1 07eQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531/F2EexZSxe0LeFaiY1BF9oBlCttwru16W0RW3yc7fDuVBjfiK NiTYEh9xjlHbCTiH7tbuO6g= X-Google-Smtp-Source: ABdhPJxaZkrEBhS75AGthOlB8xFuc3n9XDLf5mzFmwstampgNF9Mgt981RCfNqFPDkHitGOszvNroQ== X-Received: by 2002:a2e:9c88:: with SMTP id x8mr2404810lji.409.1612522359100; Fri, 05 Feb 2021 02:52:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:6d4:: with SMTP id u20ls2065102lff.1.gmail; Fri, 05 Feb 2021 02:52:38 -0800 (PST) X-Received: by 2002:a19:c504:: with SMTP id w4mr2237309lfe.193.1612522358005; Fri, 05 Feb 2021 02:52:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612522358; cv=none; d=google.com; s=arc-20160816; b=t78NODGLNnHsUsbGKaDxitpguyaQ75rXOFh1O57qfqEuG3NoThhXSOSoXZSmUjIvom ncDv47OvioTYXJct0de/9/USbCm8TayoFBB7NDyrqkFIhDT3yjdG4LU8F73xnp4lowCc 6GdzGUXODgC4PaWW53hQFSbsblaNUyV9NDZ9ebGeQQ/xiwmdJVqP3dtr/YbdWUyrFtp6 j/ZwIQa/0OyfUesAiRPRlRkdfWvnLIpoO1jZ+Ois1qkes4sNS5sl4tKEG3aRmE6gDD+8 eoiBQ64KXouGVoYLfsPLWBM4bV3snWtPFJ+HpV1tWgys5Bb3zMenZPyYZDuVyVeOIevw IT1w== 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=tpzvnJ9InK22jM8jf3UYfQIyZMKTi8xtEneEM4eVwNA=; b=L1GTefch8UM9fZjH5Lj0aebSyuQ/fkmWPfDlXOSDX7sNDrTV1oaZWk+Fw7iLBP2+ep YIcCetm/957Xa9PICyJg8BZJeSiXfIcU6rfk7SFYXpbi5WL9V9OMUtdqId5Nt9kebmZM z+jUCVNyoELo90BaUDusMIjAFmKXcTjHigr5Z2Uo+BNjpjh+fijm7BrVLQ1jz8Qew+Vr q2jNg32kKTQqr1+UvxFIK4HVQp/1cpifwBBPSap8syZB2axYDzwK5ctuCf4s5UJh7BK5 5cBvcyyfizXhxKk5SyLlzRL1a1V/b05mkzdP8CY+z+qj0z3KEwLw6rQTEHSoz5gg+iLJ zUfA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id d25si349400lji.8.2021.02.05.02.52.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2021 02:52:37 -0800 (PST) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 115AqbPJ019464 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 5 Feb 2021 11:52:37 +0100 Received: from md2dvrtc.fritz.box ([167.87.55.90]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 115AqZQK029686; Fri, 5 Feb 2021 11:52:36 +0100 From: "Q. Gylstorff" To: Jan.Kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff , Michael Adler Subject: [PATCH v7 2/2] meta/classes: add cpiogz-img Date: Fri, 5 Feb 2021 11:52:35 +0100 Message-Id: <20210205105235.29169-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210205105235.29169-1-Quirin.Gylstorff@siemens.com> References: <20200423094636.24511-2-Quirin.Gylstorff@siemens.com> <20210205105235.29169-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 192.35.17.14 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?1690852245632122735?= From: Quirin Gylstorff to create a initramfs like filesystem. Signed-off-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 \