From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:a05:6512:3243:b0:445:79a1:b589 with SMTP id c3-20020a056512324300b0044579a1b589mr18547802lfr.191.1647967569458; Tue, 22 Mar 2022 09:46:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:b05:b0:448:696a:ea62 with SMTP id w5-20020a0565120b0500b00448696aea62ls5199410lfu.0.gmail; Tue, 22 Mar 2022 09:46:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKMGyOtUAnEx5h2mZ5iJjh6vekh8pcdIYdn+TMy9xE5iX+mKYlWy4ywl+LYn/xFRG49hbB X-Received: by 2002:a05:6512:2248:b0:448:6ef2:9b2e with SMTP id i8-20020a056512224800b004486ef29b2emr18950765lfu.179.1647967568311; Tue, 22 Mar 2022 09:46:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1647967568; cv=pass; d=google.com; s=arc-20160816; b=UtXeZhrl1tRmzCH2Dt/ihaYc8bFgEdavXDXs6I79bbDCCsIVfhR74Ofm7iVY5Txeey e53VrmUgtCwDB4nfsuQfA83Ek8Pwv2oFMHc2WfMYkltoM0b44xLdTdbQUXY/599hr3IA h/lBpBYYEVKMtnSRvqZKml8t3+rdAAMuFKUkJ0rL3pXATk2gsjNujvOlqw/2WCHqLwdq UMTGyONWSTS5mpaHoxaJ6QvsE2ZNOjaQWbTxgq6f+Zc7W/k1lhPOo8KtHq453nU99vE7 e6NprUCIp8YVIZ+Du+gTTDnETMaLyuAjHAlribW8YTC1SGGb9sR9P4UI93XNAPAWwJKy 69JQ== 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=NIlUbytqYJPAenlkW0T0C4SQ0cmoRcdj+JagzWwicnFgNJeGrsRwz3cGcox8oNxNOX 1SB0cMyJWoOHJGZd+Tax2m26uKO3p4pQuFDtyj3n2UEBJP95h/OElZm3PeihOBDFuqEv /981RDe3DDDRM5H7toKYJXlv8wy2IpfVup8z4XaBN3y/coryYegDWnPBFLqN4p1twjoo 8QREpL/x+cVUXlrPQxtfv3fQ1rl10P5tmssLuHMHgKjSFlx7OphrA5V6kiQ8BmH/brut Gf9+BpAnMem8R97RXDs62PLPNu7DA4Oq5BdrlKJqv7jno2Mrwg79aj/xFa5ZMJyVsx3R YN7g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dHrIb7xk; 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:7e1b::60b 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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060b.outbound.protection.outlook.com. [2a01:111:f400:7e1b::60b]) by gmr-mx.google.com with ESMTPS id l18-20020a2e99d2000000b002497e266976si383402ljj.4.2022.03.22.09.46.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Mar 2022 09:46:07 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:7e1b::60b as permitted sender) client-ip=2a01:111:f400:7e1b::60b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dHrIb7xk; 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:7e1b::60b 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=BN87raZ4RbsgvRGHMV5Nrznldmtbd/GqHfedwydNk3eyIBPDEDyR2qoysqAr7+YzZpezcxGD/9Ln3NfNaPBVKFEaYd4lkaYFdp0KxhbwoF6z/xEdEqarRb+AH1qAzgUnAOU78HIFtutsmiVbSu8koJdf5SxAiOXfHf0M5jgsX6d7jz7Th9eLj354BvwUWPrqw97cDgSC1x3ciocLNV27yyxgB+Vwcp8PdXOBPm5vr28nxOGFuQ3Q6jRTbwHV3rDEnUxEGbvfTC31Cpkj/h2yt5KlZC5SAlJsVax9JTyAliNt9XPNafM0r1H9mrPjKcIk7lKgk6Vra/af39TIY6Ktcw== 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=j8ZbUFQB1/zFdoZ6cqBkP8LOZTGCdWiTHIUOnKSOxPOuCWEa2YDrLTdKkzpGUbFiTWR/Q9pAKZ4W9wbZFmgRGz+gs28ImkpsEXiZP3k+2jVmdrcSLCYldvDXsY7XmTWJNrglpacORWSbRCQ8znxrccAt4v4fXyMrZ0qiZ1Nf3xWkDVEhzBBRRLctfop4sl70MoJ/JkJlXl7V+8BYkYjnfA+vMAl+/gsxcg+G4SNcxMdJOMfitBe1vh1Il62Mzd8EaXJOw4PimnO7MUnTFQ0t09Hzw1DuiUrNVhLhi5s+dAO1S6vtmJEUE1kYgpYHvMGOUa4LZR+noS0Hiq2DXVQD3g== 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=lYzcl3SAlpnw6mjSkQo0Db0W+4a2wVhNeE5us1E0dxk=; b=dHrIb7xkhkTeNO8pBjbStYqAzLtALhAzCMkQmPjaPVkNfQ+tyCn/Irxb98pZkJi6RgKeG8hNoyZLwi9mgeB+YjrYneemrO7EVjCb8lWtZlixX3YMdf/2ptrT77B4U9b5sHSat67FuCX3AEhe7fZeo4ssFRsTZZRa6bB/RDf84pLhJZhLaVRV3d8pmVFT/HoPtNF3SCkayu8kEcmV4CvOeDIeIQZ7i2bYRtZbzZDm0sOAhQgG0Owd7EVbx9ddir9iMH/rJBxXI/vksiw3x66QrTL9iz05siVaxz/JaH3tjiKu2dkIGHKIIjZqMH1VmAyuF/2LuNq7z4+Mlc+1QSYjjw== Received: from DB6PR0501CA0012.eurprd05.prod.outlook.com (2603:10a6:4:8f::22) by PA4PR10MB4368.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:107::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Tue, 22 Mar 2022 16:46:06 +0000 Received: from DB5EUR01FT100.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:8f:cafe::6) by DB6PR0501CA0012.outlook.office365.com (2603:10a6:4:8f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.23 via Frontend Transport; Tue, 22 Mar 2022 16:46:06 +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 DB5EUR01FT100.mail.protection.outlook.com (10.152.5.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.10 via Frontend Transport; Tue, 22 Mar 2022 16:46:06 +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.24; Tue, 22 Mar 2022 17:46:06 +0100 Received: from felix-dev.test (139.21.146.185) 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.18; Tue, 22 Mar 2022 17:46:05 +0100 From: Felix Moessbauer To: CC: , , , , Felix Moessbauer Subject: [PATCH v3 3/7] wic: make import isarpluginbase work when plugins use each other Date: Tue, 22 Mar 2022 17:45:21 +0100 Message-ID: <20220322164525.3950970-4-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220322164525.3950970-1-felix.moessbauer@siemens.com> References: <20220322164525.3950970-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.185] 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: 69fb750b-c415-435c-3212-08da0c2375ba X-MS-TrafficTypeDiagnostic: PA4PR10MB4368: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: Olc3VVdKcJUZgcGKx3kF2oJO/2GkgKyRKNNLR7G6+Mv/hMFnEgsNUiUyIdMM1I51l0BH6hjgCczJLyb54o6NGfpn/1SyzmnA6t1GToFkOlhzmvrOk3c/sB8KEqY96Rgn5KPgLGmQGfcLiwLKoXr93Lx9ptCZKz9sOCW+BZnKzCevvH8EgmMYKpPGkuSl6rey8gvPSGUiPe22SI5OWAuETN9Q6g4Ax3Zc+z9TlQ2OTs6bZ4xZwkV6D7j+gBOyRS/OqoLmzxrEVpElmwSI3MMC6smbxv3VlIh4Ew9PDiiyLF8mdSzFvez9FoGf7YXNeFHF/W0QRM2UO+e3ahwuBM4L9dtIpiHjFk279h8e0oCG3UR86Ctu29ZilCltSI9cO8svLItHlHGJZ5GE+Rr5mYchE0DMbaIj+64FPvlvUv6XLDMMJoD3ls4gR0sVWbkIN/FONMrE8PSpZxjvRfjcM8Y7vvTXmvHREk5yp0ELAKjuwwFHftL5tlRTqrSx6o7q75CxY/12lfE0oEqu4XTFhQLR91KZCE+Hx9IaWdb1ElH3snaTo5om/doEF15bToGd9shmFHJG0GwEY6n5JzlMmd9myyiWTFBBx9fp6q6IzVaEMa+Lv17W3NevQhJ1zbKOzcHHdCXnLgDvRUAbYVs7/DTwqQfjg7wB2fh5YcZFkq9NzBN90FyTK/XhxsSUzCjebJZ01JhQyYeSmPyFkoWrL3nAWw== 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(508600001)(36860700001)(36756003)(70206006)(6666004)(47076005)(70586007)(4326008)(8936002)(8676002)(82960400001)(81166007)(356005)(2906002)(82310400004)(956004)(336012)(1076003)(2616005)(316002)(26005)(54906003)(186003)(6916009)(16526019)(107886003)(44832011)(83380400001)(5660300002)(40460700003)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 16:46:06.4090 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69fb750b-c415-435c-3212-08da0c2375ba 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: DB5EUR01FT100.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB4368 X-TUID: Oolyo2I31Ces 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