From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a05:6000:184e:: with SMTP id c14mr1345227wri.499.1639514167215; Tue, 14 Dec 2021 12:36:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a4cc:: with SMTP id h12ls118141wrb.2.gmail; Tue, 14 Dec 2021 12:36:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJz322zakT13QfLbVLLPVs5fFjZ/fdJ306zQVGP/hpcropmren+hHl0rTMGwSOUj0h5EEBry X-Received: by 2002:adf:f18c:: with SMTP id h12mr1466035wro.484.1639514166251; Tue, 14 Dec 2021 12:36:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639514166; cv=none; d=google.com; s=arc-20160816; b=ygboblFey5uS3BPT0gRghh+03e2kWtE80W7BEIbgU0U45Gm1NFIqWBBACHXRAZ1YuB GGynx1e2oF0Qtzj2H1Aiu3fxmGF/U2HZaD+Cdh4GeXqh6pQfvBTKf25ZIYNQF0jsGTTb c6Bm+z61trHodQVKCzRzk6JAbuAcewz71Dc2HBMasJqmZ5i+1zjBiHNpijdrByD276kx CjZ1wg0i3nzUIL+InKT1Pt7PLxYC6zTeET4+3ST4ttgMbhpVTJyl9w9tUh/0a6OKZ/CL OSnFaB5aN98N8r4v9TboX+Ai0UuYPK3Z9/U6QaaSFvQBKiV2+uuPpYhV5AA/s1dqAlnh 5oUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=83aS+t9CkdqbqZpbzWSSdGySDeNh8WeDVU+Hv1QtBN0=; b=cR5R9Ar4VxCAC3chlp1yZsD51YV/zEvlEeLgF9OcduHs+3bCncYtuZShDBKhwKNAml YU+BmzlfazWfsmvAevOFc03Bz6p9QMSkhnFnFeCBhnp9WC8TO4XUniFMBOXiIUUwgYIT T8+Xcp4ewH+a6jPO8V6QJ7iS8UvYydIPJ9A6zkffMk0HBJTsJxeLUHshdPlvnlaJCmmm uXq341jza/ixTDk2+vpWg12Nvm8KM/7BnrthkNj7WSWDIP7ULlbQFT3mFo5AKrIKlZmN MEyp20mej5h7WetUEULX+BHtvdEcoBGMqYTjwThWgFnIqnBRWQibhwKyCS0le4ScN7Go VmVQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id 138si40976wme.0.2021.12.14.12.36.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 12:36:06 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 1BEKa55j021338 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Dec 2021 21:36:05 +0100 Received: from localhost.localdomain ([139.22.39.210]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1BEKa5qN009540; Tue, 14 Dec 2021 21:36:05 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v2 1/7] vm-img: move template out of package into SRC_URI file Date: Tue, 14 Dec 2021 21:35:56 +0100 Message-Id: <20211214203602.21996-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: hMyIobCUUXfP 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 b230af247357..79f3b7e45e83 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 1d474cd5d8d7..000000000000 --- 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.32.0