From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:a17:906:2cce:b0:6ce:e203:d207 with SMTP id r14-20020a1709062cce00b006cee203d207mr32191603ejr.242.1646411694048; Fri, 04 Mar 2022 08:34:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:7e0e:b0:6d7:d34:3fc6 with SMTP id e14-20020a1709067e0e00b006d70d343fc6ls368979ejr.3.gmail; Fri, 04 Mar 2022 08:34:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9SBUDT16ct5NON6WCg8/7NCGw8VQJwpU4ubCObWdw1L/j+uWLko3FLgj9BumTwC7+Ms8m X-Received: by 2002:a17:907:da3:b0:6da:8a3c:66b with SMTP id go35-20020a1709070da300b006da8a3c066bmr7873384ejc.742.1646411693097; Fri, 04 Mar 2022 08:34:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646411693; cv=pass; d=google.com; s=arc-20160816; b=laL2S+D9MGLG8ooigocsJaxOA2DMUOE2r8ra2Zf5w1QSua2t9MKio6x8OpAl/5PBZd jY3v/HnoxdcxR6QGc4xTPqoOgZs9knGThwjbeUUlzYjK0yznQHwLTcROTihhcnrhmCue dVinmgbNlMGM6G5CwNLuDmT+wOBk+YVXSla5zSsOKwb9BolhHOYtydZrTY5nvbRu2LOh y0a1xTBMvd2xPpGmroXFClsHRWt1T0uRfzABmjDfNeD3vLn1ZMQHSKUswSMkb/GGgTJ+ CLoZigyNjwFoqBqJyY/weMIsFc21Z+wwEE5zU6m6ROLwL1Co/EKD0+lmK0uCgICuay1K JCEw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=pUChiH4uvuBahubLHaxzETn9E3LabTdXnoOv0hfc1V0=; b=Mc4RJeH5UXpKMezlCxWmH4hTITk2jSDW/f9c9vQ+/1LvvHRqEk45n7NP0bzUTwK6+V +31c/6fEKL32xx1+k5YjHBBhP0mVQzFhsPJvRg6w7GWYHtxrnSrFccWAi9MLDXBunXXB 2M6X+oaEttlhX+D3i/qboWzWWuII5ShXmy3FzJQtQngFSuRv6RJjlMHtq59SkdpGB2tP 3Fb15yIRRF7yU05KuFMOguSfiHejztIQ0j9xMKIXJQTKeBvINtCucGshTd81p0mSzrp2 3Ob2rzbc8BRwbEwzx9blfD7HRIyjo33UtDbnh9S9rt8S7LLi7rQSxR73OsyzYn7JkoTu O9iA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WZr24Gij; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::60b 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 EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on060b.outbound.protection.outlook.com. [2a01:111:f400:fe09::60b]) by gmr-mx.google.com with ESMTPS id j11-20020aa7c40b000000b00413ed059da8si384490edq.3.2022.03.04.08.34.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 08:34:53 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::60b as permitted sender) client-ip=2a01:111:f400:fe09::60b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WZr24Gij; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::60b 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=CK6ITLdlu38Py0TPFGu6jv7i+KBbTajT8YbwzXF/Th1ch6h2wpxQwPvmuxW2TSECcAd/NrAuCwHuCdaphbihWf6Xy6dZp+Vm+i9k5cyt9TGdpiWt3BmxtnTTVZuej3BLIUfb+h6mFd6dHFAAXAsuyeJfE+1fEFN/ji63heXbbka3E0pOpIfQZHLiVKeHbmQYM0SKfxbui0uLu2gh1s+zg04Ty7GWMbRR5G+O3dY+qvCn4Je9MbdGcr1aX8dt9awO4nroNgya9gxZv/vouUo7UbSAvIU1HE+gbQRvAbIn7wGwyd+O7+4xOjIbTj/vviRNqq2kAj6rXuxFgF0W3Bvozg== 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=pUChiH4uvuBahubLHaxzETn9E3LabTdXnoOv0hfc1V0=; b=Oelg8bUWNUa+LH1WNiyQaVg5oCXzXxB9FAaXvrxrFhSkUrKPDCOG4+6YIjcMnyUC+lv0OdRQo/oa3O8jqDe7N8hf7nl/Ze+uau7VUs4cti1QG+Pg/5m9yRHuqyPuzxqz3dF6U4x98ud6kk9PDgMoAynhTCj3WTTbAoCXg7Yep2/FprnoX9KBjtqxArx5sZoOy+62jvK0jJz2j8UrRf/YLNBmGD9aycvmWmujuA2b0I0DAiIXNwUFW5LlNzRsYF5MFMSsDkR4gNXylIyZ0UB7DppIo6f5MbZ3m3GF3MM/3JAn2pmJhntTaBZZKzmmDyILgo002rV1Oc5JsfGo2xWusQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=pUChiH4uvuBahubLHaxzETn9E3LabTdXnoOv0hfc1V0=; b=WZr24GijUtC+FHpiRd+jSwv2gq3uOs88C8RqhoONCLb606kw8qgYBoFa8a6uFivbL2WXbGpK8pe8f+57JzQpgWL3kaeeFLDKgh2qWK0rNiFsW1ZBJ4W+shRKq2DkNLVTundj/rZ+no/+FmjGegdWMgOnXPj2ifG27X3mjqyLhheAPy32irsV5SQGb+9BFm2zDTAWLgyRLA+UUlwgomBf3nqB7IhDfFPCuPJGd5llAjG5fjvCE3LQ9QJdQMoN5ZG9HXXZ6UF3yR+zXN1OKtaSde+nVcGrldQjTELMmWfbJHPzorCKestrpr4meM84G8DxR1/7hyMPkonJFfgbv+39Jw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) by AM9PR10MB4957.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:41c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.16; Fri, 4 Mar 2022 16:34:51 +0000 Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551]) by AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551%7]) with mapi id 15.20.5038.017; Fri, 4 Mar 2022 16:34:51 +0000 Date: Fri, 4 Mar 2022 17:34:49 +0100 From: Henning Schild To: Felix Moessbauer Cc: , , Subject: Re: [PATCH 3/4] wic: biosplusefi: make sure sub-plugins can import isarpluginbase Message-ID: <20220304173449.005f3d5a@md1za8fc.ad001.siemens.net> In-Reply-To: <20220304152553.584534-4-felix.moessbauer@siemens.com> References: <20220304152553.584534-1-felix.moessbauer@siemens.com> <20220304152553.584534-4-felix.moessbauer@siemens.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM5PR1001CA0067.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::44) To AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e3146b4-3acc-4905-34e1-08d9fdfce806 X-MS-TrafficTypeDiagnostic: AM9PR10MB4957:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr 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: I9q8/R1nQWnYEGqncvcBkv85fr5uwUoD4kkbEUIe6ModuNJW5b3Lakhjnm6oqloXgsM8jbfjTIyOS2S2fzMB7hErNt9PXpjg/Msb0c1EEKduuSclEoT4EOLW1K4ty0vfs1ZdQtFBD5ZuMcNlo3mP7XYhWFvcxqWqbtKyJVBjQY03SpnMxcS+W/leIPVsZsSuAyHpzEfQLDsuCt5KVPaYzYK8B5Q73yKLxPAxso79zk2s5Pmsmd00xs9Ln0IWbmnChZqWNQls20+xxs3jm73687y20J8MExrL2OKS3W23PeyH5y38Z7OnkMxVi9hLxuYAMotrW2HnnTOZUKNEnJTsadvc6KTB7LOcKALkbBSrPVHyNHssJ6LS9IiVqTTu+3zSS2nTItEwko04qCtoQ4npOSiTpqUonDblJStD5Zdir9ptebPwVfHcMrZiCVL+cOogK7fF2H1vuM/GOSbxsPJj95nWaQ7dukJsV8Vj6m6VYZ6TotNAVX6sMt8t/Js2mtUjFc3EyGsXUdM74bGvsn1VrOarU91sMsbQHbaNt1mvjs4UghIVLl82eUvJ1XuQSNjwZRnkoKtySZ52sS88W76IvaZ/C6obSzcwl2s4RAxtbdVMs4JvPmO04KUhNYVeQxEptRr6s1cdAZvTkHaIZkB1lg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(66476007)(54906003)(66946007)(6636002)(316002)(6506007)(8676002)(66556008)(6486002)(186003)(107886003)(508600001)(1076003)(83380400001)(2906002)(5660300002)(4326008)(6862004)(38100700002)(82960400001)(9686003)(6512007)(8936002)(44832011)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ceom4euQ96HPVpNWdcnJcOt/2ijunWI+0A/iqYSRIo8JmIJIzs2s2CoUh8HY?= =?us-ascii?Q?GJVf/wkAkpjv9fCM5EUuyIOpb1TZ+znmSLDrNatL6ny8jAjc7xxT/d0ygwVb?= =?us-ascii?Q?NzkA3Hv8KZJJRQ2I/KRAi6BlfgkylBpTz2laW55fpRCEjZ3C6iJ8ASLpCTs7?= =?us-ascii?Q?wiJ+gllipyeDGV1XcgsZcfxuHKJk1lm09F5HgC+64Rv6COlyaOj/J9RqWSaO?= =?us-ascii?Q?cGquZsPLc0MYikJ7cZXCsleEdgU8CkAL0i1Bo+XZjVJwYQd0peCbHstjm2WM?= =?us-ascii?Q?eEDPNFJLx9rlPGEL2WYmCI87lLW3hvA2ejRz7VgnTXFJzZAptHCjTTyZ9hZP?= =?us-ascii?Q?J9ituoWlOlKqregYuZlX6be6VbFGr9hi07cqegyQdVqYMcKr3u2rBUbVrw/T?= =?us-ascii?Q?ugyVGNqlUPRkpHYC44gtqyq+5bC2P0XxYhoTY5VMZe3LRhLWN4wN0+U6ceo9?= =?us-ascii?Q?MZLUjI18pcFFYI5O0v4baOOA9wlaC3f3WFKrMMqgn0JM6IxAJfNAvIbn4KZy?= =?us-ascii?Q?twe4tQnO21HJTpRk7Tg1QwSNr/+JDVEcimCpnVJI5J5OROVRHID9OKiQqu45?= =?us-ascii?Q?8JjheLZ5YINujUUiV0Key2fck1usES8BVMm7hUwg3WZ+8x+TVmNrqfzetEM2?= =?us-ascii?Q?eQhHLLGtPGBAdoAHQzDENnZNgdVS9RaVU/d5YjgHZfDs4k4DX2uFO5uSRvNF?= =?us-ascii?Q?EG4eDwXsczm1cdbgK716WEOeDZU1eDu7sLpk+wvuRsxsh2nAeLH81W+YVEfi?= =?us-ascii?Q?BNbNx39LRwpBipyRFstW01Df/BX9CDvM1ruwkuT2JCcGKu2CYHugXZv4xAw5?= =?us-ascii?Q?Dv41rRSmLYnNI0ri1/9ONEG8ywVyHOWCdmCH04WzrEluCpsGnqKrT9SqPrli?= =?us-ascii?Q?fNDlHQwVjvpxZDv8sXnaSGijqbtPFnjguzZZ3NxY/6ZzE8Piy4rwkhoeMy8m?= =?us-ascii?Q?yRUjIaF9ScNyAp1cFcRrx3HC0YhJF13RjS8Q3MGPtLahcR33FeJ70bDECNDN?= =?us-ascii?Q?NW8UQhM3ww5xZ1Z4poYs7qLK8bSIUUFZYazkJF7sEUe1mYbrpQxSUJrhvBym?= =?us-ascii?Q?XugutU9h5XyY2uY3RvV72WLicvu5eeDF5lhjmChng2cdbk5Rel3nXbI/Rg1J?= =?us-ascii?Q?j0z1cgrFgCWiU79rX70WuOT5XexpZ2MF5aY7SQgeRkkIB+I3PSZGtM0ATo08?= =?us-ascii?Q?SWKf54nyoZYG5fjH7V9J2h+Sp3267KQFI1hQo/lr5c7zn2fDanaESuB21nbG?= =?us-ascii?Q?hJ56PJI1KZYXGhIvEr+eMtjvDo8R6vKjPr0NQof7EPJpB1VKVE22boqQTroJ?= =?us-ascii?Q?NbepWPJhOiNT3nIn1k/omY7aplKzQC1BHONfklC3GrAzmkM1zPylMdIL4K9p?= =?us-ascii?Q?pLykpNqNGFP/GdXOMz9pYtrhIogU6BB0ArAoNW8H3/OQxweFIiI4eMthiytl?= =?us-ascii?Q?i2+VEIN8kGBzJtktSWPVoVu2VOxziV6iS8xydQOWqzsFASGj//KZcQLzySNA?= =?us-ascii?Q?ndr2mMXykn0zh1TEYH5ma6HHwzQk/KIqji1z5mNWNbYfkIzBFgXxZp6x40s2?= =?us-ascii?Q?9AiA7l9vZ82xGEB3Hb+h1cpT4CR6WlGEwNM+dQtXK7Z1+PRqexLHt1038exF?= =?us-ascii?Q?gkoGl9My9cR2snk915u1iTf854QUEguuw7BeV54VVFcxDoYErFWTcvtqLWBz?= =?us-ascii?Q?qF0iYv8vFYQhiMQPIQ00op0NTp0JSud7jqFvnpLTQl0bu1z8lhrYG9e0r4i/?= =?us-ascii?Q?LV+0fmx13w=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e3146b4-3acc-4905-34e1-08d9fdfce806 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 16:34:51.7348 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: t1NhShGAx7ljmJmb4H7I8MtG7cj2BkdtIR9lEwADQqvr5877AP0Oqo2RNtHDVnmirTO9p53htx2IiL29i11MZXUXeQLT56uZxJBQnEY+5TY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4957 X-TUID: e1vi+27MqdhO Am Fri, 4 Mar 2022 16:25:52 +0100 schrieb Felix Moessbauer : > 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. I gave you a wrong commit message, please update according to what i gave you off list. My bad. Henning > 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')