From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:adf:ca08:0:b0:1ed:c0bc:c212 with SMTP id o8-20020adfca08000000b001edc0bcc212mr6931520wrh.577.1646635405120; Sun, 06 Mar 2022 22:43:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:35c2:b0:381:6ed4:1b5b with SMTP id r2-20020a05600c35c200b003816ed41b5bls8940995wmq.1.canary-gmail; Sun, 06 Mar 2022 22:43:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJysEisr6hJDg/SIag6LCx9pfm+2tusek7e8+4AXjaNGKlvngpqPKdARKqPtx/rEGWJdqQCa X-Received: by 2002:a1c:f415:0:b0:37f:ab4d:1df2 with SMTP id z21-20020a1cf415000000b0037fab4d1df2mr16720391wma.75.1646635404254; Sun, 06 Mar 2022 22:43:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646635404; cv=pass; d=google.com; s=arc-20160816; b=JiAeyA+ajA7YBvybKv0rsAVporWpKTtMMNRqlq5pjUVo3QZwOwxsny0JNWVPxqpHzF KaisJLi/gLGJxXB2DJKwxvuVS0jEzaCA3tItUkh/xj39ioPF483+H902mZvEfZvMrnip xnFm6A3h+i9qpUKuUb3RLW59BdRonfUyxm6vL+4g/M0ijdpN2hFRR6nYM5/EyEW8yww0 J2EHP7uCaDLuZJ4jBfIyA7NCsaXdEOYmf3vy24goLFYbhUAhItWnO+04xWOAcUVmoT2m AyMKB1UJx7L0kFAO3Ko+76cHVoNyNEv8GK82NeH7QmVeF5On9SOChSyc0N9B2dSBETbz 8CEw== 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=lYzcl3SAlpnw6mjSkQo0Db0W+4a2wVhNeE5us1E0dxk=; b=t1WGHlh3a2saApp6Yi58IL7+MsLhs4iILo9YJ5OmS5t7viE9OFhoawAJeX+9V6eK4G 6MPwWfZhIcxlU7q6cnlgplc0RVsGWdz4d7Wb8/kZ0Xt6EywTqHOrRoKJJFbnb51BsmjR 0dk5EQUHfVvzqKRhcrqeNGnUpB3TFqSi91Wk/6lMCv2U+a4xP8ElfDSQ8AyHDJYLb/4U xH9Nzrpue4MJ4kHWa0rSwiXIKs/Ez/uCqncOQi3N5RaJP5tu8r63WFzorf0Ny6jLWLvN vkhiiIM4dYV6jYjJ75/Pc6vDabhQn2a2n4utVKzum78UwykIfMTmnpx+CEwI2WzpwHUS gxcQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wFlzYSaP; 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:fe1f::600 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 EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0600.outbound.protection.outlook.com. [2a01:111:f400:fe1f::600]) by gmr-mx.google.com with ESMTPS id o1-20020a1c7501000000b003898d45a058si342984wmc.0.2022.03.06.22.43.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Mar 2022 22:43:24 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe1f::600 as permitted sender) client-ip=2a01:111:f400:fe1f::600; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wFlzYSaP; 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:fe1f::600 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=eaAMtMI6jLf25u1phSR38vkfs/cjGJ7oDiDv8gWiur3JQXBfogAo1hOPkCrawGqqlLCNRXxdxM+fsmvemvXAFbeoE6Tr+XUpgaxgSDRgneQHxfWZUz3boiJvI7rzmj5lNVzXGs4F8m/XVw0vfWtZuoZ/uhmEBVPJW0tLGSmmb69AXjuiho5/jpbTENkiKPofF+vXjMsOQg54WrYYwyWjcL3+1+6QZgvBPQx+E2GoDYyDDoQquBE5YkGoCV1peXrtRm8VRiNuwYO++XjUpK5NDU5jTTxGF0Fh5gvDJrYmO4WQXXjKqZhPPonzSYfZcxxatis/1QkvjHbLHqqM6/d+hw== 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=lYzcl3SAlpnw6mjSkQo0Db0W+4a2wVhNeE5us1E0dxk=; b=EqtZJMZP61T/OFlVuEijnGhHCaa79XBGPZPVTfRSBpzOOczWT55/LJU+9NJxfn7xkQaxlRTL6c5VgYCNL3CFJs39qo43YytOV/eNiEkdEWs92WEAkIwTdEPJVfSCbR3iJ95vdCbasQBr296QJSCEy85AJFZBjJ24DyfmxgxK5v3WiIs34oLRgZe+9lkPoBuHX+tt7hMFHv6OyY5CfFuf6Oxbfsa0GASoXV8BsIbMCtaLrv7NBdShiZFrZQefIRamIrPj+oqdfxiZJGVYwxw6PcWehSuC736YgzQNb3vdyo9EIAMUjg0zOmwiosWe9M5wGnO70FpX/RbNGCwuTniqaw== 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=lYzcl3SAlpnw6mjSkQo0Db0W+4a2wVhNeE5us1E0dxk=; b=wFlzYSaP1BFFPvdNGqTKqRGliIY5Dj3mCxA7nXCcQFzR8EFWWRuf8hPAexIWQ3b3mEjSkTD/FBn/bSJsG8/gHyRjJN8bjBO0hsYISBoYXDIxIE+JqQozRUscJTyuFO0AQtjRC3NfnXvX1eCcwOKACaYVfMhpeB074m+aQZQIQVCLxcO6qB/Z0dmUoCoW7HWfYGpCEt5d+a8YcrHWtTz6HcHJ8suM87Qe4vt+92BXZAehyLVxp0Hi5AmUuvMXBvQrj586MBrlmTvsH2BsbdvDiGCaZnerEecLLpXtB/oVsoLJP+zE6d07nIbiWrk8f/0mHDhXnp+w/L/1gU7ox4Jo0A== Received: from OL1P279CA0014.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:12::19) by VI1PR10MB2384.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:7e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.16; Mon, 7 Mar 2022 06:43:22 +0000 Received: from HE1EUR01FT022.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:12:cafe::7b) by OL1P279CA0014.outlook.office365.com (2603:10a6:e10:12::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 06:43:22 +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 HE1EUR01FT022.mail.protection.outlook.com (10.152.0.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 06:43:22 +0000 Received: from DEMCHDC89YA.ad011.siemens.net (139.25.226.104) 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.18; Mon, 7 Mar 2022 07:43:21 +0100 Received: from felix-dev.test (144.145.220.65) by DEMCHDC89YA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 7 Mar 2022 07:43:20 +0100 From: Felix Moessbauer To: CC: , , , Felix Moessbauer Subject: [PATCH v2 2/6] wic: make import isarpluginbase work when plugins use each other Date: Mon, 7 Mar 2022 07:42:47 +0100 Message-ID: <20220307064252.651695-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220307064252.651695-1-felix.moessbauer@siemens.com> References: <20220307064252.651695-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: [144.145.220.65] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89YA.ad011.siemens.net (139.25.226.104) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--11.251100-8.000000 X-TMASE-MatchedRID: meDIGDR0v97wz/eMcUepXOuKmyvMg/Rv5fMkekEWjxt1BumBmrnKW9hQ O8CvZj/X/JBcIHMqKOGM+zmhoXPXfxMIiFlpfTTocOU+CGo+d/JiWV0DQ85LUnCxQs5Ehhfj4LW nev2jc0XI9EDAP/dptmSSWxIg3If8XBG+KlIJXxyAMuqetGVetnyef22ep6XYOwBXM346/+zIQW HgRSSTkEM9itD3muOL7qR/X8gljwk22Wonsdzy6wu1OZ6YCFts X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.251100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 9B9A28DD97C1D6EE76C203DF356490DCAA3A06CBE331110ABD3FF3B88C33030D2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f85269c1-a89f-4f24-6a19-08da0005c5e1 X-MS-TrafficTypeDiagnostic: VI1PR10MB2384: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: NhnpMeyCt9KFe96P2BhCSnam82jcs1s7CFzyGA6loyZ+LxnzA0pXp4qnPa7C8pIvJGKZpEVGFzqAH14kZafm4PnLFRnTWOLzqTh8PPKxrsI3C4gBkmDYYKOCwuADIZmPMhoQMNnAxhZ+E9CYPY44feHJ5YY7P2qN7b2JXROQ7eMNRuXblKq45/0oZJ6DC80PKAYIEHWr7HtQKYfxd4y21lZVSlJXff5nUCbS/mTa9kAz2ES5u28ac155ocInE0IHXp63UpX739MxTP9uhQh5n5CIzNofUqy9vvZCip7IpPuxYPXvMryCEzD/sIV0VU1UhDVtl95X3cSjZ/tyZjWQFyuhoAiu3OCLaYIi0OdpA2UAK+bwA5WnzFHgNAQ72E0h0qTL8XZFMcxU+WEw8k5VgUJB9YaqantX0qRQrKlXGznlVQxBiBmzC/qJWyC1HlxXVlC79Jgm7tteakyhOpex/EW8lWyDoLn31NAADc594Ec63cjiisfeWptM8s+MEvCQId+N5wsi+Lau1wLfK6E5h4ctBInSU+8Xy0HezZyLMUnL0rw6kb6rq0CPn1d9kGKBDNMn4t+KG8E8a/w3x7OFNuqjv/yLK8JgNI7s/GooIM1En9ue97d+gscjeq+++RmQ93JBFaMB1ueMI7upGDD7LzNOia0KfCTblQt23KrcEIfXjVMyO7KjrAFUuLyj7htdAVAEdCNto30/C78ggu4z3Q== 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:(13230001)(4636009)(40470700004)(36840700001)(46966006)(47076005)(54906003)(36860700001)(83380400001)(107886003)(186003)(336012)(956004)(1076003)(82960400001)(26005)(16526019)(356005)(81166007)(2616005)(6916009)(40460700003)(316002)(36756003)(6666004)(2906002)(86362001)(8936002)(5660300002)(44832011)(508600001)(4326008)(8676002)(70206006)(70586007)(82310400004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2022 06:43:22.0286 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f85269c1-a89f-4f24-6a19-08da0005c5e1 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: HE1EUR01FT022.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2384 X-TUID: JelIVEbTNUDR From: Henning Schild The biosplusefi plugin calls other plugins, which in our case use isarpluginbase and fiddle with their library paths to do so. Make sure that path modification also works when the plugins are called by another plugin. 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