From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956803386540032 X-Received: by 2002:a2e:9f0d:: with SMTP id u13mr11218069ljk.61.1639583335562; Wed, 15 Dec 2021 07:48:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls422654lfv.1.gmail; Wed, 15 Dec 2021 07:48:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJypFgWiZ/zqVjyi6d3S/emAhrkjFV9GXjakNCa/6P49LLWXVlXu5PfwtMqGmdXw4seo36D+ X-Received: by 2002:a05:6512:3048:: with SMTP id b8mr10899197lfb.280.1639583334464; Wed, 15 Dec 2021 07:48:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639583334; cv=pass; d=google.com; s=arc-20160816; b=DsfOlRl0+MFx78hRoDSWR0Ode4G4py+DwTBHZ1RWl++Bp6qwVp3c/CZ9ma1OrlBYSc 9AG0SdOXctihlnGTOVLrTvFcgIZkQw1kXeez+PdAeXcdcvhwDC4BtywXY6RH3fWpqi8U uYBnOHoa3v1r1EZO8UWpeu4lIgAfs3lGM7VMS4hVqIl+x7Bj0gZbHsXn651YRodO0aYH JTp2pyYO1M1aPBW6WROirdOhfwmTrzdXxwvoXml0mB2bRw8I93qrnfeEfn7qIhNX5wDk 3xAQHcTbR0GiURGqlehw92aHVYr8N8bVP6nDwJ0mRA6Hdh/8GsCSxOm9oJdbjfnzKBW1 4UIA== 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:date:subject:cc:to:from:dkim-signature; bh=HHV/Bepw1Zw/yumP4YJQxsIE3vPFxiwQ+0fdE8zTkvQ=; b=tgGYibKs8EeOwkZI9wg0p3OI8haWyUg70WoK6y2lRqtCHJ7iXpzGMy/gxQMtcpf7Vh rHvR4y7OUzZolkn9NLRKSgRQpX+Pvxvti++WCPaqkLi/tzwMoOULVzT7hHkXZlNvx8mW SCeGNIxipz8CbH1SHE8pn1ot9F25JuYR9J2s6KMRamahEiH2gbZV0YMfl9h3oG1ZJF84 NKYkXYmkJ6KqeeY9H1eaLtHf+gJI3JgFrPYFvQvtvCIvesXje+wMzPKVSABNl+mmDctj N1wrtLK/2TIk2V8wNmyjNuINly238gcrMo7turJcBPYEsKn2UIC4/t7nzA+DYSXgkxP3 5lTA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wHvfK30c; 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.22.85 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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2085.outbound.protection.outlook.com. [40.107.22.85]) by gmr-mx.google.com with ESMTPS id v8si121075ljh.8.2021.12.15.07.48.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 07:48:54 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.22.85 as permitted sender) client-ip=40.107.22.85; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wHvfK30c; 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.22.85 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=S/KKXHc9+ikO1DNy4baje0ipx0wqhBNNmtSdqTEO4xADU4+vC79zSlJeXJ8bKpeNTgA4Gbn3M46HdoGX6HPQMCd46wL/N3yOiWj1lQenHd0eXdGmqFgnERHxFcTM5R1h6g/nMzyPTy5rQj6+jKm+gToR+7N3g6HYcGPtqIz64Dd+rnm6LUnuBQdGneu+3YsA2uR/2qOCRY2MHUNSL5w2GqAFrBL8eo4MNHWu/bulQ579XxZyFpWHSBb+lUXan/IbHYah+R/k0u1md594ZV3Fx45NXcIKZB1QarTjoGa8bcZ/rhBai3HbpwH0cL+lF/KXBlWfVXws9F4fTrhlXidDJg== 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=HHV/Bepw1Zw/yumP4YJQxsIE3vPFxiwQ+0fdE8zTkvQ=; b=DiYYx1yN254/xqDgF9GYEsGij0Ig0OOEh+DW5A98JflYC3oFb4Uw7M0LjttbkqzJONgL8nEB3unekN7J78HlCEsFErzIzQGuAi7AvUefx0I5LGJ60mmWEABnLC7MeGUfJVxVvATk2VLme7vFtsp6pE1TfKTFsXvvZYA5pmnCYNcs5J9+iaSMBMNqHBkhhb1VU+Q66m88NICKoyf7oR7c+jkydnoOZF55hhB+LIaz7tntHL3pFkOW+btDWvOayONcWTGycU5reqDKmSx6IGWSA2LLI2ZBi6yANuLr6BW0OgeuqwzTzJq2FS/HimUVIXR9dqYM2pNE+GleyrNGbrvBNQ== 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=HHV/Bepw1Zw/yumP4YJQxsIE3vPFxiwQ+0fdE8zTkvQ=; b=wHvfK30cgZhaYn88cSXQy5NdiXi+KOFZRFQ94Or55wUh+hIyvjJIJX9EQ2OI7lfFDoOHYopNEpKtAO7yJ8aOoMLOWGkSD/vh+OUMfknsM1WkoUVsimFl2fblsYpd5X3GmGko0AnyfcEoQE8Y2yCqWPB7En1wM7LDuphGg5Pa22f6CNoLeLet68jK9bGU6aTiFWdaDswWBRz9DxnCwpuJI9AqLK7j5S2FbOOA55vtK6DovV4IA4MzOnk3bGybaogn1GXzy7mhEVtGhLnqIgVk6ynEYwieP6/1XV5g/Trtu0gq3SngA950rGwvuxv9PdE5taMudhM+loRTkkZ/yWChkw== Received: from AS9PR06CA0143.eurprd06.prod.outlook.com (2603:10a6:20b:467::20) by PAXPR10MB4720.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:df::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Wed, 15 Dec 2021 15:48:53 +0000 Received: from VE1EUR01FT047.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:467:cafe::9c) by AS9PR06CA0143.outlook.office365.com (2603:10a6:20b:467::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.15 via Frontend Transport; Wed, 15 Dec 2021 15:48:53 +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 VE1EUR01FT047.mail.protection.outlook.com (10.152.3.80) 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:48:53 +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; Wed, 15 Dec 2021 16:48:52 +0100 Received: from localhost.localdomain (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:48:52 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v4 1/7] vm-img: Move template out of package into SRC_URI file. Date: Wed, 15 Dec 2021 16:48:38 +0100 Message-ID: <20211215154844.1495-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215154844.1495-1-henning.schild@siemens.com> References: <20211215154844.1495-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b56a7f7-fe08-4f7c-90f4-08d9bfe26538 X-MS-TrafficTypeDiagnostic: PAXPR10MB4720: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: QztRVa71I9WjMOXUcTDnadfe7+JG+ujq0HWbHM7y491KSGD+lVzRtVfqZJ12FsTo6hKjXjWX56QqFLgJzGcwyJxJTeOUV48EWlntTXuw+4PRLhb4iDVYXuATmWzcR8PwcF+zxps2va2FejiJGwvzg2tWAo9Krqfjmwn+2No2/5r9O67qvItOued2IpKK8VEZeEp3QgX7XI+/uUIhVQKVPyHG7EZFXVVtMsdrtOQ0Cv18tX5ee5bdPRl/Voevzf/O0E6xqfthNLUZCF6kYG0WbWGhW1T8m3A4L892hSCWC6EmbiBapKY4FS0xIVLtHhHgwqiwO2x0yFyFjBDCGSjDxKxvmy+mqp9GPOyJj5BhXlsahNW6sZT8FqFBIhX5esgqzXWOMT+5QiNyz3Tr+kcvl1Antn+C+j6JM8xK7sy8cJQ/mHX0I1ZA/3HGxUHoCUyKwhK5kzY/jQz+m6Ng9LDoZ4Je3x8ZM7YHOWf/54WO5/hqUD0TwTxjD3SMSVuN4sOYFxKgj4HAb1jFHt2NXpNrx0n2IgHm8X55/LsISiwvmioBQfg/gyKQFh88OMkzj1yUH9KGz62ki+HfOK/4PWI+sQmnDRue75r5cwUqTFBklXaAfyfN3mKYDllf08RGntHh3l+DnJ6gfAMwhFPNKZaSORYVNU8WYjIZmvEzax1EleDw74uscP4QHZnbFZUjdESUzH6CCX2es+JTz32APHxNHi+EBsQTShcB4itNtzW2rCg+dr9wg8DzpmkAf/lPCBeyQ948aHbrO9EIUHE7daf2KIl63lQjiW6mzs+H/cR7irA= 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)(508600001)(956004)(8936002)(356005)(82310400004)(2906002)(107886003)(8676002)(44832011)(186003)(5660300002)(6916009)(2616005)(7596003)(1076003)(26005)(4326008)(16526019)(316002)(7636003)(336012)(70586007)(86362001)(70206006)(40460700001)(47076005)(6666004)(36756003)(83380400001)(82960400001)(36860700001)(403724002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 15:48:53.0730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b56a7f7-fe08-4f7c-90f4-08d9bfe26538 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: VE1EUR01FT047.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4720 X-TUID: 374G5USgoE52 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..0ba60bb2f7c2 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:" +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