From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a05:6512:3195:: with SMTP id i21mr3096683lfe.50.1639751781747; Fri, 17 Dec 2021 06:36:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1320:: with SMTP id x32ls97396lfu.2.gmail; Fri, 17 Dec 2021 06:36:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKNk4AbY7hu5zNaZ3Avmkh+UU0yCkSAgTkwTC1fhvOxDC7n+zcp5aTeWV8VJX4y3lKvT4A X-Received: by 2002:a05:6512:3b27:: with SMTP id f39mr2960778lfv.67.1639751780805; Fri, 17 Dec 2021 06:36:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639751780; cv=none; d=google.com; s=arc-20160816; b=Zsv4BzmwL/AD2wCQPWDF/tJnwgTHPyAdxRZ/rEb7t4YyR7X9zJMEJNYyQcIdT7GzDu zqxGDZ/8/vLBBVTV+92GodTwNmTWa7dHCFEhfaq/xhgO3vJ9VSIWMw3LXebUNexXhNEm XZzy8RkwWyMVA/7t8dVyHhCQGwDQCAE9mQk/2HU7UWPrpvDkxjKV4bTaM4DkssAg7wTL SBVesfAHRDTrvMYRPLqRCBitq/s+WoD5+SeMrKM4UEgjNc1aWIbPuS9B+0uBLSFSwc9o kc6R5/he2HIhliC/pfk8mIdiN6h9Ikv2yV5werMVzaii3E7DxpR/zRuWL/zkA3Xqkh8B V/DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:content-transfer-encoding:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=eYdzO4IYhnRXabcXWw5uI2rZM7ahIiplaTKjGpV4wBU=; b=uvFbUy0t4mwgGBGyl4JbGxe7VRHQ9CX1NX3JI976NZjlXLdKrWEVh4s2wb/aiUG5s+ aEWuWsxBNxUuaDDK9SMsoE1RUu0j1TX4JYIXs2Faa/z722DZQcyBU8eX4d4dMkO0Dw2l 1ljebaTTCJurJZNpqsUm5HZxs8o1mFu5RMlE1wF8giqkAItVk05N1SIcOcs0poIJH6DM brydwcaKCWsIefmEaXcAVne8a+T9FIg6hi63fZRkijcMsLBfDFxTM750AKmKHAAMp9gq 0QHPGj5pXkgehs7ASbtoYzk/H7wiPHN/hnP4pZtv0ppD1RrfQHgoy8n7b4qqiH/Cv+TT ZsKw== 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 z24si122430lfu.0.2021.12.17.06.36.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Dec 2021 06:36:20 -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 [192.168.67.164] (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 1BHEaIf8018548 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Dec 2021 15:36:19 +0100 Subject: Re: [PATCH v5 1/7] vm-img: move template out of package into SRC_URI file To: Henning Schild Cc: isar-users@googlegroups.com References: <20211216164602.326689-1-amikan@ilbers.de> <20211216164602.326689-2-amikan@ilbers.de> <20211217151257.5cc3c63a@md1za8fc.ad001.siemens.net> From: Anton Mikanovich Message-ID: <0997b379-44f0-7744-70ee-f522d04596e5@ilbers.de> Date: Fri, 17 Dec 2021 17:36:13 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211217151257.5cc3c63a@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US 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: tNWhyrRITby8 Oh, it looks like I've send v3, not v4. Let me resend. 17.12.2021 17:12, Henning Schild wrote: > Am Thu, 16 Dec 2021 19:45:56 +0300 > schrieb Anton Mikanovich : > >> 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:" > This is not only style ... but a fix not mentioned in the cover letter > > How about that? So we stay with FILESEXTRAPATHS but do not use > ${FILE_DIRNAME} as i had in v4. > > FILESEXTRAPATHS_prepend := "${LAYERDIR_core}/classes/vm-img:" > > Henning > >> +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 >> -} -- Anton Mikanovich Promwad Ltd. External service provider of ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn, Germany +49 (89) 122 67 24-0 Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov