From patchwork Tue Sep 7 07:43: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: 755 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 07 Sep 2021 17:43:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 187FhiRU018056 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 7 Sep 2021 17:43:44 +0200 Received: by mail-lf1-f57.google.com with SMTP id b15-20020a056512024f00b003e776206456sf2831216lfo.16 for ; Tue, 07 Sep 2021 08:43:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1631029419; cv=pass; d=google.com; s=arc-20160816; b=Wc+8bJ3kT2CkYMqDQ2Lkz0xgMaWV2LG7uQF9zUxZrCZbuJaldmXwSLT0luLfs8Z+DG DDhc8Wp+ORglYFWwC0D4ousxd73f+UXbSNphMqd+5NJsWdYKzqF2cvLSHZymyoKb2xEw hkvqwe54o3tJvgDO96J6b8w4puJTd7OgQ7faverm5FYfO3JCqBv+OuU1C29AuV1EcHDY YGgQ7U1gYMfozrAwjv+pk41X90Ne7Q6+WyFjrz8Xg52yRxEHQF/W3RL8nzJUkPTB1Zv1 d/Pl/vr36Yn7wgpJ+hO+LsYm0+NRyKjZYl4sLt9LJBoid2Cmr7D/es5+2ho/q/UVbTHI q3rQ== 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=yZiYWlei+PAOchZJWLNPKehBHFW6gB1OxSh7T9bzauU=; b=mtOslx/BvoeYf3wstokwy5sU+KFB3TrvUHFgVtvZs4vJzLqe6BqWDB2VgxXeJD+6ml HWglQJqp3vcZKCLHdWXcm9Doj/IPg4NZzDUodXC2+40O0f/e83X3pMF5uDRtHB5hLb+h Omp0JoXhnSl6VoF22vsZGE2kbzIOJoSo9KYkkhv2gdNqqDFaWyZM1NhKYY50f7inYkiK BS2blRdoHIHmMg7GZLEoORNU5MQ6qbKM78Yc6WmOoU/BetDSu2bsIjrJtpxYMLWPJsxN i97BKyNN2DJCgiI1X0o765wnmmaAQyeem1fZk/r/4DWtr2xQQjux4k5HNEq5UvV8UxD9 YPmw== 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=20210112; 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=yZiYWlei+PAOchZJWLNPKehBHFW6gB1OxSh7T9bzauU=; b=n/AujswCrpIVoLSus4LF2bEKdLqvyCobj/7d+6tIjfDACHqKgHkJZty9aWHfvpBVkf gVF3Z0YTHlfEI6u06g0h1XsWoYdckgyy0RzSNqlo+VIsG19jjxpxJiLwRvsdm4QACREM KhgdOPnqr+qJW5eqV/BkkTZ+bVABSX6Khg3jCfZTUv0qD4B3jc+efcWlEVcIzpoQpAtU 15C+JRzFCzsFiBCYYkvMAF4ggmZk12t3FLrjOOeqz2R+FCTuQul8lzBz6lqNiSAcRWF5 XZuasNi66JPAp7WJFozH7KY7Zq6DilVw+iQlDHIUD/XaZyE6vYZj3ljXzh08g5egdA/S YsdA== 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=yZiYWlei+PAOchZJWLNPKehBHFW6gB1OxSh7T9bzauU=; b=JLrqcLONMcuRn1aX903BMSMbCfjBmFloskdOyNW/pKsSr8dJ67inKQ6/wQSty1bwMM mn/jJ4OtUwh5UtTfoBTQU/UtTFEXG3PpGQchhoIS6O8JnsioAfUCc4Km7OYoq2JeDwqB EuTGd2bVTguD6as72yyVgqJuK92X6advCdqH4anqvSmvGT0nF6y2WV80fdetJO9IgcZv yvHSWJMrX6PqfJmBqD4Nb6mBiu8qBTb5/JkHoMdzMGtcrH6venMijHL/1hcVvxJ09UFx T8V35Dp3ynb6arANW40dxSxJHOBMv9ZMDhyqQqth6Djc7Dh9IdgkghQTPJwhHd6azWvS 4aGA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5317wNi0YqRJ206pe5TAlnsOOZz6Zx68ONQ7XdpaY8mk0Yr58gVy 2+JgmFV/H0Pq0UzPeMPClTI= X-Google-Smtp-Source: ABdhPJxOLVjvridjaAFw3GsUhkDZHCGQuxmOGmPeFGsGiUWGjV0N6ckk853e+zFqlhpN39mxil3Ozg== X-Received: by 2002:a05:6512:10ca:: with SMTP id k10mr13524966lfg.385.1631029419192; Tue, 07 Sep 2021 08:43:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls560685lfi.2.gmail; Tue, 07 Sep 2021 08:43:38 -0700 (PDT) X-Received: by 2002:a05:6512:4005:: with SMTP id br5mr12790822lfb.560.1631029418053; Tue, 07 Sep 2021 08:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631029418; cv=none; d=google.com; s=arc-20160816; b=zuUlJIM0jYdl/hET4gdTUP5xuNMo0t0VQJzXp6j1d1m68j4QPFlhLC9H/2dk39wyVV nB91cZc//AeKMlzRk9eB3jc3SDcoU123FLKAPaBp5/CyeZMb5tNy1tfDqdlWcM1uR8f7 gsUL8VZENlEJTS9jABJ7bRXV/pVPvrVxZPFgQv9x+jbEj4Nxhg/ca1O7GvaBkzRa64/V zsiMp3f6sLChkwoUEYprUo2eLnv3zeh73SMMtfA8aHt/xS2gVtrnX+FBCN9X0IDxPIwm ZFm7L4HsoK6i4KWqWHXRZI53+54TOPDk/vRg6GDTImxN+f5iTSTo2x0HAwERt5hgdx0+ eGmg== 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=KhpPmf5Eb5rg8nyEnVnIlM1SHS+YUVvE0O4SBydLikM=; b=ePf3x13Xeykx6+hctxFIMTOWKt1gWTB6vSYs8YK2Y8hqn/fBZ5jwLgQThZ/ltF+Zww 4fYjEETaMKgtYEXM0WXJ/Pgx0yOuzRBqWmiERFXDi/ZfzmrY1GhY1Cy7xIhBrUuI7Kto 6QkoW5PFu237A/B3PrOcmuFQ/UqYzESNfbBIK3VTZtV4rul/rtx8nr2wdn55/6f9wewE f9A4X+3u7BYsDxuB0tQeXJmiT1Jjd2o3vf+efRMmeIZlOt2AQMGhhBtC+8Fmm/honRrM 0ZnjiRZc7REy1xGVZTgSSeY17gw1HUzs1Dx5c2bfezTLdQBQHacV8FY+TnKWjEsjcC0A LN9A== 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 e14si301375lfs.11.2021.09.07.08.43.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Sep 2021 08:43:38 -0700 (PDT) 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 187Fhbb3017150 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Sep 2021 17:43:37 +0200 Received: from md2dvrtc.fritz.box ([139.22.39.227]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 187FhZxS020208; Tue, 7 Sep 2021 17:43:36 +0200 From: "Q. Gylstorff" To: amikan@ilbers.de, isar-users@googlegroups.com, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v15 1/2] meta/classes: Generate ova image for VMWare or Virtualbox Date: Tue, 7 Sep 2021 17:43:34 +0200 Message-Id: <20210907154335.27161-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210907154335.27161-1-Quirin.Gylstorff@siemens.com> References: <20210907154335.27161-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 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 | 116 +++++++++++++ .../vm-template/files/vm-template.ovf.tmpl | 155 ++++++++++++++++++ .../vm-template/vm-template_0.1.bb | 16 ++ scripts/ci_build.sh | 1 + 9 files changed, 328 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 1da0e9d..3a83735 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 96a8beb..4e462b7 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..b230af2 --- /dev/null +++ b/meta/classes/vm-img.bbclass @@ -0,0 +1,116 @@ +# 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 +} + +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 +} + +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 837cd67..1d530e6 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 From patchwork Tue Sep 7 07:43: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: 756 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 07 Sep 2021 17:43:50 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 187FhlpX018068 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 7 Sep 2021 17:43:48 +0200 Received: by mail-lj1-f185.google.com with SMTP id v2-20020a2e5042000000b001def54ff19esf5134435ljd.2 for ; Tue, 07 Sep 2021 08:43:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1631029422; cv=pass; d=google.com; s=arc-20160816; b=xUaVc5O83swFJUEFlckNSRV4UQN0bO6FEhZ97KlVJp2/Hg8CC5RlnvOQA3eOcG6cZO yNc1lMZTUY6kBDuYp5AreUD8F5uftLW4wuH+gAFJUMJtHkaZB2rQ1GGDGbFzo0+I7iRV wmICEE0MTBRCwxLEpWvU/oivoXRY/cNas038HY3BP5kanu5Bt+8GPVkN5M//Yr8QpGJk 5RTCIC8diJpGfqhaLOvSRo+zJ/+oE9ZkW8yKRiGHiokoQPBfONyrIrzs89PKPKUSJe7X oodzeqYdLcG6gaDqD19jZ9FMauW78D4TnYQC6hJW3sbZIaSSbCW5VlwthicrZ10N1tsn k04g== 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=jlcTpGzfKzg7ajNHzzrRNqwcX7Iz8QGfKwVMMhxhxZY=; b=mtZkKiFjs+RyFoontnXVdyanbf92b9Osjc7hjsK9UuhmNHKEL0mWQllIfgoyDwa29I dNUMs+ArhRD/lQiX/+DYnq0QOvkj0xY72ZlLe1C5OobFRDAAtDIo1Sw+00P1m+GnaKuN IHEqiYR4CL112DYrhfq6rJlxyhvwrrhZ3fqeFcmEJrVFDt7p1wNuGbXySqqAJ9bAe531 9QDk7nCsYGWB9U1XcPV6mrWDhFzg0vZqoJpKr0w8hpWd4tt5auYRTDsy5S4J6CnCoRBA ZG6fIWo4kfiBC/st4PCLerSr65e7i5hfNSj/D3134ZP7aUPRZ2cBgu1+2XUGjJ6PMwnh N0oQ== 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=20210112; 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=jlcTpGzfKzg7ajNHzzrRNqwcX7Iz8QGfKwVMMhxhxZY=; b=t2a+Lqks88gTJQWID+k0gkTADRIGvSiCQ2JTp0IMz0RXJy7UigKc+9QMJ7X1vvX0if iCZDGdauBKoa6Ye7I8KKj2v/MWOLacLei1skFBc8rKKU2NdmQ56LIk+DKSmoGR111wlZ hgVs4NdObTDcK0dL/NykXn/+KBLcZZxGo/dDrcqEjmjjp8bB9X6Y+iqS5CLflSb+/sXR dKA78gLBHSM/AbL6bxvxeFheXVlk+os9Ji/5TNGlw+m7aDwnHKLE1XP+eeOhML2KzLsz G3aSErQMLA8Lztvcd81H3Zwyh+hiKgOrEIChk3OdlqVB13rb0A6VBh7gI8d2RSkiVJbv HkOA== 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=jlcTpGzfKzg7ajNHzzrRNqwcX7Iz8QGfKwVMMhxhxZY=; b=Kx7izrLAo/9FjQRTcp9BP0rsNzPCBvbRWIplj0e5rA3QW12tGvRfrfduWNMBH9m2Ww U9WRpAqTDghp7pNzh5SqAFagx7PXhi1ojoGdg8ae7PZFoYUzZ29TTPfqcR8cZ8oUg0qu y6wUXH+yglzBM5e2fLibrfKzqIjIYigGZF2GBF6eNaNTVanO4OpMNL1Os3/MHQ7N3pOB ThUAkefZpe+2tIp6Pbq1SyfFbrPAJWXUd9Myect+Gl/IpOHrkuJy1MyihZxXqy896gPr IG94QjeSQnmvhrbqsqy+FGALdj2H8dN8vMSl/sHC6SHRFKtqnm8AIGLzUdR3uowv2Tfl 0q0A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533lGoyqjP4eIDRdkFYFsqv5szppuZS5dGd5ZKeYt8bMQpwWf5hN ZBR23jgq0nD3DTY52nby9xs= X-Google-Smtp-Source: ABdhPJwa/iZfjb2U3NgvRgGsoj9+yJAwCqgq4KJWXqDbY319jXJo0DMFP47s//F0j7J1QiryeCXsrA== X-Received: by 2002:a05:6512:3404:: with SMTP id i4mr13344196lfr.375.1631029419621; Tue, 07 Sep 2021 08:43:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:4016:: with SMTP id br22ls559608lfb.0.gmail; Tue, 07 Sep 2021 08:43:38 -0700 (PDT) X-Received: by 2002:ac2:51d9:: with SMTP id u25mr13304544lfm.541.1631029418587; Tue, 07 Sep 2021 08:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631029418; cv=none; d=google.com; s=arc-20160816; b=0WQwA0kGVPAOM9hfkD2BpZzd9TAPE5iQs/CZWoX8XW3wQyQR1XhSmay7hwWGCYdmJU 65C+vE68r5M181987WYXETXh5951fs4S3S9dw2M6hWoNA2CFuXKFc5LDC2th+rjmQHGn U/e3rpl2DT4gk9LR1FCUOl4G5pJcB1+FKqPEa7AK45Pg3U3wSjCahAwttLgiiyeQ66Qg YQhdH+JHbLOhJolZPfbaCqeiJyDkim2tKswhHiCRE/1AIgT1sl2QJ0dVAhB2w7+AArrB phxMP5Ml6uVCPJ1jJ5SpCdL/i7AiVJ6WRODyDzN3XU4RMNXmm8D4U9aQePQK9GwVOUVn nD1Q== 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=558OVNG5DQSK6pg9YwCXEoXnxogpajxVja6luOYiFdc=; b=x94mA5W8uDYtqDYnFJT4ereRlGtp1nE1oxN0Sy7iM6aCYJFUxfReZbxJUG/RPv7O5Y D/RA+8mEI3wDEUeCT5MA3x+hLk7EmnzO+Ni3YQjH4bDu2Ii7WZFDT3xptA20MyMRmyMR r244iFAxDVQzKDUd5AENGH9ckXqFoeQJiLItCVFlpWbFrQhCqAVaQ9N0LHdxSK4ftjZ1 e3tLr4zOoyhWuoqXJNKDFXKby/GhNWZsK5QeDoFzVnzrjgWqBBSdOGFAaGrcEf17x+kV Cs7+Jo3HRnbsnIPvTwDpRCrhpuTHBYgJV30BI4ZbWckQ+RZx6neFW3lsUU5MQFBmyX4A G8IQ== 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 e17si546776ljo.2.2021.09.07.08.43.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Sep 2021 08:43:38 -0700 (PDT) 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 187Fhb50005584 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Sep 2021 17:43:37 +0200 Received: from md2dvrtc.fritz.box ([139.22.39.227]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 187FhZxT020208; Tue, 7 Sep 2021 17:43:37 +0200 From: "Q. Gylstorff" To: amikan@ilbers.de, isar-users@googlegroups.com, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v15 2/2] meta/classes: add cpiogz-img Date: Tue, 7 Sep 2021 17:43:35 +0200 Message-Id: <20210907154335.27161-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210907154335.27161-1-Quirin.Gylstorff@siemens.com> References: <20210907154335.27161-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 From: Quirin Gylstorff This allows to create a initramfs like filesystem. Based on original patch by Michael Adler . Signed-off-by: Quirin Gylstorff [Jan: reformatting, dropped bullseye target, added to local.conf] Signed-off-by: Jan Kiszka Signed-off-by: Quirin Gylstorff --- meta-isar/conf/local.conf.sample | 1 + .../multiconfig/qemuamd64-buster-cpiogz.conf | 9 ++++++++ meta/classes/cpiogz-img.bbclass | 21 +++++++++++++++++++ scripts/ci_build.sh | 1 + 4 files changed, 32 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/local.conf.sample b/meta-isar/conf/local.conf.sample index 4e462b7..88a8175 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -50,6 +50,7 @@ BBMULTICONFIG = " \ qemuamd64-stretch \ qemuamd64-buster \ qemuamd64-buster-tgz \ + qemuamd64-buster-cpiogz \ qemuamd64-bullseye \ container-amd64-stretch \ container-amd64-buster \ 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..940e2fb --- /dev/null +++ b/meta/classes/cpiogz-img.bbclass @@ -0,0 +1,21 @@ +# 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 1d530e6..a4aa74e 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -37,6 +37,7 @@ 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-buster:isar-initramfs \ mc:qemumipsel-stretch:isar-image-base \ mc:qemumipsel-buster:isar-image-base \