From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7010760649199321088 X-Received: by 2002:a2e:8150:: with SMTP id t16mr29078140ljg.357.1633529311456; Wed, 06 Oct 2021 07:08:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:240d:: with SMTP id k13ls4521553ljk.3.gmail; Wed, 06 Oct 2021 07:08:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4VZb/wqwMbxZc/9ZY7MnDjBCO/FmFUZBbWYBZbTNhcJsJ6BElX4HeFWToWczCswXykZOs X-Received: by 2002:a2e:924d:: with SMTP id v13mr28785030ljg.380.1633529310367; Wed, 06 Oct 2021 07:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633529310; cv=none; d=google.com; s=arc-20160816; b=D2WCmQ9GxdOWJnep1sFsl5Zqutbas+IfcGRiYzx2hgF6aI+nleZnYTztXnBu14EaX7 BVCN/HstbizGSF0VdcKOF+QtpTqbEb9OzJbh80AApePT4yHu74BRYcH0/frKT26Ob8Sh rk3bYtIesVMwY0fi1NkVHsB2UxktSCY15XX1Ej4xDy6ZVfNz9KBoCUrAguqT/ST3E7wG Syo1+EjyeV+Xlk560Dz/0jPxQcV4OCFLT011p13Zs/427kZIb+MY0k7JOCIS2dT460wC 59rRdBDTKshv8tG0wQhJ71nXHe/cyFHObLZRzyfRbMB/CQjchl+7PqJl+ecsU4fjjV1V JnGQ== 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:subject:cc:to:from:date; bh=tHOe8RxdyGDS7Q74grRgdgzZ6pF8qsBHmq5Vr0yWqdE=; b=CgOcG+B3rgYsNBU54gNOiaNr/3uYD2d7ooDxfeLVrlO594iHkFqjLEtVhGx65Mzo5B xwD67JIUWzRphCLxhWP4dRACkNkqas4QrXnDPzZRJT5+urbfnxJsV5oILoyDgjfi1Iug AUrjES3L+ocCejbOin9G/Pbw/3Or+CCjprUeiH0cpIG/D0mlMCY2fMaBKsVrPUwoSHBT XfvG9r5HY1yTa76lu1OFAWH0CF0XNXxOZir/+E7pMrKjqw8WdDJK1psQ/iNZ6Pz0aRQS RLs3GkzEL10phhM9P05TWJ2xL5Juv1XrTQuZxDQWlKr8rLXgZL75PZI2neJc0gBISN6W 4LBQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id l25si457309ljj.2.2021.10.06.07.08.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 07:08:30 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 196E8TTm008316 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Oct 2021 16:08:29 +0200 Received: from md1za8fc.ad001.siemens.net ([139.22.38.137]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 196E8TjQ031959; Wed, 6 Oct 2021 16:08:29 +0200 Date: Wed, 6 Oct 2021 16:08:28 +0200 From: Henning Schild To: Cc: "Q . Gylstorff" Subject: Re: [PATCH 1/7] vm-img: move template out of package into SRC_URI file Message-ID: <20211006160828.5f56c080@md1za8fc.ad001.siemens.net> In-Reply-To: <20210922141147.4696-2-henning.schild@siemens.com> References: <20210922141147.4696-1-henning.schild@siemens.com> <20210922141147.4696-2-henning.schild@siemens.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: aWJKzxYoDp+w Am Wed, 22 Sep 2021 16:11:41 +0200 schrieb 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 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:" better might be FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" as found in other places playing that trick > +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 > -}