From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7122062565110185984 X-Received: by 2002:a2e:b0e4:0:b0:25d:b1de:841f with SMTP id h4-20020a2eb0e4000000b0025db1de841fmr6142578ljl.377.1658234411923; Tue, 19 Jul 2022 05:40:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:c42:0:b0:25d:b04e:9cc5 with SMTP id o2-20020a2e0c42000000b0025db04e9cc5ls41379ljd.11.-pod-prod-gmail; Tue, 19 Jul 2022 05:40:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uUDeu/ZN4+zdZzw+ARHthy92fnuU97c5X5tltjhxwcjZfmT6XktouZPMuMt5LWRAuTb+3b X-Received: by 2002:a2e:b88b:0:b0:25d:a15a:bba9 with SMTP id r11-20020a2eb88b000000b0025da15abba9mr10523561ljp.357.1658234410791; Tue, 19 Jul 2022 05:40:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658234410; cv=pass; d=google.com; s=arc-20160816; b=rLh6RrHxjykaUDkzDYEjiKb3rc7xunvFebUm0483pIH8LlfKNFrrOL/1ZbxoclntnI 23U2fa3JqjJ6LfI/vruoAiL+p/Nw8ziMFDs2kLiUc/8x/zwhotJchvkRlwmsY+3cDz3b kPMEPWHCsrXfNg4QzFygdvbqPUxjtx5QswkyvT+lBIL9vz5VtHtaMyWhF3RAKgj1sBOQ FnQFVAT3wnwcZ7idzddwW1ls9NG5llOVZJ89ijilabeczbmBouX4y8tgHqAEDUtvaMpm aW4R+8UYW4MxOsZhb9VxVxoGQvWFgpKQuizyH9HJSRy2JMX/gQWiFdI4H/awfA1r2up/ bWvQ== 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=EtyDPC5uHxRpK1udSUdGEXGWC87Pgv2+LeKpicoA3Wo=; b=s+efxH98Ku++pm9ZN26yeA4HM0aW/O5bgNIECqP/TRO1YlqX39PvK0Crh3zXFTL3Zj MukIkaEngCODNAX3PH8UYNzQJyfCY+AkHuAwRBGQ+qUlMtAL0WW70MYnwyGlvdDttGz3 yB62OI/vG6AMGMzGeFeUP9foWnhbx+tOh8NIwnZbixPTJVxfenKqs1pQnjFNolboj6hp Rer0PA6G5Sra+GSMPpHan3IGKeuJW/fEFdL/OCxSvVOTbJdRSqJjYMgAXlC382jgfRUr DOunyp7U7Qt9wIKqKWiZ/YX4V0DJfLClP5+e5iWocBn5DOIbgESgaza+743Jzi8tOjDz cQEA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=w2kw8Kq9; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.8.84 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80084.outbound.protection.outlook.com. [40.107.8.84]) by gmr-mx.google.com with ESMTPS id o5-20020a05651205c500b0048858e79d43si429008lfo.10.2022.07.19.05.40.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jul 2022 05:40:10 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.8.84 as permitted sender) client-ip=40.107.8.84; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=w2kw8Kq9; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.8.84 as permitted sender) smtp.mailfrom=adriaan.schmidt@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=k2iwIlEmX3/1T3834s1a/VAF3Up1Os7KMy6+9a4pdS8zo1F3PlyRuGja3Zj3jGArewn8z2q34Ja57YqOpbEAH1aBPcPNr+1yCh/z5T0zwohSVPjt/yZZIza46CexeeyMmC8HuY4rXpbS68oK1ZSNpVWD1wbysgeMcMzYBAje4GR6uK40+JQgBPpzCrBsElNcSyCGDMTSI5KFieQZ3ZN/L0gOajcyvSjta39msagBa/OnUE+QiGIN9W+hDmHsRIbpRqRcDYhIAOnoQVzvU8FefZHZ6+/uYTR8wA60/3oEiZj0WAactnl/Czx0UQxatMwychPvHJx+BFw3CHMrd1Shpg== 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=EtyDPC5uHxRpK1udSUdGEXGWC87Pgv2+LeKpicoA3Wo=; b=k4+E27DnDhKo/IlpkawH0e8R1RKGT0XdTzAlCjU/w7QF1KN7adC9IaOCm9odpemPusBL/siqp6M8zTT2t/1rD/m1E+jBmAHakLQQCOZlpUgJsBIjYRdF6vJkDTzcnDOZ81R4XiiY3XRbafBJ08c67YwEwOQ0D3oXk7vA2hfId4zbtUEJiLlQd/uSQaEcz9ggHunrAVBX6kc+zE031vI23FvL0HrfejHOFR9NG10W0MpVgWy2pLCrTj688YoYFTKssnjCRa5kMQGspBIJOb8U8qi3Ys8aYNQG9ZFoh0cSMSQo3p5ZH36UJ+3+2pqkJxHkQN11jdfhfF6AuuDMO9za5A== 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=EtyDPC5uHxRpK1udSUdGEXGWC87Pgv2+LeKpicoA3Wo=; b=w2kw8Kq9f9sPfu4c9munZqPbsAfhEAnvwYrHgBfHuJOpxjuPcGZTW0vaXHaAHFiaf/D8kaNl5M333OB4xH/HFcCVHEUrRYIZrmgH98QOdrBEDv7A15CJd9lHKbTjOE7Mi7Fz+9jqPE45aPfgMN3dViP9FLetn4ToJ0LdqSlKlaaBnKmNAdef3JX/gWLAAor4VhTBltMsXAWPdREePMW/Wc8WIG5KdKhWGkyKqVxl8blVERPML4l7YlKDvraEIzVw9V+8XI2qNFE2caynYqgt+J+BTJilH0Zs1TtAVN/Mo58we5dfTU61APM0wHmqoH7ZWjjxZNG5WbDHebCKLwKLWA== Received: from DB6PR0402CA0019.eurprd04.prod.outlook.com (2603:10a6:4:91::29) by DBAPR10MB4153.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:1c2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.15; Tue, 19 Jul 2022 12:40:09 +0000 Received: from DB5EUR01FT051.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:91:cafe::f4) by DB6PR0402CA0019.outlook.office365.com (2603:10a6:4:91::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23 via Frontend Transport; Tue, 19 Jul 2022 12:40:09 +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; pr=C Received: from hybrid.siemens.com (194.138.21.71) by DB5EUR01FT051.mail.protection.outlook.com (10.152.5.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 12:40:08 +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_256_GCM_SHA384) id 15.1.2507.9; Tue, 19 Jul 2022 14:40:08 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 19 Jul 2022 14:40:08 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH 1/3] image: set convenience variables in bitbake code Date: Tue, 19 Jul 2022 14:39:52 +0200 Message-ID: <20220719123954.310076-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220719123954.310076-1-adriaan.schmidt@siemens.com> References: <20220719123954.310076-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: adriaan.schmidt@siemens.com X-Originating-IP: [139.25.68.25] 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: 4b346216-fa17-4bea-3680-08da6983d0c5 X-MS-TrafficTypeDiagnostic: DBAPR10MB4153:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vAgUBYxG20TwjaUv6Sdx2whgzVnwT8SNpMBaazkmCXlB6NZ0NVLiBo7oePiflw0avgSDSRZ/8bQt7NLk/dfbCXzZ9eTDCWtVNRFqXGWlIcTrfZg5tBpsifEBQz19zCdEOwxM3jdXK+ZlbPYVCGRaCa+T+YKoCTXIwLpid3CASwV9xhiJmdc6XWigNuHtwpdiT6OM8PffrP9F8J1GkJt65t5NnUwZh85dYtwXPSYzQBPZYFOAdXtaZ/npov8Sv79foTw5ZD5qQ4KmbdfPfut2RMJ71wUa1UcwqFShqgDeKfnlgosCuvcfiNqnc6Q7CUYoJ4VZgwRSzrtU0oiNkBC1D8tdGW4SohltVGclsVCZNIT8EEMfxfDKvgJ9sgavK61oy2Mca+R8vktwC7M/G3kON4eldj5kcRhOWF0hVME+jhMNX7YfNX4RgJQhPRTMhjzKjdvxwWQLTpO0dhpvz0VKh9oj8Xc3g3dhy6qXmRGy3rfTNAU9KhiobGDWYej6RtHLb2U9OC8cVkrPGq+N5ecve1C/4berIRHHT/9HYz8W/PbHxJA7rOvyJCwMUiB0v/GoHSy604DMtQwlOekzt/zEiT2w+xipK5dcBlKv4GWDv0z26PVdJieKq4v5Bv9GsBFsJoVpaoZ0rUFhY0BXXuQcCGWMLcA2BS6aPfF6RLlK4rAG6aQ64T3h2JoI69r7TIAcxyrRFXGjIzeux7wkaZSISes+b9eEfwyaCvLg3IfwJcANlV9RwfsIjWbE61IOVYAuqizwe6hBA4yEWgn4qV4LwVKC+FSL0Raw+tjFZouEHKfxoujV9fz4mpOxLm+aXSi/CGYDyHjXQP2l3Smt+DIZR7JoFqpB6Ds+d7eF6HJZvR18KcfA3TNyvyb16kcIM5ZB 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:(13230016)(4636009)(346002)(376002)(396003)(136003)(39860400002)(46966006)(40470700004)(36840700001)(83380400001)(16526019)(36756003)(47076005)(40480700001)(6666004)(40460700003)(36860700001)(186003)(1076003)(8676002)(336012)(316002)(82740400003)(81166007)(6916009)(70206006)(86362001)(70586007)(2616005)(478600001)(44832011)(5660300002)(356005)(26005)(82960400001)(107886003)(956004)(82310400005)(4326008)(8936002)(2906002)(41300700001)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 12:40:08.9783 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b346216-fa17-4bea-3680-08da6983d0c5 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: DB5EUR01FT051.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR10MB4153 X-TUID: uRkd3h2idfaw Moving these variable assignments from Python code into regular bitbake variables gives us tracking of their dependencies in signatures. Signed-off-by: Adriaan Schmidt --- meta/classes/image.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7eeed7db..0688b021 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -154,6 +154,11 @@ IMGCLASSES = "imagetypes imagetypes_wic imagetypes_vm imagetypes_container" IMGCLASSES += "${IMAGE_CLASSES}" inherit ${IMGCLASSES} +# convenience variables to be used by CMDs +IMAGE_FILE_HOST = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.${type}" +IMAGE_FILE_CHROOT = "${PP_DEPLOY}/${IMAGE_FULLNAME}.${type}" +SUDO_CHROOT = "sudo chroot ${BUILDCHROOT_DIR}" + # hook up IMAGE_CMD_* python() { image_types = (d.getVar('IMAGE_FSTYPES') or '').split() @@ -217,11 +222,6 @@ python() { if any([d.getVar(arg) is None for arg in required_args]): bb.fatal("IMAGE_TYPE '%s' requires these arguments: %s" % (image_type, ', '.join(required_args))) - # convenience variables to be used by CMDs - localdata.setVar('IMAGE_FILE_HOST', '${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.${type}') - localdata.setVar('IMAGE_FILE_CHROOT', '${PP_DEPLOY}/${IMAGE_FULLNAME}.${type}') - localdata.setVar('SUDO_CHROOT', localdata.expand('sudo chroot ${BUILDCHROOT_DIR}')) - # imager install for dep in (d.getVar('IMAGER_INSTALL_' + bt_clean) or '').split(): imager_install.add(dep) -- 2.30.2