From patchwork Wed Jun 30 11:15:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 570 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c3cb:0:0:0:0:0 with SMTP id e11csp607604ooq; Wed, 30 Jun 2021 12:15:08 -0700 (PDT) X-Received: by 2002:ac2:5185:: with SMTP id u5mr29358221lfi.105.1625080508007; Wed, 30 Jun 2021 12:15:08 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1625080508; cv=pass; d=google.com; s=arc-20160816; b=POhdXys3h69eRP7iEyruTp/Nfak5AuWl9K4JkgsL6iryjcvdITPLSHzzvaGVJ7TRd+ dZyjdZhG9Eek/++4IJi7KO9zKJJYTPSM9mB0PQRVQr7IolWyXYgkO9uDVCCrL80dSQ0+ 2+0Oa0siT8swj8C63oQzgguwpY2AEzkD8RvRKR2l0ddKmHrc0gISAZYhrsOfhh/HXZSC MyfO7Vkx3dpTrrDsEX7+yvZv4XK/K1cQg98rZG5un9odziYs0kQ1F+jMSayjhHSMihRI 4erefDaLKPegC9fJ9Mum2ljrB1UB7CI8sER9l+0977DeN4ZAyhnoHpcHY/OUw832MkRq RMnw== 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=Iixy1SwuwdadzveH7794W1f1Ty/veQnYotCbK/YCRZ4=; b=Wq0JG8nM1QPAVKiFbR1EpI0bIpukL7Tv3iX5BO2J7LEQRTOmLdQcOxdlK0xwFcLZWg vvMr4r843TVYbPdMQ8qx9Y31+SdCgQYbP9s/Ct0Y9Ityn5mk8R5bT7wey9eKOLvBbIO6 CosY2OYU6CbUIAWpxRabUDQpfuFqSqENhHwcnOe9lkGo2jwxHRXU0VdWrkyYi2ydz4HZ ExI8kh9jfoYYz+B+b9FNAnbW8twLngzd5mTo916jfeDNTYmQScMBa81Ucbv3jSYooNsU tPherwx42XZr50JprUlQ5GEoeVjlpOly+mc46XiOwAzOeQDROYY+OG/Kv1u/pyhFTbWl bwZA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=GuVDCLd2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBO4F6ODAMGQESY3VLZI@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 b13sor9504381ljr.35.2021.06.30.12.15.07 (Google Transport Security); Wed, 30 Jun 2021 12:15:07 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@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=GuVDCLd2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBO4F6ODAMGQESY3VLZI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1625080507; cv=pass; d=google.com; s=arc-20160816; b=x5zi3yFV1Bxf3fo8KOGgXKFA7ooZqwc1R5gPJWXrYxLq+NerHsghYHg0FYjZd57b0V rrsUYNZeV73/Wlkw80VxJfPko+KzTtz2xeCECwwwdUXWWnmWck188w6GHNdWqpfiWa0+ SORpn/w+GahRxJf7ZEko0iwZCJrrc8IATPBnHvz4guSMcyTy6Mzj1Lh7XLp4GoQFQVnw hftNJXV8bpkm2dLoHgR7XFRSKEfJkdMGVtcOEL/VyhKcr0dsQnsYquuTCQkwaLqCWJAm nBKsRSrJbO7savs414K9W5u3Yvn3kRXe0yA5WGVAm2Qy8ZgxUgLj+puF+4A0vQ26SkOC fYRg== 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=Iixy1SwuwdadzveH7794W1f1Ty/veQnYotCbK/YCRZ4=; b=N6YrW0hOOisozzh1qXBxPDGQipLByLvXkDpBdLFurqU6LTn946dZKnSwkMyj7XNgSr Ey+8iDliFbBu71uaWgMVQUJY6/JPM5MQN1ZKUuZgQK+ymRsATC5HnN4oS1YzbNAm6lTm THcv2ILBXdncyVY0/qDwsF/MJVwwc/QHwut7NYReqKu2FCaTF3olIppZLbez8zBsEry7 XN+HtQWHrox8rs13rt7EOcYyjNyvTUohNg30v3bj4yKDCVG1ctlM+G2WR9TysHvyyKZH 6sS2DWEfySfpBXGmoUGwC+9KNKJy1R6Xf60w2+CnctFJxSGngi799LBRx6WzLmDVOHG4 Hmlg== 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=Iixy1SwuwdadzveH7794W1f1Ty/veQnYotCbK/YCRZ4=; b=GuVDCLd2Fz037kvxMobaAd7LDn2OBbQJkg3vlRMQpQyg2mA63Ck5IAhEomrXAD2U6z IPQVG7/KTKY+pvStnCOjF7LcQ8ti6qzvg4uVAGFfxpE/1YuqIqD5TLMpKr5mTE4XQcLu P6qBhDA0ghoI4F8VQQSEccv9Qgrirs6foBs6gfr6nPGxdFuWsnGkC62b+e4ecDm2PZ3j Qg+dmagGvSihSagvGSW99vS3SdLpsH8YMxXssAXGWqaEDwnaOd1DNmtwsMOHvLTzHJN6 +7z0SeZtpBsBsw8BjIMPxOZyeIk9wNxmS8x7GDkfBTJ+awcDOIYhci7eNuAKEljS7uhG pIOw== 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=Iixy1SwuwdadzveH7794W1f1Ty/veQnYotCbK/YCRZ4=; b=AQzY4TR0VMKyTCzX6s2oJuPRo9G0EncTaKRl27r6VsMhDn67ul+5NwIP9Jf5M8Go7Z 9x5axztkVkKnyfx+pwSEOcCOxDixBpo4yMshbuizzDXOYXDBBLATMADx5PRx2NwxIt3m f/D08iOWByAYdNy+g0lBiGJUcjwVlEwdr+DFJKmDuP79Nxpw9QxuPR1oqHNIHpsCI7Nb ytRdpIY5Wz2/QO1McEAtcba8vCLB3EoSHLfhkNroorXcM1rmUhj/vBePI4rIo0f6zvah 2bcFHzxiUa6Y+vZQPu5WdpUsyCqVRypu919btFMG7GaKJdlnuXa4IduuzUc5SLOaUaAu 6PtQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532n5TWrygIqPbEJ2g9LUDSvDwNmZePGk1ATNrxDMGGo2mZK7J9q Jdx61cjEhVs+M9vCnt9H5tw= X-Google-Smtp-Source: ABdhPJzdfAbZUE8SwwgLG6RAVNSoGAwrO2oEJnOyYxukxsPiUvTvMerUYL+CwEcs54jeVOnKwUVuYg== X-Received: by 2002:a2e:9ac3:: with SMTP id p3mr9272653ljj.94.1625080507600; Wed, 30 Jun 2021 12:15:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f94:: with SMTP id x20ls2586867lfa.0.gmail; Wed, 30 Jun 2021 12:15:06 -0700 (PDT) X-Received: by 2002:ac2:4356:: with SMTP id o22mr23729502lfl.309.1625080506447; Wed, 30 Jun 2021 12:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625080506; cv=none; d=google.com; s=arc-20160816; b=ajT7sMAUonHCR4DlwCXWvYk1xkBQoOn5E/kuLOowpOxRtQCTbo7owNCuAKJQ4uiVc0 oJnyKI0MOIXVcIMeCR4sIardzOOVQoqIZAmVh0SYXrKB4eRjzV1gZfJ7FrurQLf5ANjZ HLqXMwdZAzrmHdqbRxq9C/6U9/kMSZ6tO8uO1afvPEynP+1wcA27YxSEwBuapt+4QVp6 k7cFfhqShfRukBetRQXfemjEy2N+mORCf4uyLRtMlGguGmuc3aYVJwbhSwwRzo2gQohK bMHz+lbl5tzw2DmMrqCy5xGbIusomQv++Rj3mKSCwzxNKVUHP8C+G6SnQNl92n39FMoC N9aw== 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=mk+qDNOS8Scms/i35CgajjoN/GHbylztFaBfl9EoVUg=; b=T4zalwp6VsW72kgGzyCWqLhLBubzGgAqi5s6pnvrreU2cLTOFpTCZmzCtH0zsRmQrW OMHPEEcIbinufpiTSVaDFWg1ivHTdmrOe+qrWXNGjbDYAXOC5/euST7rA5YGTujnZJAl XQc0e69Db1HdaTufcdBju/yWqpeP7vnnBkMmcYpzFCJIilZFiUfOcUggGktjpSUlpAlj SsxF4i2uFL6owqoCcX5m+30JmQ5foBXzkDyL/rdqb8YvFLaS4L5tLd9qC4pxUyX7aK4u EzBUG5FBI1qg3zPTLr6tkuSEg2/zezA9tVdrpvfkennP0yiZQwQw+gH6nvB9maxdkR4q gfRQ== 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 d9si1094485lji.3.2021.06.30.12.15.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jun 2021 12:15:06 -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 15UJF5YY030956 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jun 2021 21:15:05 +0200 Received: from md2dvrtc.fritz.box ([167.87.0.38]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 15UJF4LO007016; Wed, 30 Jun 2021 21:15:05 +0200 From: "Q. Gylstorff" To: amikan@ilbers.de, isar-users@googlegroups.com, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v13 1/2] meta/classes: Generate ova image for VMWare or Virtualbox Date: Wed, 30 Jun 2021 21:15:03 +0200 Message-Id: <20210630191504.2650-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210630191504.2650-1-Quirin.Gylstorff@siemens.com> References: <20210630191504.2650-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?1704020418687074874?= X-GMAIL-MSGID: =?utf-8?q?1704020418687074874?= 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 | 124 ++++++++++++++ .../vm-template/files/vm-template.ovf.tmpl | 155 ++++++++++++++++++ .../vm-template/vm-template_0.1.bb | 16 ++ scripts/ci_build.sh | 1 + 9 files changed, 336 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 cf7dc2f..2f7df87 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 6cf1656..7b20a62 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..46b9135 --- /dev/null +++ b/meta/classes/vm-img.bbclass @@ -0,0 +1,124 @@ +# 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}' + image_undo_mounts +} + +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]}' +} + +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 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/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 + image_undo_mounts +} + +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 49d6aa8..b1bbe51 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 Wed Jun 30 11:15:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 568 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c3cb:0:0:0:0:0 with SMTP id e11csp607601ooq; Wed, 30 Jun 2021 12:15:08 -0700 (PDT) X-Received: by 2002:aa7:dd53:: with SMTP id o19mr49947498edw.259.1625080507978; Wed, 30 Jun 2021 12:15:07 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1625080507; cv=pass; d=google.com; s=arc-20160816; b=BXeXO7KIGL5bh6/szpGsFyUzQZqVeM303IoV/9XukbCzVbysxAu07t/FwKVgm+5phE 1MsVXUmH7I23+/KZRclx4UJ75JQX/Irxwbfu/EFCWHe4LHe2ZNV+IQ9CJjeVM5H79rGP vsZ8glsFoawLLzLKHnNdwhRW3Y1a1QCAazLxtB0z6jNfXG1DNJX/U5UdYkw0h0vU2WN9 Y5s0RL04uAugK29TIZ3nBaRzPyaFWht0DIqbS1Q5teDdwSG+GfHMmK25wdzMrUGErGQ7 /S8449NYvQkiLY6x/n2vcfhi2WlGlCaCeGtBYWbx5TJkE6YQfp1Dhjx5Zf81bcHq7nfU /FtA== 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=vIU6NqmgNAYtjoNItqqAZK2GcVkKd5tItBbP4DcUgPnEeE+1ka3zudG3XMiwX2E3/v DGJH7y+GDRCVRACatdTybAQmyV2O3jvDx1QfjnvsjJZbBN0q6I2/DgTNWx0/ytgu0sdV ubrOPtaoyeAgO0TZaeX3wCvxsBF4FoEXBg99yqB8V+Ajllau+nZOXqQzaRzEF42BHi3+ U9HcyZKZSD6R95jJBkegFkiw+GP2kQpIRfwdK7qw/D96Ds7CBhIcXYQ4b44DWyzmToY1 HBDMv9U8ImH/upZNfd1rF4Do+2GhLXkR9CPcbq8YhkPsce8Z4oQtEJL6/Yb7JrZ9RsZO qgjA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=W6kT1lDT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBO4F6ODAMGQESY3VLZI@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 js11sor1217963ejc.14.2021.06.30.12.15.07 (Google Transport Security); Wed, 30 Jun 2021 12:15:07 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@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=W6kT1lDT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBO4F6ODAMGQESY3VLZI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1625080507; cv=pass; d=google.com; s=arc-20160816; b=QoFyBXaN4rHbsp5JJgjlnm0vqzIOBRAmMAGQnvEoGGMwEhZjLEy9BPkGAo0mAzJgqF HKSBwggIfzWKv11ujnU588AoDZx5hNAknnod+N8glqD1WyqtOlOX3YHOo7XJ6cT/q2OG T1tgpFhZOxsd5Zpt/fpOFndqODEprO+rbjqBSHk0zafTQd6uWKSCSj9A8ZwKf4mGl4jO oao5q+1ShrVZD2+dRkM255tR4lbmml0s4hz5ylHvGu9g0J1BXdZ+Imkq97M0EC+ztVtQ znwTJCh99oMsc/UR0U2xivxAzTIbNwVJqGYNsitlLdurNqMT6RMI1QVZXK9MuSXzNDhH UKRw== 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=bEk8+n10re7DL/weJVxZTKeq6yjCKGWGinexQzeu8iYuN1yz958qFlvY/0mTugpkqW ToDbVCmLEtDiC6mwaCLF/YuJ9o9t2v10Nzd6DJX6oLoraXYBoGjo0yqprPTU3BU+Vhu8 gGAwFF/8AnfoZK51wWsrJvNiM+cuxsN3PF/a2w8e1VCIFajhNKE+thVxlEBOWd+MV4FZ wvk4yW2MZiFhOPaO4bJDUhRjhNM9ugGJtBxuZScNpOUizHcjAT90+HZC+xtbwZ360WET iMQwzyLqsVQ6zXFr8tmxAayTD8nSxbNFV48OH1KWHhWHi95qbyzXasTI51+qOTyI2HIf ZoEw== 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=W6kT1lDTD7BaCLBVFYhrevKW7VBfiiScy6LBvqkt1tMVhrD6Kr7jFey1YHEUZd7Spz RnGYAieizpmz3r3XgOzKRYA+bKGuLI59LYLi77csR/ENiVN7F0fL2Z0uIGy0XzfWHBBQ a7c2OkpSlgkhuDlo7XXgvtJCh7/UJ55jJXS6zQWlN/t+FjiEaqB9BBBC5fBdhZvAsfwU uKW+nz8UMMlIr7tDQdkmm/GfAuiwxzJziAca2jxTYMmSYji1EaLs/uIpvMI/va0d9H/u RCSPememzaGxgry0d+gvkJs8QPt3byLal9XMc65daT1GcP7mzl9FSOVXMf4MaM+H7Xpw rI1g== 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=uf3RRXzPmYYEXcbwFpS7RRW45e97fZCLkFcM/nayMb9Sl4qVvSlEcSiqu97JXKWWw3 Nt3tU8pRdulLDdGYDamTz1Ibt3SMezuuQiF30rgu9ZbgZwe8IFdMUg3pfF+0nDulCGrj f5CwnZHquA260CMB9jpVNwY9d+EWVWbGHndtG5S7ZQraYFV3RZqNf8csyioKACFrN6KR pE8hB1UhQvP2xwOh4OA7EG6LxbIo8nKDELe7RpWPC3cStludPxkKip6zh4j09bf7Jr9P 0yA8c5TL7VrxuoCenHOijvQ85eSRHScVd1O0DHn1IPXwZ1V/+3ELUvCY1UZB/QGHWmis Gh/w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531W7K4pnoU+eedbOQiQriFj2FmHdWWspODbZkN8E946gqWUBdy9 pgR7Yi8rKJfFWrmMexN/vIs= X-Google-Smtp-Source: ABdhPJwErwKVRAbtTVSKktTOsxnlUmm8OLrCC+512LfCV9KQRiNs51IIM9tEP+1/XfiGn7rQKTKGdg== X-Received: by 2002:a17:906:dbd5:: with SMTP id yc21mr37359754ejb.223.1625080507339; Wed, 30 Jun 2021 12:15:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c5c5:: with SMTP id h5ls3580797eds.0.gmail; Wed, 30 Jun 2021 12:15:06 -0700 (PDT) X-Received: by 2002:aa7:c256:: with SMTP id y22mr48887111edo.177.1625080506586; Wed, 30 Jun 2021 12:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625080506; cv=none; d=google.com; s=arc-20160816; b=Zzbzgdl3Xg3cA5umsVHJMdm/w1ljyuDvcNNOSqNltp23OCOw5PfycvSuPc/tGW3VTE 0uONI3xTNbiOB3chUOx1LAdEfoj0w9WTvmAHbQ0n013AEo5c9q9CnTm9jQkZhYrrZtYr s+wHaZasrBneiIIzig7toqCy5LYmoCLJBMQUuG4aCHvY4OFpXr5erOCtL+qWB09Nl9rG yybxvdJKEifuCIVJ9XXY7vxRrppRyX4dCCX2w4VOjRn8vv2ZOisCEym0L4GdGzqGOt7K QSkpS6h+vzCJ9kAtv2gYODKE6hPu1+FSLfhcv747H//BPck0q94c0RsBVlcWwmjzz6fG H+9w== 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=hT7aT3bEphJbwoQ/8sCOwNP/YLOsCs9OU4Ar6/zeDWw=; b=CzNnoTEU3E8QLkc+gLzp4yo3UB+xBc4P1Lgl3I9p1U3h8Vp4vWwlvaUCBGck3ScOX+ aSkmBfWnYYQeLdbySyfvAO3raXmaLveAXwNRCbmK1G9bcfdMcwG1Toi9TDDmKsGxe2tU I+G552jY90FXjaOR0/wM69+C6zcGMUxN479LLep2SOTml0JZrqhwdj4ShrwJyWwrSf4R qX6C0JUUH9dp0RxO9PBwZJp6pbBcVwyz3alg8l4SZAMgDKTut5ZvUfmpGMo3BJVWw3lf mKM0GhHm7VesIEbH4IWXLEW/E5IeMH7CWCdW0syOj+9TtF1D7Rni67QE0FinZ/aFQSM5 zqhQ== 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 k3si1076768edr.5.2021.06.30.12.15.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jun 2021 12:15:06 -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; 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 15UJF6Ox015785 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jun 2021 21:15:06 +0200 Received: from md2dvrtc.fritz.box ([167.87.0.38]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 15UJF4LP007016; Wed, 30 Jun 2021 21:15:05 +0200 From: "Q. Gylstorff" To: amikan@ilbers.de, isar-users@googlegroups.com, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v13 2/2] meta/classes: add cpiogz-img Date: Wed, 30 Jun 2021 21:15:04 +0200 Message-Id: <20210630191504.2650-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210630191504.2650-1-Quirin.Gylstorff@siemens.com> References: <20210630191504.2650-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?1704020418704450568?= X-GMAIL-MSGID: =?utf-8?q?1704020418704450568?= 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 | 22 +++++++++++++++++++ scripts/ci_build.sh | 1 + 4 files changed, 33 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 7b20a62..fcdc277 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..8e90acb --- /dev/null +++ b/meta/classes/cpiogz-img.bbclass @@ -0,0 +1,22 @@ +# 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} + image_undo_mounts +} + +addtask cpiogz_image before do_image after do_image_tools diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index b1bbe51..a2895f6 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 \