From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a05:6512:39d6:: with SMTP id k22mr3030412lfu.559.1639750383145; Fri, 17 Dec 2021 06:13:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1320:: with SMTP id x32ls52442lfu.2.gmail; Fri, 17 Dec 2021 06:13:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJx427fn31CDQF9LGFeLc2BYoK8rU/wKF0xTiK8UdO+oHrUMwtF7Z7A4qeUKLx/Y6VKcLedN X-Received: by 2002:ac2:464f:: with SMTP id s15mr3017558lfo.590.1639750381990; Fri, 17 Dec 2021 06:13:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639750381; cv=pass; d=google.com; s=arc-20160816; b=Ter+UOF6wY9R1JUa7snNJEhjBdbEpXgqdiYpW+EV/HN3yqFHED19V7bc6l7X9aUEaA R3l5ZRI41SsPjZyTdjqNxs2MIMgtN+4dzPRKNkOwLm2ut78aOpS9aRC2oj+oYWXoclIy hysmzVBUarCfu2BAZZAQcCaFn1RCZ8bVUcLte1OdkuakalOMii3pREkgQaRUbGuhFpot unzq8rK8XG0A0Cx9H6Mnai2tdo/UOLlQccSKpef3uuSr//DXXl2kr73zJnnwHli79FJ6 tZvt1QZYGgyUj7f0xED2AOPjmqDsQ4U0c4llQP8jCUZ+ts+ov+NEkt+O3VpEkh2Uh0GS 6YLQ== 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:cc:to:from:date:dkim-signature; bh=hBUDmRPQC2ybijqjtVXPbCZRrSnghXHpv0MkdWimyDk=; b=XUjEajTLYTHppys2D0FE686Wa5n0GXI5rQejAp/gtpiPHTcGuLRLX0YicGHaWuyBSe 4/xij/aASeMXRd3ni6IJbjE9fxCoB0x3YEop8elNYXhxY1WPWmOugNVXLlthWefEu9W4 Yf54riMNGl1TP5WidyXrFRpMRdClx5A4xC5KGVR+Tz+ihbwTiTPFiDyC/MO2b1yLShdy OATD+pn+7Q0mi9YMfYRywlFtebkgT36ohinBvTS+kaVozGli31scJouOv4hQX96oVGx7 Fj2y45X805MK7QYwduSGxbYSkcBPLIKDPVU0CKcC/fXdaVT1LoHvcMzjaFmFjr1oc6tu NiGw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=K+DNP8Mg; 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.6.81 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-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60081.outbound.protection.outlook.com. [40.107.6.81]) by gmr-mx.google.com with ESMTPS id w21si455564ljd.2.2021.12.17.06.13.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Dec 2021 06:13:01 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.81 as permitted sender) client-ip=40.107.6.81; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=K+DNP8Mg; 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.6.81 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=hq2Y9vy62PhRxHdcJwd8uTcnKSbvExkOd6IM3UNlQHgJSyGWnzXTOSzK2+TaBJRHFz3hJpF9v0oUUzTqBK7emY8QTpLx5CGgTqDbhZv5BhiDhX14OfZ8Y1ASQNCRtXUjqJY2uwI+kwFaJIFiYy/g8DgIuSA2rnCLsINQDBu4taaA7sVufVUheMPAaV6GL3emfhcvz/Oa8OprfzhQJdswIP22Fom4SlT/ujQvsfVbVmD9T7Qo8CucP5lFhWNHIToie7S/YTPKjxiaOvK72ymSxW1btxpGet0UFtoXj1KUB+Tt/AZsyIgr2nhljzxYyRaF15fLVNx31ljPjnzMh1VLpg== 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=hBUDmRPQC2ybijqjtVXPbCZRrSnghXHpv0MkdWimyDk=; b=NWMjGdA1hH+vNmMeZcxz9jJ/BBgi0sggcXaq7q5CstSNfNO5LpQOFrnGMaRI3ducKg1vpNvcCu94BvI/qKojNotMXiTxkoThQ38Q27bInzeZ2PeDJnnC69PGCSisAWQ4D+IN8xeKBp2CeVlgHXFoLgkVCd2gsK2wXfhQ8+VsKoZQeqrAJws8AnIhPrGvwHsrzpX6uJI29VlIKsdUdxYoRO3qGXjTWRVYzxo3I3kdXIdyD93tyEuncjgfg/SfSwChBx/TbEBTwZszMVDozohbP2DOuIWz3F2aSZCW8u9SoAJR404TWNn4OTU1bAqfntM3jzpHXvYXQ1hSNTt73t8w3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=ilbers.de 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=hBUDmRPQC2ybijqjtVXPbCZRrSnghXHpv0MkdWimyDk=; b=K+DNP8MgwneX/braScR4cv+yat79mtyS0zp8edknXLflkOWU1mrSXvBktDcbUr2Ssa587+SmvyucRGpsVLNkqWBSkiXH8KulMcBMLcQDQk0iY/d0AzIutYo1WkoQrz9ftnMIYKOXY27Rz89Q1Pq5QDdJl8NTLUFssRiPWMaP7zrERtziLLyqr+1ELq5Po+69wU1wXWf2PZdYmNZJgTUbE7Nhn2ZdoLm6+r7MXM/kA8kz1KDGInn4/8aIFG024bhkV0FYueniwP6fAVg8hq8BhBmU1Hi1CvswaM5Tc6CndSizfedNdHpM5QjuwyrloW005tXBdVpBLfd1SLAwtPaBNA== Received: from AM5PR1001CA0013.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:2::26) by AS8PR10MB5073.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:420::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.15; Fri, 17 Dec 2021 14:12:59 +0000 Received: from VE1EUR01FT054.eop-EUR01.prod.protection.outlook.com (2603:10a6:206:2:cafe::b6) by AM5PR1001CA0013.outlook.office365.com (2603:10a6:206:2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 14:12:59 +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 VE1EUR01FT054.mail.protection.outlook.com (10.152.2.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 14:12:59 +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; Fri, 17 Dec 2021 15:12:59 +0100 Received: from md1za8fc.ad001.siemens.net (167.87.1.126) 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; Fri, 17 Dec 2021 15:12:58 +0100 Date: Fri, 17 Dec 2021 15:12:57 +0100 From: Henning Schild To: Anton Mikanovich CC: Subject: Re: [PATCH v5 1/7] vm-img: move template out of package into SRC_URI file Message-ID: <20211217151257.5cc3c63a@md1za8fc.ad001.siemens.net> In-Reply-To: <20211216164602.326689-2-amikan@ilbers.de> References: <20211216164602.326689-1-amikan@ilbers.de> <20211216164602.326689-2-amikan@ilbers.de> 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: [167.87.1.126] 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: 31168da5-ec95-48c1-3d29-08d9c16754b8 X-MS-TrafficTypeDiagnostic: AS8PR10MB5073: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: YRje7Q1B15YJBxuyY4xVcSq1B0Jypmd/+CKQe30MRtEUQwBO0Pa4i38Oroxwz9k+31w/EZWKzHnSNcDIzrQc/T1Fm/cYHdKvYqjY+nSA9644TDgUQ4V/btpN/gRuChoYSj9yxoWnToqUMFlM47R/MlYORLu09+Rshx7s16U+RcXwY8ga27kjAgp0euVUil+mTCK4ocEynT5OvsSaPY6gaCTQuNSMbBiswSWoRsyYXu78hmLia/1nZvclhWhfQCWV/IsE536wunAT8nIjS6qfLtytiyn4PJwD7KWv7K2gY8VmpBxBZ+y8Pm336Q6Q+7YFVjLawk8JWG7gzXsAubpPPXQBahKFNgl196A4yxf1A3tOruk0aPVLq/Kf2SdMZCnCgXuB2FGZJocnhv55Js0ezfZD+hQoibXaMFZkrNef7wVMDONcEPSpbSnjnKdv+eGPBk4LlY1RaN993EA4LgJxHIuPZH+GsuJym25GupNFO7vGsJJKepuRIGrjpn9nzZI9XhA9DKoerKEVqVdr+3xrxyXsOCh0w1/TtEGPhWJ3Ne2pp7t54qh1Do34V/ylOGoAEM6oiUNGYC/4JqoOklq6r96bcBXmz6pt1CEYHxdPwSnaIhPX2v22Hx9fldUAofDIZwNaoiURotAs2CO4FcN8MIAkUmIbRhIvDXsdtVbviAjkrrjY3RTO9rDkNCGdqIy3SVfoXpXrTnd/5YWtqNmqeN94iQTwe+/cdDt8CoZwu5vD3lzNIV0wuyoY/XnhvYMKFFE6N+FNeiJgMIPWaLF9Kw9biUfoCzFbGKm/bkkwjf3e/qNuNZG9J2nfQxnfufGH27gToKIvtAXx+wmS57zi9g== 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)(356005)(36860700001)(81166007)(4326008)(2906002)(5660300002)(70586007)(82310400004)(55016003)(44832011)(70206006)(86362001)(47076005)(83380400001)(40460700001)(82960400001)(956004)(8936002)(7696005)(8676002)(186003)(26005)(336012)(316002)(9686003)(1076003)(508600001)(6916009)(16526019)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 14:12:59.6163 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31168da5-ec95-48c1-3d29-08d9c16754b8 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: VE1EUR01FT054.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB5073 X-TUID: KqpX9dSHiqot 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 > -}