From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7010760649199321088 X-Received: by 2002:a7b:c30e:: with SMTP id k14mr378413wmj.156.1639583047349; Wed, 15 Dec 2021 07:44:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:522c:: with SMTP id i12ls2508206wra.0.gmail; Wed, 15 Dec 2021 07:44:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoCeDIGPk8O5yQJ2qfGTPP+kwjKhpv0n9mg7x12UlXHKpqf9iy9mGu95rLz72t6AmoBIWI X-Received: by 2002:adf:d1c1:: with SMTP id b1mr4815048wrd.296.1639583046390; Wed, 15 Dec 2021 07:44:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639583046; cv=pass; d=google.com; s=arc-20160816; b=vsh4VsrTkAimC/gdTJMCe62EF1D16eG/Kxf5ZIYUhV2ZsNz1jdldZXqGL4FF7op/Z8 5GcdcdgZKBripKUcFrCLOVkx7rT3b83eWk5X0PKIZSblo/bZ9KAWTJiFKZbD/Rveo5BI 4DhQ5K272mLOO/alvIgNkiXVF8itjHs4vbY/Uz+rEEbcy9c/wcE2h+UHj3bsQtU3d0dr NpYPCKwu7ZqK/NK22awS2N5HPfs1E65OawnoqFzmpymMDtiTiIpcZPOpfsGUerNclre0 8x9exBnJ1THjFwMXa5lnyHTTELKSUCNbRAhKT7anQF0VTeTCdo8NVvnt56nPI82/svVb Jjvw== 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=P6+EcpfcT0GrlEvFrc4kKPgHGuE3Vos3YpWq1gUp//0=; b=r6vLwIhFddXshr2tz+WEiDzitX/mXkU+7fAGLm0R4xtA0R2iy+ymKPuF3W7+6PLE2v xeGCl4jRqsLfKJaSo3u0w4PeC7BZqxFBqeYlUZcDla38Ltbwrc/vE2FtBwwtZDAI7Lxp oFTDVoCMFiSuOEiMAQr6WNAtN+cjz7UjECzXVQnrcOf/YF+gfHYGWfAuoFq6IdD343/3 9GIz5fB5N4PemDfCuq6Sh2f++k7s7/K13CAi3CcxLUs7eLKRN4QCHmoZQwxGSGRTWTRx 4CCwB/cismhJSo4alQkrRCtEM3IqoPFxGJ/qgMIfSLMYdXT+ZCsIGM0dfttTXPuHDczk 4wbg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=q6zvYibR; 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.7.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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70081.outbound.protection.outlook.com. [40.107.7.81]) by gmr-mx.google.com with ESMTPS id 125si252657wmc.1.2021.12.15.07.44.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 07:44:06 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.81 as permitted sender) client-ip=40.107.7.81; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=q6zvYibR; 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.7.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=hM25P8GrfLRIW+t5bvdzLSaZtoZgKsIF3QXvMOVpyKgLOgXbSyT6ptxBnmCHpbIKsadlsei3BO9xIMcThYXoIY4ZcQAUqzzbvhk1+INJmsaHIBBEi+hMGvXHeEcDy48aC5tnx2KkzJCVVKGjdN23sk5aW1ROsMUiouqLgbNorYKA6YGK8q6as0yJOPWoc1VSObMBu/RYJ7IRZ+1ODywtlRPBYe46+tMSn/bkQOOlOEEHbsdY1PmGg+8WQyg9D1KmAyaTQ15arxPOzaPi9OyepAct0BZB7eMWCv5JKNH7E3s/TouoIFRj6BikIKhyGiAQK+CiKVCu6HCQWtEg2dllUQ== 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=P6+EcpfcT0GrlEvFrc4kKPgHGuE3Vos3YpWq1gUp//0=; b=gl65T+sma6j9WW3/vGXUgmaGSAaoXY+WK4PQ/cK9y//Euj8LW/PJau+wD70+g9nYN3Zy+dkJ50XaBwgeOkCVnbmDaciT7RD5KKXIlkWypvaiSuEv5g8+Yu9eNjogRv1ipTekFYy3jHnrGRQUUBXNqJmaTH63riF6oAFmskN8p+DyTZyYTP2kM92QIZPpBIXB+R3KR3fwwPh474ZyRgmfaVNEcBdpmB2IqHlzgHD7m6I02un8Hwq57SGaHbcpPdE5HBWJhAYmDnzpSqtjFXyRDMhv/nhYCfsE5pZzY54YPy2Vl0UT90nkFAmibq6Z0ODQZcdcccPsZOIfRH6aOWjRlA== 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=P6+EcpfcT0GrlEvFrc4kKPgHGuE3Vos3YpWq1gUp//0=; b=q6zvYibRMsOttgM4wCrl1ySLY5NDMUDJtu/UJIXYZcGf6tQ6uEyT3TAkgYBPhzqjZR6uxDZnb/jY5ymAGdcNpObwLFBXQ1/pGAT2j4DmY2Cp2hyr+Zv+Xrbl4WdRkh+yeaC06kFKLCIKnc7tiMJgMi2dvjTHYzRWPtTcJSPtyrwyUlopHHpWYiuQW43Crc1LEpuHNexl3iW8cEw5aLJlrWnUMv+p293vyI/ewPkoJ9km6r7ZT4Kionyt6X8+mQXocg5CLYwrVvn8bH3MesrnMXx00cLgyGc1RpTwRWn+4uBsTs8vW/5xB56mNqdVSG/+s3ucLG85fLrPyT/fHoZLTQ== Received: from DU2PR04CA0287.eurprd04.prod.outlook.com (2603:10a6:10:28c::22) by VI1PR10MB2829.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Wed, 15 Dec 2021 15:44:04 +0000 Received: from DB5EUR01FT056.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:28c:cafe::e1) by DU2PR04CA0287.outlook.office365.com (2603:10a6:10:28c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Wed, 15 Dec 2021 15:44:04 +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 DB5EUR01FT056.mail.protection.outlook.com (10.152.5.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 15:44:04 +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; Wed, 15 Dec 2021 16:44:04 +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; Wed, 15 Dec 2021 16:44:03 +0100 Date: Wed, 15 Dec 2021 16:44:02 +0100 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: <20211215164402.4889ad8d@md1za8fc.ad001.siemens.net> In-Reply-To: <20211006160828.5f56c080@md1za8fc.ad001.siemens.net> References: <20210922141147.4696-1-henning.schild@siemens.com> <20210922141147.4696-2-henning.schild@siemens.com> <20211006160828.5f56c080@md1za8fc.ad001.siemens.net> 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: 1bb9e612-0e7f-4b54-df71-08d9bfe1b931 X-MS-TrafficTypeDiagnostic: VI1PR10MB2829: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: hPtiWAYY0/Mrx3ilKsk6k+2COmC5bAmhfQ8Uk8YJxSujQjElQIw9lCAnMdywYQDEIfxgKZlTeFs0RoYA9cB11EBS8kXJ19MbJLTbPaM9jvlBEkT56qXMGOylsrZIcX5v98FfbcLK+JHeAIWlrZrerYSJwVr+9oSp13OXjmFQyuE1+37QxI31iZd0siBq3kG1Ef6S/g464D9DgltAY+07f849DWtTvcyFu15y889Rvf8Pn9lND0B6ykDasifB15sAInYDBc9pRFi7ZKs5Pt8q3R9vmew/vFUU1IH0kXuJNRoGbBcntthCI/6No6fbWSOK0tRF4RXaGKLuR/L6AUEfDRNPHm6LkaRugpnmk7CHvNu6b4bSTgaABoFfcja21KE1HHW/k2XG5v7qJL/hI/v+L8zg5Mwiy8YvTIJX3+mUpSD6wMy+kng/ANHRYTO1tM1PKV1G3lPbc0qOs98GilSqGxQIvbSFSLdwbKIUuOX8isjWBV88ZpJvKL+sujqsILAh/JrwWTxduPoibH0OmrSAyvcyfE/0OK9xdEyqU4vWs7G0Y+KTbIiyWtauuCLpJQWZHnrgyjc/uo/Jmt05/OAnWcE69HG7xmv1uK4ZQ77CPAY+qVlrQtjLUPOlD5VBNteVNwlDid00l/rFZcim7sdcSiZ6Tru6pg1k2sibA0IDi4gh4FqpXOaGvlH2mI+ihV7wiy0shwhr6rJYVOfqwOSk4KR6Bd9aGgHssgy4CPklrgMz+AKe6dNuRie2a1WKnXTAMDAh6DFLxwEj6v8papNw42D/VvPWnULMflcrIkGtX2X3GYUWHvrqYaE0BTfIywioK4QRKHERomigRDF+jo3+Wg== 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)(956004)(36860700001)(356005)(86362001)(7696005)(2906002)(82960400001)(82310400004)(336012)(40460700001)(5660300002)(8936002)(4326008)(44832011)(8676002)(70206006)(81166007)(1076003)(26005)(107886003)(316002)(55016003)(16526019)(47076005)(508600001)(70586007)(83380400001)(186003)(6916009)(9686003)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 15:44:04.4454 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1bb9e612-0e7f-4b54-df71-08d9bfe1b931 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: DB5EUR01FT056.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2829 X-TUID: 8A3sfpTfJ/gj Am Wed, 6 Oct 2021 16:08:28 +0200 schrieb Henning Schild : > 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 done in v4 > > +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 > > -} >