From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:aa7:d794:: with SMTP id s20mr8861079edq.305.1639498253339; Tue, 14 Dec 2021 08:10:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:6da0:: with SMTP id sb32ls2846363ejc.8.gmail; Tue, 14 Dec 2021 08:10:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+ZEDZtgmwouI0WuXleW6I4MhI10dv36kQIrGgcoN0LXiZPT8CsfPuJpDHOaIZayWPG8V2 X-Received: by 2002:a17:906:9d03:: with SMTP id fn3mr6518375ejc.742.1639498252309; Tue, 14 Dec 2021 08:10:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639498252; cv=pass; d=google.com; s=arc-20160816; b=N8kMUvgX76oaLlE/xGSEFhD9aRqC3HjVQBI5q6RnVdyMIIbG73fdF2s2gTsqZdBcDv o+cVl1ug0Fqil8FtXztmV+rgIsRbZ5jWLOqXF1iHdLNMKUc64z4tFKGUAYPm/K8RAQRR r7bmGS0AZO41E9oQ5NDCNxHRqe5Zxgjv+M8hsMAAEoKmVP1Zs2B4f2LLxQQbDNHDewAx Hz9z4h4efv8IRAz4t4G1Pz4uBPwjScp5JVg+YwCuJq47sXMd53uVPzOfkE/zUVSyT8hW Xagy1jfLMUcIDp6nqzDpxSrVbfRdAnUgi+2/Xn+XGfjaTykd17AgF6Rx5Pbs+/piDfBn Kofw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=83aS+t9CkdqbqZpbzWSSdGySDeNh8WeDVU+Hv1QtBN0=; b=foIxpKjPjKh+0kPh3Z0+q5wSUusUSFnH9I0Dx4F2aO3p3uFJdhV/cUnnFKytaqYeQF HW/mHZ5TZC9T+TvA4CZWcSZpjjkxw1mFt7xgrGGBGbCRbSRQkToTOfjrDMOuOsr35k4h 4MOALRihzl0nxo6kjRWfdpteJbP5I8VT53/x5wqvNRdshdsvYbVmcdLIjzRrTvtHbvxq 0xR0x7zu+TAq8CO9tyU4m6RFcNJMUDnKOQgiWlh0/9SQsyhr2KVIP+zk/z/m3zV7gYQs VUPLSzUFCTgcU7+fQO/TSwtMNvhmcmmpLspwCjPcQLkKPFEPr+NUzTW3t9xsdEqXCJA0 NB4A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="hbASG/bd"; 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.1.43 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 EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10043.outbound.protection.outlook.com. [40.107.1.43]) by gmr-mx.google.com with ESMTPS id fl21si18297ejc.0.2021.12.14.08.10.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 08:10:52 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.1.43 as permitted sender) client-ip=40.107.1.43; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="hbASG/bd"; 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.1.43 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=KkeRmShbVR0wPlrBUz64xVUcJPBMV/uhNC+mChEh3myHnNSE8huWAA4JJw7cTQArkmZxdPy/STr5k0S2C8HhpnkfhlqSkZcRVsuqzsYSGBwOyQ+BvDEHFiST+iX73x5LVmCCRlqlpRT5UyG9yiV6ITy9RHM4RD4WsT0fgPHBkMvrcBvtyxUuAgCNL1FisXDgLiKh1AlPau/cHXcxt/s4CLnmBZYLQnaYt9d7PGKbbwalji2RXEYh/YQewYeREnFW52YpwftkDAiY0tjcTIH2jkqg0n3o+sgRirs8jMvquWWyqPJhP7UYnXFWsqZnARJdyZeNKE69a0xi36xz8CjXJQ== 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=83aS+t9CkdqbqZpbzWSSdGySDeNh8WeDVU+Hv1QtBN0=; b=NiRGR0RPLOVj6gYQNhCgR8K/YtuN0H4yBX643yGO0BEzCF3w9JlIjv7oCwET7UlnTmFTuZ/U4+mQULdM5PKMylZonYUACCtUmjgR7jpdirVm+MdN92PGWsQOu4RlQ5t30B/9yH1LeH+0nGJRyzHrtO8DBOL/y3cHGdHRozPtzeQoHHgQpizZW+xr4dW08QuOXzhOsI9hJQRcyhK6YariQdry324ByQ+II5+ZHDEBYCCeh10NFYk+Y5QaGVBkiRIK+9FueA8PwA8gnS1gtHoOJdBQY9vZ9q50F5QFWBC1rVBs9GcJxzdMlaHEIUnfivk3+ffRRC+cSC4r7FJYm/5Pyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=83aS+t9CkdqbqZpbzWSSdGySDeNh8WeDVU+Hv1QtBN0=; b=hbASG/bdpyadw8sDD3DNZ0DG7oi3prsruBgFktlEYmX7y/cUiJEbjtbMWrrsA0xvmhcmYqBL4lW4NQUADEICOY9nENWIXqbhdBRj9ShsncVmkXRONBT34VtajiX4w6sjkALc5uwGKDNAaRniFkUHYUL6ZJpeJ/QxW9Wmhnc0m2ZLod7Sbbhh752Q2HOCnMIGOxnrgb5swHbZDjwErDHF5hwbrMC/0qVG1K/Uhwe2pteT0mog2i4fbN+3BnWEdnAWcXHQmweSaEy/2lK7PFWBLUkivipFZ3iuSwCfaV15TFoRhJZ1L1jWh563JlktCyHRp7RMckf4uoCM6VeET7M2Mg== Received: from AM6PR04CA0043.eurprd04.prod.outlook.com (2603:10a6:20b:f0::20) by AM0PR10MB3507.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:159::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Tue, 14 Dec 2021 16:10:51 +0000 Received: from VE1EUR01FT050.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:f0:cafe::cf) by AM6PR04CA0043.outlook.office365.com (2603:10a6:20b:f0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Tue, 14 Dec 2021 16:10:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by VE1EUR01FT050.mail.protection.outlook.com (10.152.3.32) 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:10:51 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) 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:10:50 +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:10:50 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v2 1/7] vm-img: move template out of package into SRC_URI file Date: Tue, 14 Dec 2021 17:10:38 +0100 Message-ID: <20211214161044.5481-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.80] 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: 0e286b40-45fd-43eb-485f-08d9bf1c4c69 X-MS-TrafficTypeDiagnostic: AM0PR10MB3507:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tDLoCRiiqy4/aQaxYK5C5RXWpD/gYl0Cv/5a960zZ6hwHgR96DeD30LO4l5PRRmHjvtInpzNjHPI4L8x+gDrmaPbzsZx7ofytU8sq0s57iWqBbbSTK4UhbQQ5CMMgGMCUw6QOBkT/ZhoveXfVla13urva+9+bbO4nhFYMcbhEkwm2FWgIpLCBZPu18yQFIP+dTHHuCktItTRnqKJenrh0pE+owA9pfDMYnxR2bJ7NPtgiKsaBhrTQ0Sx02DMDG3YmBgg/y1pXXfqVdG+hC/BHnBFRmxbDlkVcrz8/1Z47wj/flCMEwa+XT3eslHuN7XdYFiKIitIYQU+QqprL0p76IQewIS2f9sy/FhpsqvwK6JBOHhIZu9OuT6mc5HzxQmx2+vZyA/qL4zY0rwcvGiFc7j6BCxSP0JXXEJAjd165vPsF8Qt+7Ykf6a9PHT7+js+xK50hfRSQtVD/zT4o9Ej3WEpX0Ga9oPcg7PpTocrF3PMFO8LsLLC1BEnjmZdXBP2LnNgTmTDWuq7dGo9TSJE7XLyW2dLO0JyONr3jcK0hlqoh04fVVfjY3XDslCtI6yCAhVfhGSe2wSI8V13ip7QTU0XDbYNvdtZsbZ/mxiP6VJJdCN7HCGp5WblnQJPcE/RZ42GtizKFYAI3sGJOLed4zm2VlNT9Nt07y2qRqzTaa61cPnuAxnZkIpdC9QeyXl+iqjievFrBbRCAT2yk+DejXOcMZsskrnNROtICpMd49IfSCS0JFZ9NHQxGF9Gev10O2vt3XK84jmqvs9KXPnHStNtDMNgdn/aU2tFdV3/JFc= X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(44832011)(70206006)(4326008)(1076003)(86362001)(6666004)(956004)(2906002)(8936002)(8676002)(107886003)(336012)(70586007)(26005)(2616005)(83380400001)(47076005)(16526019)(186003)(5660300002)(36756003)(7636003)(36860700001)(7596003)(82310400004)(82960400001)(6916009)(508600001)(40460700001)(356005)(316002)(403724002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 16:10:51.1124 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e286b40-45fd-43eb-485f-08d9bf1c4c69 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT050.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3507 X-TUID: 7bDm322U2SDe 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 -} -- 2.32.0