From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a1c:7908:: with SMTP id l8mr5590wme.16.1639498694226; Tue, 14 Dec 2021 08:18:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fe0b:: with SMTP id n11ls1463809wrr.0.gmail; Tue, 14 Dec 2021 08:18:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyqBF3noJsfUAtGbBow8l+Bh40M7JKSl63z5V4QkQ53Cvwtjmu0ivKUjhbYeqSbsMfOyUg3 X-Received: by 2002:a5d:4d0a:: with SMTP id z10mr6691068wrt.649.1639498693379; Tue, 14 Dec 2021 08:18:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639498693; cv=pass; d=google.com; s=arc-20160816; b=yL0bIf3GDJgyNtJrvfPMfrp/AVmjOJaNl2WdzD8mwMk6H8EU9QGxB53vlAA3/qMRjb XIj27zNIOW5guPNgGmPr+iIc1T3qdlqy+c0IffHf3qjdvy1/Vhzfna44tlVVO5U7XAue N1JWZNZpwMKrj78hQXLzhF2ssBQ4mmiaY0ouBJzZiqX9lfXjzrllbQa17DnAE0W1B0B1 4Csl+haNLGe82YuVOiPD9N+CYJaMESAB4u3nirMC/YB3mVmV3Fer3Xo/mhjYRi4PbJqk qxqbIXumDDfoA5IVNM0GoXHUi/G1E2v7bIEvd2i75IwzfuUEn/Jj9Bv5M8jqqaTq83XL GB4Q== 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=P/XKy5LiZo4Goh7XUhGavKtHdN07lOwnclcuuw6BkFxC49x2LhHDEeXNEAh+6jNMkl l3Yuk7S58cnu/32n2Ptt+Y9aNpTJFMqlJXhX2hc+o8NOr3A/47T8DbSyHr04NpAGcN/z /08J5reKkZoGAaWkc5l0VOFlfH3yqRUK/h8UhJSEFFaxaztcI1SR7gVxAwwndyC51Ux3 +UxjtgufSOfuqb678uBxn8vgDYBBGJu3ZzxNATfU7gRO1OO1tPkQ6c5F8VmRVZ9mcw0x lpcftBQLsb/lYIfdYQnUv5hPA6+gmvdD3jn1aR2d7FyZH8ZBDBgea8dgT3voSM3DOUBq TU6A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IYMREeST; 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.45 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-eopbgr70045.outbound.protection.outlook.com. [40.107.7.45]) by gmr-mx.google.com with ESMTPS id o29si23479wms.1.2021.12.14.08.18.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 08:18:13 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.45 as permitted sender) client-ip=40.107.7.45; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IYMREeST; 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.45 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=PER0XiCg69pjnGntkVlhABjl2VW9dtDqrpDtgPU+kqD6ujGvp3SUVQD2v9C7VdXJZ0XO+H38Vv88Ot1Xk21Q8rVrryHvGgy8D5jbjx4EPJVTRiwnZ5WhvOritKBRzFWv0I6LVxGAUzH8feJp2aHboQnQI27D6073yCCZ5Cuc3AvPPRosnt9gyMwDRvaH2TcJy3k9TN7VP6fWq0T/CjflRYbg0u0mGTEzL2+WH8i1jv8IOqNpYJ7j9Z4eo3D4ghDjIQeVhS/+VjpLLv4r0ANlivGl8Lg6kHErdxqg997CW2ZjW8Yyc1XMKC2SBtwWTRxBlCnDIwJc0qWyRaFnxWj6Vg== 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=f9/BHCEmwKQewY2xP+p14ppuHDJTjf++oDvgEDnXbZQPVVfG/cLuESjMF7V2XcCGUg/S9iZykBO9ghTuMkPjvnaxZ8bbQ/xqZVioapw6D0hIwN+199tBkmbmjUzKM1PcOQ25VV9rKHyW7Q5zxeR9Lo1KEXabHalhd/N1jyMhVXm+qoWGNXHeANZ7O4n3SrmznsIvh9bOEMV/9MntCPyKhkpMOkkia65Y8Ne0Ch+oa3xmy11ZhZxq43lsJg8gopuvnsKNHNxScxrTEyWrYrTAXKWVrRAkpeewALo3AIGkLcvVuMljWwChsjcNJRh2Wrfi8vjpI6KNyhXcTU02KbbMdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) 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=IYMREeSTqlJwGVdnOVKXzPtjlHrDIPzV8/FeunBEdXy6VWDSlGaQ9hpBVKbN4VeYQ7/gSXJB1CKGKPquc62cMMKPrYkVosvJ/aLKKAmKC/+SJRveIKu1dhKr8O1toXMfrrRya9fjVaMUVCJjsEDR0j468ZyfwKWjWpLr6nbMpnyX6TU5pMV/oIGN6Baur5ocYsfFKwhaZwRdZM2N2l18EjdlTblUiafDbD9wHih5HoWeFOcTyjAX+O/OoGVhjj8R1XnhJGDgKRLvOxC76AEog96R9zEfr5rYZBkJ2qrXq7coD9//MBYyO0RSXgYUZ6ODpUME2k23sQd0cHGksXPEbw== Received: from DB6PR1001CA0046.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::32) by PA4PR10MB4365.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:104::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Tue, 14 Dec 2021 16:18:11 +0000 Received: from DB5EUR01FT049.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:55:cafe::c0) by DB6PR1001CA0046.outlook.office365.com (2603:10a6:4:55::32) 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:18:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) 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.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by DB5EUR01FT049.mail.protection.outlook.com (10.152.5.138) 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:18:11 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) 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:18:11 +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:18:11 +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:17:58 +0100 Message-ID: <20211214161804.5789-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: 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: 25241968-31a3-43dc-1666-08d9bf1d530e X-MS-TrafficTypeDiagnostic: PA4PR10MB4365: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: b8ncAQ2a8OI8iMnfMCi7rgkNH95TJgAFoIUa1+2lmO4qZtvWnf8tqpKBx1mvAAnS0z2mnHV9VCNYjTI7VZkWo7EdNjK8dFeyUTLtd+jXUum+ZDwYLceKrgSBZ7tj6qF2Z6C2JByZ/rR1sj6hw2bsCBSDC2K9o8B0V04CgZSSTWQpU5uXfd2mo+ceXqVvWB/rjJLZJde4UX5qNzb8i/LLjAFGVtwobHkzWoKp8gMn6RzIDnml7YQZ/JFo1T0UvvTDZszWT8f0x3V4Zn8B5G2b2TuQuuvvW6LQu1r8vg7/lMhJymyLsYzXih6QyBAAuMWEoeO0UWDlcP4TvMMmWvIqVrWjhgAM6A0y9Ddgy2qq5xOVxSbH74XM/UMzoxVx87jhK1FCfVcRGy/WzKo5PRABTmb6wPT1Mhp/Kq5EhHF1FbL2ICNVBNlBPEIRStLFWi96Esq+I+J1RbTbn2V9J1YxfCWmhCLpAP93be5C7FYCjAcezZmgFly/P3XdPLE4uXdso2BEhad/mnGEvfm5HxRqEFuxBCBOGpEO30vsst7zD5F3w4h63oNMAV32GpGWTe+kSSfOY+LpJwe8/VZ09JLQmrTnGIJfCaunepxDCxrkv8/L43O1I1d2jWRKV2cvNfcqYEtNxQ9fBc3pmGpign/ICm1XzNQQKFlxGigCYWaEouFScAdsOdPqmfF79HO6tgTinMUvOk3XbZbqNCkqR5ECGF7jRAvA1mFHUJ4nGsedx6RvxHZM77UkiL+NQbpb3OsixbVWADuWUyLjUUknjz87vkLwAnsbqItTXAkf14FF2bd6gml0QAH/bDSTwVw1ODzqQM0WvU7bGCnrNmXT2upG3A== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(336012)(82960400001)(956004)(356005)(86362001)(70586007)(8936002)(36860700001)(5660300002)(107886003)(16526019)(316002)(186003)(6916009)(8676002)(83380400001)(36756003)(2906002)(40460700001)(82310400004)(44832011)(6666004)(508600001)(2616005)(1076003)(70206006)(47076005)(81166007)(26005)(4326008)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 16:18:11.7399 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25241968-31a3-43dc-1666-08d9bf1d530e 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.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT049.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB4365 X-TUID: YM56QzIcMV3n 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