From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a2e:901a:: with SMTP id h26mr7055398ljg.166.1639514233341; Tue, 14 Dec 2021 12:37:13 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b9c:: with SMTP id g28ls1391284lfv.3.gmail; Tue, 14 Dec 2021 12:37:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLe/1CEdElHF9pAuzK11woLKUQV9ZNasOHXCC+l1+ClS7bbi6GVHb7c4JDTdRERyI24l2j X-Received: by 2002:a05:6512:ac9:: with SMTP id n9mr6769799lfu.59.1639514232178; Tue, 14 Dec 2021 12:37:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639514232; cv=pass; d=google.com; s=arc-20160816; b=EuI43I/tEohEktX71GQTdtaaxZ2nnZ6ioghtN75Z/nPF6bypVjOkUNq4NoU0fQP5yA C57AFb53nIYML6Sh4/KuwoQDQkTohM0u2U7pL6XMp78ON1JHJ775ED18BMtzSUdG8450 J57HuPKQCE6+Fd15l+s1IYe6UF2iIUXIHr4taQGVXx9s4M8QtZ230NRXtOcbHYr7qYyY zKA6NYYS+5twSYDnM8BNOU767Rxddy2q/rcJx1nnbgxHTeuyK2Enc0yG0SnOQxZazNq5 Xp7WMICBy2kTz5v2wqHrKG8jOfda2ihZS38o6oi2Y+AiC3I+mt/LWTh+ZV8THtPdE55I N0Rw== 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=a/RbrknXYQ5XuKT7viw8ec9rzleXRQxG4/+RC6dpe9Q=; b=eBh3hn+E9Uzr65hHbrpBzxygZZ/QvMdjEvvw/pVFcDEr5zgezM76wEYoe8fEP87dKe mK66/OKvpkszzghKmK+nG76ucIXOZuly3rIBTGZhwzUq0/HEPjZKELZ2gUD4xiAE4zaL q183yJvfEaYfWydGR2K+5O0Ew5sAPysWcQhb0Hd9im2364VhCX+HEoHm2WSuiz8kmg2i 6DerrAvl4O8eVNAKfwQYMwZvm3sv68nbfgFH49yp79KZzI2/ELAHLPQ0fwxvEZc5C6Db 16HpBc9TzR6gtP16KyKVt/xnSyYn5N4M37erMo2ocC36O5Nx++wIb/ytfdm9rMVPdeb7 Y+9g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=POflwVJ2; 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 40.107.8.45 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80045.outbound.protection.outlook.com. [40.107.8.45]) by gmr-mx.google.com with ESMTPS id l13si35098lfg.1.2021.12.14.12.37.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 12:37:11 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.8.45 as permitted sender) client-ip=40.107.8.45; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=POflwVJ2; 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 40.107.8.45 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=UG7zyjcnOIBpehNP8XQ7tdgpJJAD5Zd9mzYUSE8BWjcQAfnknHkK7MIiVyhL9oAUVfh9//T2m+MpPcGYzcGZk7jWVFx2+GcVMRVEcY2Aqtcfi11voqQAN8uwlmQkap2YfOaPJZg4V++LKlrLVBbpkGOtX66F/NsrTyWGLuMh9EzG8CwgP/hFKzaly1LXO9Tpexr+rOyW2aBPiNR0H+ea+z8PkRcvg+eGwm4Ns6Q80o9c5UeJcd9WxDXVeKipsAeVY8gwlC66wLZLvSwahSOui5fgXu6wDkRdLzbZjCn9p7lNo7Pr7Wtayoh0+f/qFBJXooy+jwnHh9MFnHTyJiTjfA== 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=a/RbrknXYQ5XuKT7viw8ec9rzleXRQxG4/+RC6dpe9Q=; b=hCsW0LQ5jn0ZU3YWUnXLeTBqzO6d01xblLFuwb9Kerl/NmOCSTe8udPbM906ufS3PzlhpNERNDF0YhjYhMdOqHfHZzFDJkzqGXlygXc8cHBd2bufKWT18Kq1YnHpwk1uU8VIIgyAx0QMbXbp8sSI5VqUUCbwSCtpgYereD9/iTSEMjZT/JwHEm1Yt0e+pRjY3WStpDQ7XznL01JX/UKWqsqmLA27VLuLutTeVXHLubMxcLfn2FqPwAlFGIJ9TSzCgkqfT70okq+XV0agmIwTVyNgNcqZAmYCGihSD7HPFVkwJPacY3xNxGv0RC4zQ7UsFLmoGWBvX2X3XeKsEoFZtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) 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=a/RbrknXYQ5XuKT7viw8ec9rzleXRQxG4/+RC6dpe9Q=; b=POflwVJ2E4ht35LsS4D7SWECbIbIn2TxfNHea2hp4w+l7bkkS52lQ5TutIge1/ZWNlQhHSr6md53DJhyYYnh3OWxhKTOpH+YFMPac1QUTcHfXpMb8mkIZux0Y3hl3AehtlecJ7J4Xjeg47+nDPHxo7lKtA5DWgbGczUSSXS74Rt0kTX6q7lJ4ew9vkIOEC+7wic8D7DD3vjuL5Fh+ZZwBdt9ywkJ//yo6svMxYv7OtDdHUhOA35F1CMTZfK+OfYwL/hfYJCI82FXEa88KzpSNkxpC8Y2eCdfDNSgDy/DU2PVGDAxs4vEc4X3JJ1Xs1e+lj2zylvNs8Wpe/KVVrGKMA== Received: from AM6P193CA0133.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::38) by AS4PR10MB5371.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4bb::17) 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 20:37:10 +0000 Received: from VE1EUR01FT060.eop-EUR01.prod.protection.outlook.com (2603:10a6:209:85:cafe::cd) by AM6P193CA0133.outlook.office365.com (2603:10a6:209:85::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16 via Frontend Transport; Tue, 14 Dec 2021 20:37:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) 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.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by VE1EUR01FT060.mail.protection.outlook.com (10.152.3.93) 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 20:37:10 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) 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 21:37:09 +0100 Received: from md1za8fc.ad001.siemens.net (139.22.39.210) 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 21:37:09 +0100 Date: Tue, 14 Dec 2021 21:37:08 +0100 From: Henning Schild To: Subject: Re: [PATCH v2 1/7] vm-img: move template out of package into SRC_URI file Message-ID: <20211214213708.278d4862@md1za8fc.ad001.siemens.net> In-Reply-To: <20211214203602.21996-1-henning.schild@siemens.com> References: <20211214203602.21996-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.22.39.210] 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: c3a83d3c-53fc-4244-b8a5-08d9bf4180d3 X-MS-TrafficTypeDiagnostic: AS4PR10MB5371:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C+bvKNHeN1XnK1qNS7x8R1MMeuZs6p+cWFDC+VTo5LlBbslgl/jMMj7a7uB326BBZjxR/aZ5WUNFWbTNnOJ7JOfa+NP1LxNh5ymxGkAdsNnAlj8iY+gNwYL+ttyHOf1UiPBxIbbOGcWPAauzqBXtPOV9AmWTru452iJHhcY9cd+3GUokt19e0MP0v1kqpJTMa/geVL09SsiBbwFbrzG6VeXNp8Qz/ftHVtueUH3Q25aT564mT8QpTKGF5ClocY48XBdq/AU9R2FGMRes4iTvc3pltG2JDEJZTCVTM4xmT4qJieJ5NQwh6qqI8WTVZ2Hul7J7yG5WEeKqBX+4e/kOdRJX9/jPoN8k+4Q3WrQekMUgHfwXbbGVwx2T9bxZZpQSO+J2dItBmpBN+BsXLS02pVuCJ9gdkho7tjc7Rmucq7tU3Lb0ssWcwqQcigkmEAQG4uFHD54jWX+uTmEHV/4j065/m81jJhCNvAp2zxp2vh3zp7MLQyAfRCwOub9ndealgnjlM2EzMoLlDV6X+P6eNXzjcoFs3jNVTCBB7gcC1dtY5tk8adsVq3LeB7M857o1t63Ww+LIr1f8R5nT4OEVK5dIIKavfKjeSCOjGCcLpJONztHSE0dZTtBTAXEUneZM3ER+HnbH2E4FtQZyPb953sOe2kOg+kbwNCXi2XFmHDBDmlMFnD9j47aWRy8/R0IPW9Mc9ym65+WG0cN789ZDpd0WHKSL5uccLdDEXzcWDSGhnWuy75WATLr9c3goKbktiZfb15eyKaxrsyoh1+24GEcHX0N8mu7kFZgsMYTPBV/v6BBCuQHCXND11yrqkTUoY8+4zcO0OFjOTbDW1TS8qA== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(6916009)(316002)(1076003)(8676002)(7696005)(5660300002)(86362001)(186003)(55016003)(36860700001)(356005)(336012)(16526019)(9686003)(70206006)(82960400001)(81166007)(82310400004)(83380400001)(26005)(8936002)(508600001)(2906002)(956004)(40460700001)(47076005)(44832011)(70586007)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 20:37:10.4305 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c3a83d3c-53fc-4244-b8a5-08d9bf4180d3 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.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT060.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5371 X-TUID: 2fwgNR4gZdvx Really sorry for the noise of sending this now 3 times. Was fighting a rate-limiting SMTP server but now it is out. Henning Am Tue, 14 Dec 2021 21:35:56 +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 > -}