From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a1c:7dd7:: with SMTP id y206mr3863937wmc.102.1639561180045; Wed, 15 Dec 2021 01:39:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cbcc:: with SMTP id n12ls2345271wmi.1.canary-gmail; Wed, 15 Dec 2021 01:39:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3qvytixeAgMUGYWwY1YtCKMzE9TRhTVBWaDw+JW5M1s+ynyGZV2sZDD9GLcEDKmXGX0vZ X-Received: by 2002:a7b:c2a1:: with SMTP id c1mr3795415wmk.112.1639561179069; Wed, 15 Dec 2021 01:39:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639561179; cv=pass; d=google.com; s=arc-20160816; b=J205WLwIdaPE8UPgBXQqwceOxttmvL9m1lNiV6/zNQC+zElf9XtMjsJ4LY0yPyn9Fn ignVhc/zkJfpU7IGoNQMw3SU5GpJNiSmvnO5ny600n/6OZdcu6uZQN5XP6Zlve/1U3Gs qadegCYmpZxjvqZgiDf60+LfgsLKqMve3iubbg7HbzdmdbCwCwhdhWHSJFeZetUJgvKW 6Nz0HPZEJDRhw7rmR8rjmYghsge14B8tNY3NQ5HHzHc60/o5BHmRZNB/1qPVWMqPhg7e dfqj/FTdXtZuGSF/5GEJnMAhiLcNkD9O/yGEQ1Npbggki+ZfjIaPwuGNvkaiXsWFG9Z3 wrBg== 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=8tOAjkdpkh+tcgRLIw4cEmzdoDVajvG6dYUs+L0ABq0=; b=HnSZtFciVlj4bIOYBnVOGriHCfttW86B4YdXHNJoX4kQt7xWyexi5ignNwTku+D5cg mEMT9xdR0FVAe8gryE8FFtYdcNXMOyqiLvLbUwtDrdGdbnNfMODJWSZv+pwV9iyFXsHf E8bxNrQiBUxGVYb9FUa8wRkYLwAs0psUmX++5OPHxFCDhZUhJf3sjIzhUMrMRJqhcuoW 7I58+mOVw5kx4B+//PVGCi87IrU1QB8UkzLQVk7JeYmDBYUDsMhwloY+nrVjqy3YhC0+ GfnkfwCVsiXCzaUdXpZsnkZDr/J5rFmDpsVBeCBZc8jwNZfLfQZBaG6EbrcLoeBQMQ3i UmfQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Hb0t+VeZ; 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.2.67 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-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20067.outbound.protection.outlook.com. [40.107.2.67]) by gmr-mx.google.com with ESMTPS id a3si60102wmq.0.2021.12.15.01.39.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 01:39:39 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.2.67 as permitted sender) client-ip=40.107.2.67; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Hb0t+VeZ; 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.2.67 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=kDNwQT+bRZUxmz2SNLrO1wsQCUfBH4n+Z8LrKzenEoK25EHKfPgmMztH2yyVfqMxuxnpas+N/PF1lDO2MRBCwKKBh8g6z2dJyKbauoaEl7AtugeBTHqsCoxeZnEtON6UKIpwl3qFEKDInujHM/dGe9m8XIhwq2OtHdz3F8O8akKsXwFPMu1mA0VFHwFAxitbtLp3zTBVbmrRuGdFwkFWRjMXyV0qqKfwPWNcMjCC85ufWi659OY3YN8uSP5pqWC+MyK9xjWQSlLqMDSbr/lK8fULr3tny9AgEA9zn/BnRqEwhSCW9RQYrFZJx/KTUS62SwVznSdSvKDWxn/OSCGeag== 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=8tOAjkdpkh+tcgRLIw4cEmzdoDVajvG6dYUs+L0ABq0=; b=imzVe93Isxn1a3ZhIrpNhU4DJ/PPv+fD32Xlykdnoz7QyiEV/HvUC1VUIQRDPWNY69YaEqBEa2Jfvt2JGGjQ7AK/PHlS6HZhjlraxyogfarMRFhn+PJnptKV287L644kieWhIaqUunlDx/HDqW8+fTlvblZCi88wGwJElWVX/+ppMNKjLQHqLQme0765uBm6BDmoBeWYbDZNVk9zS5UoPqEME9rsvo+yuM2tbuseQFaiH6dQ/uUfZZ+70j0Gyfc5EH8aPnRf4OMVDaKuB86nBKBCPMGZLu8hB/86VJWVX6Rz++xkkt5vrMZgygG31t88nKBwIU8TV+IdS+nBbyT4XQ== 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=8tOAjkdpkh+tcgRLIw4cEmzdoDVajvG6dYUs+L0ABq0=; b=Hb0t+VeZompiJa9MbviTFMcZnSaIRow2CNenXqt8UGraMSg34XPpVyAiR7/NvuEu0O7QhcvFMKOX9grS5hdQ7CeTEX++Q3Se8ogFKhS2iAC3oyuTXoXxbz3MlwaWfKMXsCDidYzewHFCXKzCY4gOeVoErgyBl8YB0LISZl12RXAAvPDYEXO19GTGUniAFMV14vbTVxA8+eZnVA1a6mDqrKKTGfZroAFiKxreSbg6zt3+17u9VPiLhf2ImJP0dVZzBzKyjUPona27L+5uF4Tq54SXNuNWvME4+0f+qBd8coUtFu2JwUAGWHKufDxwURZXvSHG1D3FdmKippAOa4XSRw== Received: from DB6PR1001CA0046.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::32) by DB8PR10MB3675.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:141::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Wed, 15 Dec 2021 09:39:38 +0000 Received: from DB5EUR01FT005.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:55:cafe::16) 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.4801.14 via Frontend Transport; Wed, 15 Dec 2021 09:39:38 +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 DB5EUR01FT005.mail.protection.outlook.com (10.152.4.131) 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:37 +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 10:39:37 +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:37 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v3 6/7] vm-img: make use of isars template class for most of the tmpl variables Date: Wed, 15 Dec 2021 10:39:17 +0100 Message-ID: <20211215093918.32038-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215093918.32038-1-henning.schild@siemens.com> References: <20211215093918.32038-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: 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: e4d6dd71-6970-409d-5e9e-08d9bfaecfc0 X-MS-TrafficTypeDiagnostic: DB8PR10MB3675:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PabhNDupemSVa8eCtwcn4l37BR0kKdRE0ukCvrMBQtoU9krTLAFpvd7lEUxqK3QquaTovTJVv0QRasCY6AmgJOoG8hV3ykP8reiGRlYhLJ79OmyP7bXCL+V5LDDM1uCmECmxJvzy1AG70Zk4tuSTcN8hmo5xgCjXOms/lAbp6bdUEQpiwFgbX33HhGd2BZoPVwEBEHqYkjC07zL8FHeAa/pMK3o8goEnjkQolsFYGRaxaSluSdPVdlawvc6Dfl7GpSk2LX9RcHyBivQ7GRDze9QEU/3FuUzf0Uirj5JMNQZNMk1BfWBP6iXxNqWnoUKPhEw8cnHZAEU/s/B1ij1/Ccb8Me/geKE+I6IQwBe/70IfUGt+dEpX34Wk8ssoO3RoSobifpthlfktVAPcD2dkdAWl0AyRpf4uA0x8qMkWM5H5wD+WqkinNL4+h3/zpDJvpAWS1Th8XPT+Fg65aXN3B1y4NZcWXavKmhvJcnvrvXtWkxE6m6sia+gExBFpzegvM44zZcptaxNm4preKhC0VcDgAzb5V+FPFkbL5PzWWc2nhDdL9o+C9Sh7+g8e1hrY3mK9SfiKWyK+zLhQQRN0v2GVOrukL12F/0FlC0CyWatbbCk+FQLRZdJqLTO/zDhFDH1BbXTLwQeyJ9rNDvHqx4aHaOYazojfnSaP+KOm5hVnPWlhJekIijsL9TI5jqYPW3EPoM+58s1KKJvwPqVMtv+YPR9AfqRqL7hTgHrC6HvsNfkgOZ3ZuZyF4m3ibLujq5eril9ZgrndptUqMMJ+aw== 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)(4326008)(86362001)(956004)(83380400001)(6916009)(6666004)(40460700001)(36756003)(44832011)(47076005)(8936002)(7636003)(186003)(7596003)(2906002)(2616005)(336012)(8676002)(316002)(36860700001)(16526019)(508600001)(70586007)(82310400004)(70206006)(356005)(82960400001)(1076003)(26005)(107886003)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 09:39:37.9602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4d6dd71-6970-409d-5e9e-08d9bfaecfc0 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: DB5EUR01FT005.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3675 X-TUID: Q92hCfBJkW7Y The vm-img class used to envsubst everything itself, but doing so with the templating mechanism of isar is probably better, also to cover variable depends. But we stick with a second run of envsubst for variables where the content needs to be discovered/calculated. Signed-off-by: Henning Schild --- meta/classes/vm-img.bbclass | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass index db390769b29f..c03628c21a37 100644 --- a/meta/classes/vm-img.bbclass +++ b/meta/classes/vm-img.bbclass @@ -67,20 +67,9 @@ OVA_VARS = "OVA_NAME OVA_MEMORY OVA_NUMBER_OF_CPU OVA_VRAM \ OVA_FIRMWARE OVA_ACPI OVA_3D_ACCEL \ OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE" -# the ovf template is updated with ensubst -# this function adds the variable from OVA_VARS to the environment -python update_environment() { - template_vars = (d.getVar('OVA_VARS', True) or "").split() - if len(template_vars) == 0: - return - - for varname in template_vars: - value = d.getVar(varname, True) - if value: - os.environ.update({varname: value}) -} +TEMPLATE_FILES += "${OVF_TEMPLATE_FILE}" +TEMPLATE_VARS += "${OVA_VARS}" -do_create_ova[prefuncs] += "update_environment" do_create_ova() { if [ ! ${VIRTUAL_MACHINE_IMAGE_TYPE} = "vmdk" ]; then exit 0 @@ -93,6 +82,7 @@ do_create_ova() { export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") export OVA_FIRMWARE_UPPERCASE=$(echo ${OVA_FIRMWARE} | tr '[a-z]' '[A-Z]') + export OVF_TEMPLATE_STAGE2=$(echo ${OVF_TEMPLATE_FILE} | sed 's/.tmpl$//' ) image_do_mounts sudo -Es chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} <<'EOSUDO' @@ -101,7 +91,7 @@ do_create_ova() { export DISK_UUID=$(uuidgen) export VM_UUID=$(uuidgen) # create ovf - cat ${PP_WORK}/${OVF_TEMPLATE_FILE} | envsubst > ${PP_DEPLOY}/${OVA_NAME}.ovf + cat ${PP_WORK}/${OVF_TEMPLATE_STAGE2} | 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. -- 2.32.0