From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:a05:651c:207:b0:244:c87a:1763 with SMTP id y7-20020a05651c020700b00244c87a1763mr26206277ljn.421.1646407607583; Fri, 04 Mar 2022 07:26:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:19a7:b0:246:4772:53ba with SMTP id bx39-20020a05651c19a700b00246477253bals936512ljb.11.gmail; Fri, 04 Mar 2022 07:26:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaodU+WRIQ9QxK34iUHc333OgITw2foIYUdvi5OF0TgF/FYd7kFOLnNNATtauvuOtvD/D3 X-Received: by 2002:a2e:944e:0:b0:246:4a4f:c610 with SMTP id o14-20020a2e944e000000b002464a4fc610mr27127334ljh.458.1646407606567; Fri, 04 Mar 2022 07:26:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646407606; cv=pass; d=google.com; s=arc-20160816; b=YHZXQpU6u2EML4PpL5CRzIZV8YpF12C0A7ArMKFV7ryL76KCivu1qZcoAklFXiGmGs oFnelbgFmcLrZnUZT/Bl4youzC4K27aME57XTRgauhsTjisA4G0kuITpWtcP7oPpfotH d6K+yJVe1Q8z/Cl2TYDuN0aymR4pZAxuMWW7uRzJVBA5rQRrwgtNCasO0smjSixn9DzX dpemttP3tzSdrlPCeIm7gHn26zL+RbRDDLWpTOPFkhC+zoRYIRHoGPUfd2owkktv3e5L ga/gjvbyCHbiZbwuks61wvfSXaaxJ7+rjLiTNlDK5yO6VAYrikJItgqFLXiB+S6TowaQ ZReg== 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=w3fq4C+XICK+Aw0m0SEznUu5ni5AalSGcz8KPRDn5fI=; b=g22HtyKbGkLBrTG5OHSvl6Sy1wBYe3nR+s/zl5Fb2HFhMN0GDYECYWGNDEjBM3UNcL C7o4xFmaxVFyT84hkhOf3raW3+23uUq+ACRtGfwP0zRZXjaaO4AX2jnmeCORKOtdQ3D6 dWEnHLK9jzrOxt0m2KulGEf1HIAp/E7a/KAwQb+gKE5ru0AN4u7/fhLQcuwxVNvm87Zb tSMkwxXbwSXAAcsPz56c5thz/2qXAmw+iV45EhzlHsTnhYvXBJ25CwUxIomU37wKxg6D FBgnf8Il6n0U7JukOlAHj5MEQ0M++B+EUUpaOKAi6M4VkrAHYzODqnPGKmzQ/M+Ac39h Ibqw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Fh+IDB5m; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe0e::629 as permitted sender) smtp.mailfrom=felix.moessbauer@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-vi1eur04on0629.outbound.protection.outlook.com. [2a01:111:f400:fe0e::629]) by gmr-mx.google.com with ESMTPS id n2-20020a2ebd02000000b00247a36b13a3si212521ljq.0.2022.03.04.07.26.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 07:26:46 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe0e::629 as permitted sender) client-ip=2a01:111:f400:fe0e::629; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Fh+IDB5m; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe0e::629 as permitted sender) smtp.mailfrom=felix.moessbauer@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=dxJB1jm2zniLWAb0RY+UwlVk9KWZjw5LCwUaV6ebOz4wHLwhGCAO6DdQkMHUF1+2gK1cTpfabt3AfCu7HofwHo6Q04kDLVu0ef8YDjLY2Dbb3oXDVmEGP6pa26OWsLLGiZ7V1JKRr563IK6gkeqqPSrLSzI6qRotoPAcLfZD7ecuBipDwr3JfDhvJ9DGw/Cql4X3XplizteRNfi08YlqQPHorYXHnktrN6FqCDnfcUSHpDFdYTnE2LMYBDMNu04yIgjViJoVsc7y4Y9jOJ5eMXaJ0qtgEeYDVZQTVzT+4BJqaQY9fXkBLUViL5uQ5/2CKojFG40TOb9vVxVYj57oMw== 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=w3fq4C+XICK+Aw0m0SEznUu5ni5AalSGcz8KPRDn5fI=; b=R5WPA0siZIklYBsyhksuro35iALp7DQUJwPVHSBhU9bvhr2kfkfNsIlli5YooSntR5Uw8xmqWuYf1UjbhHxcF15hRXYXRNB3iWMjEQX1D+VitM7z1OxaHl9WcsgmAMyp0Vj4ZeE9ROxsDcNvJnXfTVE76VvkMi+ilQ2DU+drAlI2zGmbHyov4Tg6YYfX/IPpaKjei1tmbwjWE8zLEqduLvgNHJhbABNaQwxH918ex6ya3FJYC9m2KC3f2TST+GiEs0F12nBb04NekFvGKuvmvYFbVJ2FAhvM0R8ch+hRglbckSQL0Ak0JhzPDx273234vCp2d61thJ8kGQ/g2gweaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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=w3fq4C+XICK+Aw0m0SEznUu5ni5AalSGcz8KPRDn5fI=; b=Fh+IDB5m6/DRZjA/YcQURovTp9XlK3jk4oziA7P8Wb4roqLx5KUjDICtq472n9h0Y7WQnQgTd4yGkJe/+r1b1du4x20bK9qXGOCO9/3hyjm+wbgmgL3BEgx4uo1EQTrLStv0//dGgznmVtmTz2i0XsH9XwW3SYY3k8VIE/i5Ae6FMtPdZpo4w/hWaZ9YjlSGuMdKVIPsfJSoEKbGosU6IZhrHQ1S5snvuIPJPiochjqKzsnY+smWBoMTLLW+rbq5HSa8YYUj0oie7w9rrI0x4UTFW25C2sDpDbZKiGVVV/JmfLpWQC41J+FgtJRuPbYB1qxPv0keZ0jX2hlocFL6zQ== Received: from OL1P279CA0004.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:12::9) by AM6PR10MB2407.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.15; Fri, 4 Mar 2022 15:26:44 +0000 Received: from HE1EUR01FT063.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:12:cafe::e1) by OL1P279CA0004.outlook.office365.com (2603:10a6:e10:12::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Fri, 4 Mar 2022 15:26:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) 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.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by HE1EUR01FT063.mail.protection.outlook.com (10.152.1.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Fri, 4 Mar 2022 15:26:44 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Fri, 4 Mar 2022 16:26:43 +0100 Received: from felix-dev.test (139.21.146.184) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Fri, 4 Mar 2022 16:26:42 +0100 From: Felix Moessbauer To: CC: , , , Felix Moessbauer Subject: [PATCH 3/4] wic: biosplusefi: make sure sub-plugins can import isarpluginbase Date: Fri, 4 Mar 2022 16:25:52 +0100 Message-ID: <20220304152553.584534-4-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220304152553.584534-1-felix.moessbauer@siemens.com> References: <20220304152553.584534-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: felix.moessbauer@siemens.com X-Originating-IP: [139.21.146.184] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--10.623800-8.000000 X-TMASE-MatchedRID: 4Q8tF6KdIhdJl7j3nk51H0HsecMmCCSnGW3BoL2XgxAItCy6ZX/lL0i8 rgutezVpBph69XjMbdlAHOg8qEtqyPYAZjCPaAjJ7i7ibx9W3/kLYCfOeHh8DseuFL5UpINxLHH GU+akxpybKItl61J/yfJvocwUrWp7dgkRR8OiM/8gBwKKRHe+r2JqshBYq2BPw95VFrv37DG+aL P6ocXniDRC4vI/8tKAIoizFTIEXSs= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--10.623800-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: F580FCE376F33D79ADF4AACA94F8825A36E8EC684BB94D82EE5FF5D99E52D6522000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f591ea1-38e5-4d60-b097-08d9fdf363af X-MS-TrafficTypeDiagnostic: AM6PR10MB2407:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cehKIB3V0KhjvjCdbluSXAks0FVYwyIukBjhYeQ8uGijW7Y5CqfYM8vA+OO6bdpo8vMrjcEBgjfSD7N2dMp/vZpgwX2lqGc8mANaovVXiKA77hlJpCb/z3wwevsEjRNfh1XxQ0TY87RbZLm3BLDGU7RS/D2d75kKLC2uMOCzvM6AduGJZa8mRAf93SFYYrIk1fUBNE8ySubhIQDgTg4JMcIkIjDKBLaHe8+T7yl5o1PWOqr2J7V66vZGgui0yIj+pfA67f0kday/5YxVUY67+yDMkgCk7Mxzja1Hi2xIamx0Bf5Wk1VRDHvsriKQ7nR0/Wgy25PDDR9OI1vGVoYjc17/XHWlD+M5Ieq/HSvqF1vYf/VY8lBduKhtDsw3IYikoXrzR7uXx2D3xeIWjrpo+CL8SL3JECVAzP3/bxK+4QXzbw9yXJNr2oQ8FIJKD6Ohrj80+j/ZzwA+LkwIc2lD6K/mazRAHahgPCpPwpLX+zoShLzujR0ym/sUFVEd7u4zKtwXAc68a2MdUEZXVA7b6ozmh3K9gk6UzwJ/SRu4FIYBW3B2a3M5yGqiO2GH00/WF5r06fudOoynNAppPWd2FDPdPq+tyPPQzwEzXbWtFNsVvo3/swwejL84QTy8djNhLliVJo4TXoZyycKVAYIbw8+bap+OCqZhGQwy+zuodLkAjD0GFBOkyFky4GHnq6pQoQB0sa3s1GZ1yayHflxvRw== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(44832011)(5660300002)(6666004)(36756003)(83380400001)(54906003)(6916009)(36860700001)(1076003)(47076005)(186003)(16526019)(2616005)(2906002)(956004)(336012)(107886003)(8936002)(26005)(508600001)(316002)(82310400004)(82960400001)(8676002)(81166007)(4326008)(356005)(86362001)(70206006)(70586007)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 15:26:44.0193 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f591ea1-38e5-4d60-b097-08d9fdf363af 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.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT063.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2407 X-TUID: UXE64UuKe+dG From: Henning Schild The plugin calls other plugins, which in our case use isarpluginbase. Make sure that will be in the path so that it can be imported. Signed-off-by: Henning Schild Acked-by: Felix Moessbauer --- meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 6 ++++-- meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index d9712548..5ba0777a 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -23,8 +23,10 @@ from wic.pluginbase import SourcePlugin from wic.misc import (exec_cmd, exec_native_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE) -import sys -sys.path[0] = os.path.dirname(os.path.abspath(__file__)) + "/.." +# allow plugins to import from isarpluginbase +if '__file__' in globals(): + import sys + sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/..") from isarpluginbase import (isar_get_filenames, isar_populate_boot_cmd) logger = logging.getLogger('wic') diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index f493890f..9136d4f2 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ -20,8 +20,10 @@ from wic.pluginbase import SourcePlugin from wic.misc import (exec_cmd, exec_native_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE) -import sys -sys.path[0] = os.path.dirname(os.path.abspath(__file__)) + "/.." +# allow plugins to import from isarpluginbase +if '__file__' in globals(): + import sys + sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/..") from isarpluginbase import (isar_get_filenames, isar_populate_boot_cmd) logger = logging.getLogger('wic') -- 2.30.2