From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6808879013169201152 X-Received: by 2002:a05:6000:1cf:: with SMTP id t15mr21603563wrx.180.1593089810601; Thu, 25 Jun 2020 05:56:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6507:: with SMTP id x7ls253965wru.0.gmail; Thu, 25 Jun 2020 05:56:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymJs5Xe7lqRZBlF9fugGrmwJXhBtRX/nVDdANWsFCgSAefaQwOUZ9tVQtKomTFfWnCWW6z X-Received: by 2002:a5d:6150:: with SMTP id y16mr39272691wrt.219.1593089810117; Thu, 25 Jun 2020 05:56:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593089810; cv=none; d=google.com; s=arc-20160816; b=Ym67Bsk3O57Y7EuFsCI/zpZ68gGp+vPB6ebT3azy8Z9BznEKKZG3K3P2HAKXrD062U WUyldLegF8ixEKuunET0Ks12YwFZHcib3iLGkgEsrRuAsN1Vnhbs049qPcpAx+q9FZi1 Vwml04wT7uuD23G6Zl/VvTKMJaypjhfhYbGrEgau4Z6UG7wDNF7fF9GJThdMfIEF5NSs +iDtbE1Ht3CdPL84e69na8xImF4VzmPsy1YGwUS1eibwFMSFo3eYbmYUIQ8yPlMGU/Oa aL9AwFLzClXjCXzNE8H7tBZVAOwaOCiovqvVPJiCgBbhMBCE+SQ5zly/P4RODJsRm+oa L68w== 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=aAvG8uxbZOoWIPlcnP9zxUplyeo5/7BZ97WkdOknBCg=; b=L1bVnOIZI3+SNJo9JFPhugHMrMtXTwCFkG5asDOPW8OrLkgr3KfOrUx6dZ7O9CnZBG yfi8wPnz+d7OoeDOtjcRRcpEXcAMInB5J8yihZYc33yQTvCg3/oO9AsBimjqLfalGquN wj4lUtUIJt/NSQkirLfkiy7xHAKUROUqTwbh8aqzM5zvnKGVGvE6vtF1/2B+Ag2SbA4k MU5KZlyXDRSn1py2u1NeNmwrJeVMYxcWxzol5pZUQ6K2DjUHF4v5NHjoXYnaIu9fWNRu tfuMH2qgFVQVBW0rNHwjjLqyv8eiZ3OBD7GLoIFWkzO9UBRIj6eHnumzSQzHCCl4E9yv wamQ== 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 Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id g141si511631wmg.0.2020.06.25.05.56.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2020 05:56:50 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; 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 Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 05PCumNq011827 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Jun 2020 14:56:48 +0200 Received: from md2dvrtc.ad001.siemens.net ([167.87.6.122]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 05PCukbT007145; Thu, 25 Jun 2020 14:56:47 +0200 From: "Q. Gylstorff" To: isar-users@googlegroups.com, hws@denx.de, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v6 2/3] meta/classes: Generate ova image for vmware or virtualbox Date: Thu, 25 Jun 2020 14:56:45 +0200 Message-Id: <20200625125646.13365-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200625125646.13365-1-Quirin.Gylstorff@siemens.com> References: <20200625125646.13365-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: SkINyI+VGVPi From: Quirin Gylstorff Signed-off-by: Quirin Gylstorff --- 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 +- 7 files changed, 306 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/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..4d382b4 --- /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 -H ustar -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 -H ustar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.mf + fi + tar -H ustar -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 adc403b..419b699 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -35,7 +35,8 @@ TARGETS_SET="\ mc:qemumipsel-buster:isar-image-base \ mc:qemumipsel-bullseye:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \ - mc:rpi-stretch:isar-image-base" + mc:rpi-stretch: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 -- 2.20.1