From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a05:6512:118e:: with SMTP id g14mr15805307lfr.561.1639673176157; Thu, 16 Dec 2021 08:46:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b9c:: with SMTP id g28ls1514478lfv.3.gmail; Thu, 16 Dec 2021 08:46:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzxFfBP+LrZGYqw0IpWUzRWo0x0ddlCJgDiqX+3nWE/n/t/nXa6XErlSIF89r36k6MWxtsu X-Received: by 2002:a05:6512:10c4:: with SMTP id k4mr15347624lfg.373.1639673175015; Thu, 16 Dec 2021 08:46:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639673175; cv=none; d=google.com; s=arc-20160816; b=i3qope1i0fNstOlH92AWJ47u8LXmFQaaQTvOebq6sdvJIiqlITIIHon7o1bWkIn59I IfsXzhWVPE0ruE2acbyVUgski35RlJ/ntRbeiXJ5mIwHhAMlZEvO0eVDK2fTQOH/pIm4 H/Vrsm869L20k2Z8Wpygrb59R1iD2OI+MtK79r84uWd3ojANTk+o3b5cQ9hBLOL1lgc2 LEd/g1Z8TKjIgwuG/zXJ4bCmEWnf8U3roKkQ7YKoMqdcT85Jn9A4U6WCsJaYnqoZ42ex biN0EivffxTHZTsJfZAZnjNYkjLMwtFPNGBgv4eeu9FjRUv2Xnc6rUcQrHqYdp89KcVK Lr/Q== 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=OYNDZHgBj2HBEewGBbaPwzQVAdNrkMYg9o5f8XKiUxM=; b=KpMdTujMv8CK/zY7d8qo4M6W0TAGzjNi7Zt8GloxJmU/UhBQYHM+viqhbo057ojNFp XPc80khxxzGLgNNEf1zXYjPkST1Z4x9I/1UHWiSJCgy5/oYIzX4QVG5x4hWLNeoXYg7/ R17CERXyQx9l0UY9VVbrOfXxK55G4hvwExGeR1SPgsBjyvTApOlgXMk4GAkkeY99VzhM Y2AsICql4kRuFFha2FhnbIRLDCgQuzY7V5GAVS1mKzQy0UrIZBV/KGDkSWA6RVznTTML kIPDtASzozPvbKpFFiXsy5bBrMdrdruHCVBFdPaPMnznZkYT0XqTRheL3lI3eFJAh4/+ PlAw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bp27si152133lfb.7.2021.12.16.08.46.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Dec 2021 08:46:14 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-214-81-214-37.mgts.dynamic.pppoe.byfly.by [37.214.81.214] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1BGGk8Wn014355 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Dec 2021 17:46:13 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v5 1/7] vm-img: move template out of package into SRC_URI file Date: Thu, 16 Dec 2021 19:45:56 +0300 Message-Id: <20211216164602.326689-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211216164602.326689-1-amikan@ilbers.de> References: <20211216164602.326689-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: CNvHsFJgpVOW From: Henning Schild Instead of placing just one static template into a file coming via a package, fetch that template file. That allows a choice in template files, or any kind of modification in layers. Where people might not find our template to be sufficient. Signed-off-by: Henning Schild --- meta/classes/vm-img.bbclass | 8 +++++--- .../vm-img}/vm-template.ovf.tmpl | 0 .../vm-template/vm-template_0.1.bb | 16 ---------------- 3 files changed, 5 insertions(+), 19 deletions(-) rename meta/{recipes-devtools/vm-template/files => classes/vm-img}/vm-template.ovf.tmpl (100%) delete mode 100644 meta/recipes-devtools/vm-template/vm-template_0.1.bb diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass index b230af2..79f3b7e 100644 --- a/meta/classes/vm-img.bbclass +++ b/meta/classes/vm-img.bbclass @@ -7,8 +7,10 @@ inherit buildchroot inherit wic-img -IMAGER_BUILD_DEPS += "vm-template" -IMAGER_INSTALL += "qemu-utils gawk uuid-runtime vm-template" +FILESPATH_prepend := "${LAYERDIR_core}/classes/vm-img:" +SRC_URI += "file://vm-template.ovf.tmpl" + +IMAGER_INSTALL += "qemu-utils gawk uuid-runtime" # virtual machine disk settings SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic.img" @@ -100,7 +102,7 @@ do_create_ova() { 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 + cat ${PP_WORK}/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. diff --git a/meta/recipes-devtools/vm-template/files/vm-template.ovf.tmpl b/meta/classes/vm-img/vm-template.ovf.tmpl similarity index 100% rename from meta/recipes-devtools/vm-template/files/vm-template.ovf.tmpl rename to meta/classes/vm-img/vm-template.ovf.tmpl diff --git a/meta/recipes-devtools/vm-template/vm-template_0.1.bb b/meta/recipes-devtools/vm-template/vm-template_0.1.bb deleted file mode 100644 index 1d474cd..0000000 --- a/meta/recipes-devtools/vm-template/vm-template_0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -} -- 2.25.1