From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a17:906:6a1a:: with SMTP id qw26mr6547107ejc.489.1639498328392; Tue, 14 Dec 2021 08:12:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c98f:: with SMTP id c15ls822157edt.0.gmail; Tue, 14 Dec 2021 08:12:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDpCDcahpJJiVryNxwndVmxLjOCyfsUvtviW6tOeZa9lpqipVAk0+64PJC/+BTcP90+v4n X-Received: by 2002:a05:6402:100e:: with SMTP id c14mr9320659edu.196.1639498327478; Tue, 14 Dec 2021 08:12:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639498327; cv=pass; d=google.com; s=arc-20160816; b=xIxx+DYxTljkpwILwd6aWeEWDLRFF6YJuL7mHeviFEZ4hpBoOG6LeAVavlfohKWUSp 6lqDtlOCRdgDzgdnOeHLu3VYVZbb+nKYVQUrz1ULeaF2QYvGwES4BT0iHYZj6Og21gqx oaxeRcf82rn7TrOU4MaLPIgKmkA6+FCZYAjvGWIn8Z0WIx6o5UInbvzKwSveEV1mt7W4 j1pGGMUfgNdLg2Uxk+YL/8o28g8KSCuOflR27a69BP32KqMo7az0aR4NFbYHYnIxvqNb vQlrh7eAY5z2o0i/QsUoJBZiACD/to0YFv9bXA59bUCZlZ6sQJ9XzkSYz2k9AUXW1idM rm0g== ARC-Message-Signature: i=2; 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:to:from:date:dkim-signature; bh=W9dJeOHb+L50l3XPY1PGiUUeemA5WsNbRmDqQ9Wse2I=; b=tMhl7qumXUBDuxDGintG8z3HgmGia4/y5eOTCrd91vulRB7vcfCN4SQrR1agyL419J a8fgRsrSJzwKDN0fyWVrLpvJiwk7UsK9xHu5EG8xJJSrrepKHCHh7S1stzhIV53KsoIY wUs3NpT9iWD4R1j2uX4qS1ib/gS8SVbZXmCTEvS30oec+Ylyl2gOkVq8+wvUTwysxy3G zLFEp6QQ+ilC8WRIoUq4GJXAoYQqVcfvU+A66kv7GX3rNBjssrUEoriT0olcwTCeT4fc kOmA2zBPf7c/C/uuIb1cSk5sX/oIW37tOEKZtNPU9xrGPKE9oEHG/lvKWhyDuSMyFOW6 ldxQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SEYgOjPu; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::602 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 EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on0602.outbound.protection.outlook.com. [2a01:111:f400:fe09::602]) by gmr-mx.google.com with ESMTPS id d5si13261ede.2.2021.12.14.08.12.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 08:12:07 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::602 as permitted sender) client-ip=2a01:111:f400:fe09::602; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SEYgOjPu; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::602 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KIkmyT1b1Yg2C5zikXgeQZYdo9XftdT2749kfQBepKj9abqe3NZePUgb6r4PPG1SrhK3Kz2eTXOc2WPuQL8BoRuVgUCX5VEJscQdf/Ll06q2lRL4IPp0MV225YFipo3vUrdavOhS/jhX/YwO2wtRIwCRUFpmuil/YEv4ISPunlw/T6aQ2GBNpJhObU66qOMz9JxgEq1XsBTJuBjJIBAa73Kol6gP7KYIuDhPu80YHb/bw/tGenlGQK0riLRqCD4fKVV2imSms58JVd8OoDvaVYhgJDrzJ0ZoANDGEVUAjAvgpHGPdrih4NZrqpJR38GSiRacqXRv3MQMc/B3gJTBWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W9dJeOHb+L50l3XPY1PGiUUeemA5WsNbRmDqQ9Wse2I=; b=CWFno/5XroMeVXYpUM7Mt9T6Y7dkpeki4AQ0+yMRwl3aXt+cJwrquW1Q1R35b6856nfXj21DojV0N/K6tDFS4GKSyJ5PnNep+8hGz1oTEgSuo1LylkljdOAd+dBfIJTf7V81nkPnfKeyWRfNaQsQVGDLN1M7nITPNkHgf7tbWDrxkWdbsDvJdMIEAyBiXIv8aEAm+MBUAvA1BhgFXwx727gnBDcp+fP/n24Dd6XixF2yCnRapjAQf4oBaeYucKnHlFgodSYd4zcDkwauZBNcrXvlOPtGCcyN/4XSoz2DZ9QhmCXnN3GzVNhgf5dESqFPTv/5D5WOWtNud2/X6Zgmcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W9dJeOHb+L50l3XPY1PGiUUeemA5WsNbRmDqQ9Wse2I=; b=SEYgOjPuewclfbIR4FlPnQu6JIUCLWviy5pPp1D5/C0E+g/BK4529w8pJeBWp6VLQQxixmT9+8oC9B0rCLBLgRSEegCp1NU3DVlMZLzG0rU9gcbP//FcVimDW7Y0a2nqyjxb86BJKowFfKJLQti89oJnjhBkqljEHZTFOJPYA9dkGRd9e7OojwAmByCfNbS1vnL5KwQVQ8JoYtD8/Pbpis/FgOTpnuLpXaOCNBjE+/PjGJLIfAF7I8VLWK29EmM0qRveUxvPL/6xoNo3Zpu5bDUfyZ9T+kS26gclHGVaOo60d9UHvlrXnjWsJwAgeSf8RVSG+PNt/TIHWGLYGqD8zg== Received: from AS8PR04CA0164.eurprd04.prod.outlook.com (2603:10a6:20b:331::19) by PAXPR10MB4765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:155::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Tue, 14 Dec 2021 16:12:06 +0000 Received: from VE1EUR01FT028.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:331:cafe::a9) by AS8PR04CA0164.outlook.office365.com (2603:10a6:20b:331::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17 via Frontend Transport; Tue, 14 Dec 2021 16:12:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by VE1EUR01FT028.mail.protection.outlook.com (10.152.2.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Tue, 14 Dec 2021 16:12:06 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:12:05 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.69.80) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:12:05 +0100 Date: Tue, 14 Dec 2021 17:12:04 +0100 From: Henning Schild To: Subject: Re: [PATCH v2 1/7] vm-img: move template out of package into SRC_URI file Message-ID: <20211214171204.7a8691c2@md1za8fc.ad001.siemens.net> In-Reply-To: <20211214161044.5481-1-henning.schild@siemens.com> References: <20211214161044.5481-1-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 Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.80] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b22d2a2b-d592-4343-a39f-08d9bf1c7912 X-MS-TrafficTypeDiagnostic: PAXPR10MB4765:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TR8pWEuZGPkya1T1wWcP/aKttUfG9IAO/BrjRORvUZX0M3r4V5bONmIooyQZVB4ZBhCBYkOP9xwaHzt0iHLTNMmeYtLebXcuUpZWn4LsoiVI+vfYhZ4GNYvh4ji46GlhJw/BL9+ewE6hAvp58i1MTPtj5v3vQP+hzkbsf+Y0Ucicfy2N+IxRhhOSQkMSrp0pDXLW3TCtGbH6n9ErigFFaJAPu1eYvUSptX5G1MZEBb6JuYlZK8v3dux/07YtMGD69eiCMlXqmwIPcBBA1xmRMYHhQspt1kB1Yh8IfT9TgiA6DucaK8/TO3Ghn34ufGutPzvdoNH40++bREEWCh3hSorL1Kk9eFpPmgbsoy/6MmFToWx0L2GdIsoGfXmwCfQayDelSDgswdX4q+H7gNVOqNC8jh5qNcTqjMI01CtaJ7SaKxiPXsIYM/kmGQNt2vNDHPSsnMShXstpAtQZgzFeuuBGCAcsUhiPbFqKPObCdiihfe/QazZrtnM8WxxuixbWa1sxlf8GUBa8/7H5FbWm0HSAC3h+shbAwWoTIzlUA3Ar5dJktIw7WaM8XXmn1u5D3pFFttB9ORSw56R7L2/EdsHDQEym/PUED/2cRhUbws5JlO9LLlZHUG1Y3k/z/UdWud8murGiqVekVSBiE2xGxxiv8F6ca7AHEDkxIXj0M8B51CMCoTVc4xk6xWTtaGQotbO4rkY4OfIbKKgDrscZ6NAwz8EL8aK6JzUCi5AuWjKoKEg/iIvZqxQ/on9edRiHSS3P7MvuvdU3sdi1p24b6m65VmFUqwSqDpd+y8GGrqQLsVJKWJyiwlySP7c4KxcoLp5L9F4qnDwCec3HbiYAsw== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(81166007)(508600001)(26005)(82310400004)(55016003)(9686003)(70586007)(83380400001)(70206006)(186003)(47076005)(16526019)(8936002)(82960400001)(336012)(356005)(44832011)(40460700001)(2906002)(5660300002)(316002)(36860700001)(8676002)(6916009)(86362001)(956004)(1076003)(7696005)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 16:12:06.0421 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b22d2a2b-d592-4343-a39f-08d9bf1c7912 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT028.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4765 X-TUID: IXsy7y5VplSn Not sure ever did send that v1, might have been holding that back to not disturb sstate. Anyways ... calling it v2 since it is at least my v2 and i just rebased onto the new avocado tests. Henning Am Tue, 14 Dec 2021 17:10:38 +0100 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:" > +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 > -}