From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a05:6512:3fa:: with SMTP id n26mr10677288lfq.369.1639583357569; Wed, 15 Dec 2021 07:49:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls423262lfv.1.gmail; Wed, 15 Dec 2021 07:49:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwB26lJUsWIwbQwXb3PE5zJyeOp8PJuW1ErSmddNCRgi7Dq9LkbnUTZJN8DQ+vvcYCc0og X-Received: by 2002:ac2:4c48:: with SMTP id o8mr10031186lfk.690.1639583355865; Wed, 15 Dec 2021 07:49:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639583355; cv=pass; d=google.com; s=arc-20160816; b=DL+YfmkmmsxFJeXwvWvrQ6XtGnWhqtl+Kqr6jloCZ61zoWb9b61/jpS4tGu0IVvf/S wWVTQ6vsIKheDgFDd+Riv8wt99YCAmsAjIqKw22YVK0MXE7ZBtwaAnVlKw/F8a7tUqpL GEQWR59Scu3TrBCq73P61i83VvWS4m+Kc9nwbWihQfUSMSclWtroHHLmGnfLuISbejeT wxAV9O0YTrW6323AXbVPYPdZjdEtV3OCsnkjDGB2qtwpxwCE7gTr4E22MJnYAqm27Bjy JRrN6ly00gj+d9yuN2E7yo1tlpkT/cDEIoff4IEwxUOjSeAWyzdraSw4dXPCuJ0oc+Vg viBA== 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=XCfn0Ynp67S28dpBrAchhyout6nFrjHHD/vGAlybgcg=; b=VfKxZUBugwrC1Ntu1+wrxQNYYef/FwVjOoEdoD1EvvQR/O8pWEI0hTNaF52Q2UeqcO rBepn39Ty4TZlYMpxWb1RuFSEXwoHAT4IpivTquVOaERvR4hK4y6fQqhfKk3xKXKBp53 79Wh+7TF/voPQ//mDEI8/i8q9+j5srmpjH8k4dhD6O70fE/66ODFWzR8F3ldCwaQ10r2 J1hstoT10xvNfXutpeb0rPqbxqS7qyjcMv7qjqQyawf7JBSai46AAPQzCTeRt2oWHW76 SnEmV/rnBiYjmNIG5fFg6b/fcW2htRHzZKoQoDM5HrIb/nHKxVRCYHpnbUn65geqt6o4 JoPA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=lNfeiyCD; 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:fe1f::62e 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 EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on062e.outbound.protection.outlook.com. [2a01:111:f400:fe1f::62e]) by gmr-mx.google.com with ESMTPS id h12si126906lfv.4.2021.12.15.07.49.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 07:49:15 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe1f::62e as permitted sender) client-ip=2a01:111:f400:fe1f::62e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=lNfeiyCD; 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:fe1f::62e 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=DN1HhMVbS32gm5sgHC11OM9d16JjEz1buIuqNhKNj7xar5FR2wgctqRE+E7JUd/ZF+xkH80hghG/DcwH9Ke2Yrv7BgEX6uiCJrkGWQ9LQqe91a4fkaU9Mqfs5JF6KEr9dy73VsrW249ATQQ/NcwJi7cKRSDiaOTKKVOdMpNn3l6h/EZUR+niHHOd/KprlJdZXttN2X7wLTt5KOX6zuDYRdXE9+AAFNffmdyZykJKAg99ZN+V5lGja1sc4AHWu94OlmkNNwfTWgs1fTxI/geVVOUPkp89rSDxod1Q+0aAnssH4qOkQtWfecyF1aMPVn+bOIZcVgCfYIUuSgBTonRxwg== 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=XCfn0Ynp67S28dpBrAchhyout6nFrjHHD/vGAlybgcg=; b=gQAMEM94I+J3vyecpwYmT6AAirVwlngDVO5sZcedanIvdksrCFbdqf1ExlrDEqsYXLtRbSakzXL8gHCEYEWkhtCjkQ7u+paw7aEHiORkydQN8+5Pr2DI57nlDKwIWjv2kxOczNAhnkI8+8O0PiDWqyFts12LV//ODI4ruPrZvbKZsDWlN2SpS9ClbUPQ9ftq0txeO1qGEC5aeBjFl5Hm38QPCpS6psqDeyooLr6wta0QS0ZdCqkg7HblWOL+5zyvfatBQIRhvlVChO1duC7Ju99H08xPcOLeDsv+94gUsCuwgfYmhpCDe6tBC5rgzIBwWeVl4JMwSSscAee7cHw8DA== 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=XCfn0Ynp67S28dpBrAchhyout6nFrjHHD/vGAlybgcg=; b=lNfeiyCDw/dW/7OLbNtpAIlpSex0tctXOLxnz+grDOc7clv/fK4nlCsFcF6EOg+ey990hhEl3uixomdHrlfdJPoCc6ANAiy/EOfE2LJMeg6dR5cn2Gh+vPAZBqNHeOlUjx4GpI9vnHqrD6aXyjxkII/nu22zSQR6eXhXvNOiEkZ7aOGm3dQWcRMdQLwgsUlSC4is4E8daLEa2iFywxhO0nZ3sx5LYjhrEBmd4cm9jS+37z3ilCpvnEH2etX0tXv/Tj3mO8WgQVUEM8jBQD3uqszwXVNdRW84zDePD8JNKJhmVI2CpxbP3RqIfgxCOtEVHv0shWqMdcHUZjUAfIa2qQ== Received: from SV0P279CA0070.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::21) by AM0PR10MB3074.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:157::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Wed, 15 Dec 2021 15:49:12 +0000 Received: from HE1EUR01FT059.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::29) by SV0P279CA0070.outlook.office365.com (2603:10a6:f10:14::21) 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 15:49:12 +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 HE1EUR01FT059.mail.protection.outlook.com (10.152.0.241) 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:49:12 +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; Wed, 15 Dec 2021 16:49:11 +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:49:11 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v4 6/7] vm-img: Make use of isars template class for most of the tmpl variables. Date: Wed, 15 Dec 2021 16:48:43 +0100 Message-ID: <20211215154844.1495-7-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: ece0ca2e-bddd-44ef-787d-08d9bfe2709c X-MS-TrafficTypeDiagnostic: AM0PR10MB3074: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: pEgaHQtTtnwISkBF9vjCVRrc1dmKhXCYyyVPMpj8u6ORna0BFwabAGktaa39BLIk9g2wac3UU5asTBlH8gSU1/Xcvkn4KvvRexP/Ay3KOSEPLztvGyXRxrSFs4b039AYTlgEvEM33d8p10GkUOXFes2kXnFesa/qW6LJSxfag+u7BKQtDows6V8IDyWeXQzIc/g0xEJ/MmXguRgAHtV0h+pL2UfQPL/MRmcj87lYG3hqzpy5jIU+wxpszrp1iTICfp1MRbEWeMcZ2Eap868VCv9kTwMXMHqBYAE5uO2dnYb6pBe8X2n0sipTO6MjT7i4whnpU0oaVfKDFIbGf+9LTUomP/kKi7D9JROT4f05L2d4oLaxVWClDoU5PkBguhJqfAWoEdOMynEZHmVcr3zUYWe4ps0tU8Ww7ERRDY7uOE1urxTsb6rlChG3FnjU7WJV10bCJhKoBjanh1tXwZcL3RKuNQjNOcDaIaSQsPsfQa90zJc6BSIv4JIfKvuU+9/wmJ7fctrG1k0XvouTLPiIiMchrRrdq7ukhDvS9Ynt9YRX3sfiUXUg9vBn9icqsnTqRa8O7xAhNGgBkUuzaTw4jB2NYA2cXWL9h4221byBzEm9fzmzH7HsO/Ki8VcB+BJhioNQHezSUnVa/KRflRGWcknHon6d3wAzUJ14gT+vgJTdpbydTPwlCz3k5inopsUtqaP3CESF7/89/MpfwUfPUak15L278OKz9sWY/tjBv1fSxn4sONxb9J7jw3l1iaOcVVmhC7qFUYqXEbbcBnR6kCi0DMRYKK2q9TkRt7I7myI= 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)(36840700001)(46966006)(40470700001)(36756003)(16526019)(83380400001)(186003)(36860700001)(26005)(2906002)(1076003)(6666004)(8676002)(8936002)(508600001)(6916009)(356005)(70586007)(5660300002)(107886003)(2616005)(81166007)(82960400001)(82310400004)(956004)(44832011)(316002)(4326008)(40460700001)(47076005)(86362001)(336012)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 15:49:12.1671 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ece0ca2e-bddd-44ef-787d-08d9bfe2709c 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: HE1EUR01FT059.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3074 X-TUID: kfcEsgg1eCKe 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 c189e67fea1c..1c36e72b262d 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