From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a05:6830:22f1:: with SMTP id t17mr2769837otc.39.1639758941924; Fri, 17 Dec 2021 08:35:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:e95d:: with SMTP id v29ls529639ood.9.gmail; Fri, 17 Dec 2021 08:35:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxlzK6vxkQsIBgoVTEdejhxz9AzZ0TKqhzxvcifJZ6+mgyDJ10lFYORNL5ru+lamLpIXOK2 X-Received: by 2002:a4a:4f04:: with SMTP id c4mr2476891oob.62.1639758941423; Fri, 17 Dec 2021 08:35:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639758941; cv=pass; d=google.com; s=arc-20160816; b=Xkv/dvOfG2EiMbBk+c8Cv9+kC6ah4nrdRTV34ceYOFQlbBgxxUKtE1KnJlWjBo2yjB ose9gD1ohREyNLl1ybNshJnUcd2/aGyRxYuRytwjl8QY2ZnOFhsie367VENtKX4ufZqK 9yc2gxfOBUud7K5oNJtXFumkNFfQidqSaDFGAzuIoJD59LOnwxbAH0FPHe3qt/zvw0T/ PWEKWbahIiYnMZJ3W7wDx2XsMraoA7i50nyMxJxCx1s56IGZ8Fgkhqd+Iv2MJGxLSViy cTSbeAfNAuzxH1UYJXlDHnOetAOiGR6Lihpr5SF10W0RSf9q1hyyhG8ZB5LCxwtVTKC3 rwYA== 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=E/nIOw9C4mIWrPQbOpdXxqhZOuy4LfpspE+/kTwDsRc=; b=YXsNkQ2HKU7EF3cb+Zz86w9Oqf5K75OvpBGvFpsWLCdhgGcholQcbWZ5EA0MXwsJe0 wPwZIEwj0Ewx7ARRtUnpPDk1wSL8lpNslhVgyUvh0GkX6T9DXDwO66j4qWchkf/DeFIP g8fObIOhXdCX1AJd7hDB6fv+cB5hvm4/fvvLFoAihkWFidoOi6NWUuF1kpi4bIFXjAEX LbJtjzbwSYaGWiOgNPo9DJQ1ZAcladwWmoH9GTbvQRIvN7rLymmZQ2RGhtwyJoP0OuvM AzFwQaFvqepAk/wnOfZu9a2nw0jtI66q8ipCeuWi88BJY+m89s0bvvwJIadHx4x687eS Lu2Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WL7cIrMn; 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.4.79 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-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40079.outbound.protection.outlook.com. [40.107.4.79]) by gmr-mx.google.com with ESMTPS id w29si909146oth.3.2021.12.17.08.35.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Dec 2021 08:35:41 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.4.79 as permitted sender) client-ip=40.107.4.79; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WL7cIrMn; 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.4.79 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=N8cTqwi9mOfohXFkzyLAnZO23ty5qXFblPMl2ziwNzGkJyI6lYpgiKonU7uCCgsqgMOv5pNLgjITwXQ/JYbMOfDKre/bC7ip+68URp+TYtCsHCxO0fBnIa0bfWYGAsNp7G6iwwsi79Rag4QEnXWrQCi3R2QzFQqENb/q4pyHITUnmrtYQUlvKQ0tlyUgR0ocqadv83rQf2FtmtTsjDkZQneEUZM7pK5cCF4q/hUKYqrWama1CVi3UTz7SW5pnyIfk7dAo8QA19eQufko+hhCh79F9FNvFZRjqclBQrVADKs1DEUNH035rcGfplMyZqgbES8ry3Os5kLkodzbs8wnVg== 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=E/nIOw9C4mIWrPQbOpdXxqhZOuy4LfpspE+/kTwDsRc=; b=SPQzx8Gd7U1LOJDsFwK5g2jauFxbvTwpHBWoCxdVMq+dOEvLPccvZ5FnZ+ba1w8Vt4jLUmxeiGS2cujnTYJ9uSvM2khTRuO467T+zFhZBg5+CZQkUAMbTpgzCQodlLIyVPd6AwQ8suWpftM+MJZh63rfRYYCbsl55PtUS4Mdw6u8edv6rGrFWSM6ydpCunugyajCbIwwRu844xNl+KyjkQWxVPLchdIOxL9HzU4GDnNjFq76xxjtSDJUdNmdK36xp7D/esJBX6WObEZ9Y5o1anHD9s17VuTGYHJCXvIyhEGrzaYnbAqu19lstEk2bFNHg4k4IKDnLccN1Ou7Ne6gTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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=E/nIOw9C4mIWrPQbOpdXxqhZOuy4LfpspE+/kTwDsRc=; b=WL7cIrMn1QyyLvBT+RhwNZ4ntaM1K274MnDin7C7Q308U+tdr/RprKcMY69FaqgZOoCLo5Zcz4vElWQvnkPcEx51M76dT0f9qw7GV+xao5/Vy64uzgbP+achihhhnkkq9sg/HC9QLwnAQtSNurfyBbVeIfh/fW5FHzka9C4vRUTXE8yyFRrDBrpETnQnQage3JqSrCCbSNANpW3St59B8ECcQvPu9VNY7uLdv5x/otPimtYZeIYElgGO07Rpw+v1kGU2azv/HtZAEpTHVA6Vv2SKmLjAz6ArUV1u5dloLsdBHmX0YDxdY9aUyi28QVN7pljKS6bmfc0SRsDz/tCErg== Received: from OL1P279CA0008.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:12::13) by AS8PR10MB4518.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:2e8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Fri, 17 Dec 2021 16:35:39 +0000 Received: from HE1EUR01FT006.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:12:cafe::88) by OL1P279CA0008.outlook.office365.com (2603:10a6:e10:12::13) 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 16:35:39 +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 HE1EUR01FT006.mail.protection.outlook.com (10.152.1.228) 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 16:35:38 +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; Fri, 17 Dec 2021 17:35:38 +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 17:35:38 +0100 Date: Fri, 17 Dec 2021 17:35:36 +0100 From: Henning Schild To: Anton Mikanovich CC: Subject: Re: [PATCH v6 1/7] vm-img: move template out of package into SRC_URI file Message-ID: <20211217173536.5060ca66@md1za8fc.ad001.siemens.net> In-Reply-To: <20211217144835.14878-2-amikan@ilbers.de> References: <20211217144835.14878-1-amikan@ilbers.de> <20211217144835.14878-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: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b8a910b-91d4-44c1-7cb0-08d9c17b427a X-MS-TrafficTypeDiagnostic: AS8PR10MB4518: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: I4Z//ia1iVjXv6RfApkzHCBQdemF3mZKj0gNGqH8n5KDv2IhDcRENAEJhzaAsZ02di3I9Kj2rf/hDVHTnCjybNi+FS9GbGzFNC3xHRYgRk5qAH0l7hNLFvGKtx6TmgWnP8qujULe+FHo5iVs+omMnOnmQmJGJyQpYSPz31O7rR4Cq2yfx5JjlAplceHkMrGIuqljRzwMrrYmpNQDhZl1ov93R4Qff3r3NpOBe+BGrA9ZDNdvjt9A0EDkGAO25Fc3ONam5memnGiUJHjUgUNYBWZk2dpeOBY7jAvZFKzTDF9+UeUl5RbJyNIThCaZebUlCU9zzFYyZuXbdh+bC4hFitLjWkCeLKBmhS8P6pGV/+x/CsaB2HKoUOvuZl4bhOpNngT81ByyxCY0GoQd7fxc7BXHmcRlT6E1jGJB51LFCpUsM6KPkBeNQuwz4oLWeA6A0hGX1IR7Ec26ffvRdT3BarPOfRTNJPsKKI9YJg67D0XVynXuYW099ANikHOf9voD/V2e6JFoxY+TzlRiKvuMLPXqg5BDd0aGHOhBMt9WLnNdq3OjAMtP1Mp/eN1b9z3Pa1dUHn1F5m1xPrwW6NwVJIH9W7mjQLYEO8fHtc47yvdxIixb/frWupNqAscxyf6etKYas3qCWfesKbpmvu+aqXaji8Cd9dp1wtSMgAZrbpnSvkNFug1zrkeUNzhuCKhZ2fk5DzgRL4WMYyfv6Kvcl7XINa+mcLEvGPoyqBZJL3LGohBmHx6lUr+EAkcMDDlaK2dWHHcCnYIMKoG5f60WQWrBDvdskk4zEodYCGe/YVQ2wI4i1GGedoEFvS/mgW3AduNrUklE3M5ZTsQVLWhqrQ== 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)(508600001)(82310400004)(2906002)(7696005)(47076005)(55016003)(70586007)(86362001)(70206006)(8936002)(956004)(4326008)(81166007)(6916009)(316002)(82960400001)(44832011)(186003)(36860700001)(26005)(83380400001)(8676002)(16526019)(336012)(9686003)(40460700001)(356005)(1076003)(5660300002)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 16:35:38.9316 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b8a910b-91d4-44c1-7cb0-08d9c17b427a 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: HE1EUR01FT006.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB4518 X-TUID: p0E5vvPF/KYy Am Fri, 17 Dec 2021 17:48:29 +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 c75a544..84ca328 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" > +FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/vm-img:" Ok let us see if that will work. If the recipes have issues finding the template then we should use 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" > @@ -101,7 +103,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 > -}