From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:adf:d1c1:: with SMTP id b1mr3635654wrd.204.1639561170772; Wed, 15 Dec 2021 01:39:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4092:: with SMTP id o18ls770892wrp.1.gmail; Wed, 15 Dec 2021 01:39:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJwm9up9ZGobLsGrBdALO7VOhgs8sU5/dVzp2Ph3ORYqsf8kFLoD6aPGNz4HjE8Ecoa1JHEG X-Received: by 2002:a05:6000:3c3:: with SMTP id b3mr1159044wrg.451.1639561169807; Wed, 15 Dec 2021 01:39:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639561169; cv=pass; d=google.com; s=arc-20160816; b=t5mRMfFOKNg+hsBQIXHjqXv2skl97f1aL0CAfWwiSi0PrffYb9GfzyxVx9yQBv4CHm GUWHSuOLdUkgJcaNRNQC1aqBJn908Na5Nwq26w2DQi6MFsBAJxFzqw6rcp9rh6bYNQ0/ ThPFqEWUltmIbiGAwjyQP4QLeesCRx6917Ge3hR/hVvp4HOIJHn7/eStJRv6wUDJFNrW W7zjcM3Mg0mB4K1FTcQGzQerx/B7fwlGHiAFLr5dLfBWfwxQADqWhtOr9OFXCSyibKsp FfMN79BXefUa4qggKoOFzESx8kBKJNOqz61X13eUd1LlvcRxxokwXVZ5EbF43r2/KaI3 ivvg== 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=t86JiK7ktFsyPPuFVEpG9QAUfSpHgVTgga1gd0dUZfd1FwnXIjnCv/xk/9cAl05e2y GuVbmWsVLrGmyZOGwZ8S/ZPrv2UpQXwWnbE4VAi3i48Yi/ngzjk2Y6H6eL/68QtxSPOW Jm8YPvfcxVHmW4NC8afe4YZz9KO7Lu2R2RdgF4jF58HOqwCMquk0czFQMU9MQjJxqeTX V07jHwGDK5Ir36IrK2D6wlPSuM+wNfyxtPDzWGK/hFZ9QlQAjAo4BBETPJQOm8CJR2IF lfPvEUb/TVfs57sgOhNAj9XXiEc3C8f4GuwQ5XZPSNNTdmPcHpaARkx7gEKpvv9lMSpu 3VmA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=vIrvS290; 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 2a01:111:f400:7e1b::62b 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-am6eur05on2062b.outbound.protection.outlook.com. [2a01:111:f400:7e1b::62b]) by gmr-mx.google.com with ESMTPS id c10si232855wmq.4.2021.12.15.01.39.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 01:39:29 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7e1b::62b as permitted sender) client-ip=2a01:111:f400:7e1b::62b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=vIrvS290; 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 2a01:111:f400:7e1b::62b 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=WCOpFkl6+SsZSByQWscK+yNa5MgT9kx85akdn3b6K8fxctoklbJppVKMwCLAHV7hfssGIo5Nymzntggt1r3y37G2SXmcWm8S02LGhGcDzS0CoZW5I6oQTUl5+U2/tonLOTTBnkSrXRSt2z0Og+NQYAfbYI2VQAHZRUIgWSh7+sarYgvOeSoHa6BFQMEuBFWd+G6CflYSpwTC15a71Jh0eHp2SboPFqAeMCM+jbMceP5BkCr2Z81JWpaqmpLRxNL42FrfU9Nrl6fAi3HZfL+O3iai3fF5GhVSLqgpd2icmO7CbKtjH3nikX6Em5Tb102Gk4BW9PemOuaIkWcmzJeHcQ== 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=kuBtoAiNZ0PT7F4ugIGpaJ2VxE8P4paYs2sR/0cxAtVkAsCpCgKq2kQ/40Ld+rj0symR3Np/j0ecWmpM6JAxpZIuLIbdLdaKOO1SrKXq4ZMbpYEN+0dLADhxF0uiK+jFkJDcLEXiFNrELvzwzj8MTyg0hQ1YnGqwrtfz9s5H7LPhmWzrrTLAYulyP/SRC2HlNk5uq/VQQL0KrZSdRuu1W4kEojcxWeXMbtx+bcYfl00R96CnoUZaEtpg6Yf5F10Vg/BwvL/7RvGQM4KnoAg9FGzYrpUxI9t72tYd8/8QJmGeUCAwISRdHTGij4+/rAkqxikkNefQV49Hn+auZECZ7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) 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=vIrvS2902WJ5xe0FAB7ocEOBHStiQVg7cNbfspJFt7v4NbYWyUJZzdZw8tMFTnvPkVuceGwQKX2WkfRM5RIe2E3nF/GFQsnDYbF6SiSCYObgBGKN2Vtp5QW6zZmFEpn78S6LEfkXY+c/WmZB4m8ef7WQ/h+D5WkEnIl4UpHQkjDc2V3UhJWWb2qeeBJR/PY3yriftTin6r3clmpQ8BPHz0s7MLGhCeIgpCWKP83bQbEsKn5ImkI6f93R5/9DkEy4Kjkptf5eCTkhnLvihGI1ma3Rf3MKRnWc8sbaum2/5/uUztLVdMlu5dZeoziIRYlRbG3BP6Cq3vbd8KlljCN/uQ== Received: from AM0PR10CA0055.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::35) by PAXPR10MB5087.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:216::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Wed, 15 Dec 2021 09:39:28 +0000 Received: from VE1EUR01FT021.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:150:cafe::58) by AM0PR10CA0055.outlook.office365.com (2603:10a6:20b:150::35) 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 09:39:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) 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.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by VE1EUR01FT021.mail.protection.outlook.com (10.152.2.223) 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 09:39:28 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) 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 10:39:27 +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 10:39:26 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v3 1/7] vm-img: move template out of package into SRC_URI file Date: Wed, 15 Dec 2021 10:39:12 +0100 Message-ID: <20211215093918.32038-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.22.39.210] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 72e23b77-f4f2-465c-54d8-08d9bfaec9fb X-MS-TrafficTypeDiagnostic: PAXPR10MB5087: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: xuXlnmTmgtT5ZN9zzkcGsNYimbe1pXSKoyU5jV9pP/HczdwRvSbWnrSdwag0lykEzP2cKPVyRyBj6doLIy7K6ng+zy8f6TZaIW8a1fuH/rp7jBwp3NanwBSN98RxDIWH6Mz2sk4yOnpOEhfI5jA5FKHQObY0VPPl0XLeZahgExDGAoElzPsgP9aSbLOyicBx+SHd4ZvCxT+ZmDdgWmB9S1bGC8DXnHrqZEEtWjgIZW1LyVXLyrHKw6l6/CgNuNYTuJG5yG8fbA1jGq+ssrlK6v9js41RnmlzjtpGqCeIt/dLeb8QasiZwahN1u7WgNBZXc4zkR/N7gDpfxtDYv0l64l8aoyXTcpoYJCI+IkK8pGJpksjrrFfMACz4n45zwkLV4BQ6jWsxfp/aDoigXrWZc1wkj91dVI9kEqOHVlUwSa1ICf/DSYGheJPQ8Urx0uRRRSyDpIYoWjKITry0gzEWM64jhkcjzndo6vRRp2opFla8LH/QnYqKkFEL1Q+8jgwipTdMwMS5zkxhC0G/IyfGEFFZzYOZAK6wCmjQhqKg2ztkENSwId8aOp6ZimlOFJLqrAGhtJz4RscnyaL5ytC91IgueGRltKCpD7IbqwNAhxqwgwV2nQgjjqXsnoE6rmKM5BCEty13+UOY/i3yEtTunmpWqztPoT3i/ztysRD5pMe/cammrCUpqQReRcqur/HCcC0jKlx6uHv9znbTnmS5kuHmWGrorefPKRhwgucXWkxVviG7nQiWzOJXzyP7SPBHoNbkzM+/flv7kHDViAgOGv4XWe9AvgB00l5ngDHFPYqs9YScxZToT4/+ufVKL3lBcqCafucAW89bDwoKTfLfA== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(36756003)(356005)(8676002)(81166007)(1076003)(5660300002)(316002)(82310400004)(86362001)(83380400001)(40460700001)(4326008)(47076005)(2616005)(6666004)(8936002)(70586007)(336012)(107886003)(44832011)(16526019)(186003)(6916009)(82960400001)(508600001)(2906002)(956004)(26005)(70206006)(36860700001)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 09:39:28.2917 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72e23b77-f4f2-465c-54d8-08d9bfaec9fb 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.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT021.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5087 X-TUID: LeRKAXEky2GK 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