From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6808879013169201152 X-Received: by 2002:ac2:46f9:: with SMTP id q25mr14373651lfo.149.1587482267727; Tue, 21 Apr 2020 08:17:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:86cf:: with SMTP id n15ls2970192ljj.11.gmail; Tue, 21 Apr 2020 08:17:47 -0700 (PDT) X-Google-Smtp-Source: APiQypI20wt6HoIvn21yTqaWMOQOq7gtoMV8T2TrI4HASTvS+jG4Hp2NphTuvfU61vLx0d/Z6n2C X-Received: by 2002:a2e:9842:: with SMTP id e2mr7822768ljj.273.1587482267059; Tue, 21 Apr 2020 08:17:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587482267; cv=none; d=google.com; s=arc-20160816; b=NpTx+ufdGHDzHeJ8DzkzW6gu39xwY1GYbDYH2vbu32AUwslzinVU+VAYFXKfB77lEq DD9vjpiRi/WmqNzwBf2HctqrUa68MUIewggZY0lnYASrmEi1qv/h47WAO364OzhzJpVr N/ivWx2kRQzd9uaeDx+/risbgo/MiJWYCyO/TyWCxG6E7ql6ZG0Rih/o11dnEMj0kPTh 5Lemyf+VJ3MQSvu1SPbp3LAUteRQbxexEhTP4gGwUdcq547dUC5r8v+GwsU4yZp6C3vA HF5XXF7NYl04QyOUBq/a7jTa20/I1IcnPyKgYS8RYDFBwGt1viqOXsN7Pn2wJe3jU4WI +0Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=C4JJneRe8gqedr6I5oEKXyeO4HHH+e2acOWs8Ulg+kQ=; b=DLVy1Pj30jsbPUMhmjwXZmqWwmQDmuxod71LKuoSHr8W3l+zqFuiy3D84LpikN0mnn 1+dTTPaG3c6yweD+CR1Y86rC8qTkcu1tPJKxHtXkgu/cD1jlgVA+oZ5wcTIY0Aj1lV1/ 34mC0QpTv0CCZV+6zjkRahXTmDZs7qFiaDKYgFNiWvdAx75uGIB+Th2YYE7gknnGmNXI I8P0ijhikz8WMSwYTOUzbQHoQpdkskWcU6F/mbof2kSkebQl42ARb13cE6gbx/icUzWd 0G1D7T1+PoQ0APwbS19KHDdOcqvlTxBtqn5/jcF4HKPJnKlp0FNuvp9YjtGS/e8j0mzQ 5keQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id q24si205884ljg.4.2020.04.21.08.17.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2020 08:17:47 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03LFHkK6028114 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 21 Apr 2020 17:17:46 +0200 Received: from [167.87.78.105] ([167.87.78.105]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03LFHiV1005101; Tue, 21 Apr 2020 17:17:44 +0200 Subject: Re: [PATCH v4 2/3] meta/classes: Generate ova image for vmware or virtualbox To: "[ext] Q. Gylstorff" , isar-users@googlegroups.com, henning.schild@siemens.com References: <20200420221458.75aeadc4@md1za8fc.ad001.siemens.net> <20200421145723.29997-1-Quirin.Gylstorff@siemens.com> <20200421145723.29997-3-Quirin.Gylstorff@siemens.com> From: Jan Kiszka Message-ID: <6ec0f368-2832-07ab-1fa0-b9704b115c01@siemens.com> Date: Tue, 21 Apr 2020 17:17:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200421145723.29997-3-Quirin.Gylstorff@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: vOTYmtbvZ5S7 On 21.04.20 16:57, [ext] Q. Gylstorff wrote: > 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 | 265 ++++++++++++++++++ > scripts/ci_build.sh | 3 +- > 5 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 > > 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..aa45e47 > --- /dev/null > +++ b/meta/classes/virtual-machine-image.bbclass > @@ -0,0 +1,265 @@ > +# 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_INSTALL += "qemu-utils gawk uuid-runtime" > +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" > +SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic.img" > +OVA_SHA_ALG ?= "1" > +VIRTUAL_MACHINE_IMAGE_TYPE ?= "vmdk" > +VIRTUAL_MACHINE_IMAGE_FILE ?= "${IMAGE_FULLNAME}-disk1.${VIRTUAL_MACHINE_IMAGE_TYPE}" > +VIRTUAL_MACHINE_DISK ?= "${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}" > +# for virtualbox this needs to be monolithicSparse > +# for virtualbox this needs to be streamOptimized > +#VMDK_SUBFORMAT ?= "streamOptimized" > +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 > "${PP_DEPLOY}/${OVA_NAME}.ovf" << EOF Wouldn't it be more maintainable to carry the xml struff below as template file? Jan > + > + > + > + > + > + > + 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 > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > +EOF > +tar -H ustar -cvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.ovf > +tar -H ustar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} > + > +# 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 > +EOSUDO > +} > + > +addtask do_create_ova after do_convert_wic before do_deploy > diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh > index 7cd5a2f..aa21a6f 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 > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux