From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a17:907:75d3:: with SMTP id jl19mr6455922ejc.520.1636613258725; Wed, 10 Nov 2021 22:47:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:3e05:: with SMTP id hp5ls908275ejc.6.gmail; Wed, 10 Nov 2021 22:47:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXKkeN8SgYHaJioWe+atILV2V/GyDhgOo6WZXZiVOeAf6jRdXjxCAtzO0U56mGjf/qEQOm X-Received: by 2002:a17:907:7f11:: with SMTP id qf17mr6431686ejc.196.1636613257724; Wed, 10 Nov 2021 22:47:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636613257; cv=none; d=google.com; s=arc-20160816; b=tp1OLY0I08ZnwgkhxGyNc1MPydT3gfsmnOluzwYEEG7mZn8cxYJkpDMjJi8riro/sw vX15h611/85ex6VTJ58GlKnuBpuAJcnv66vJHNbdpUL2+11LlIJtUXGqZ+2xMt01a/sF 93uoph5ahPyT4mCcbf/Ee+lO+IKBH9OkO1Tr37caS8pdZyuu3th7+rgefBV+JV7tI0h6 /lvCFH2wY3ySiARCxQe456Ve0JQYVGPSpIXxGgBXVd4mIM/P+lrPoVmH+EfRdm3hjgCg je9UK50Gf6DgeObnF8+rR+f/c1LDnOVGxVlwwotSsBEll6r0gRLOwz6HjZfJN3UXGNBl vinA== ARC-Message-Signature: i=1; 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; bh=ZuLOdxa5z6roIXiyVHQbttKzpAHX19KxRDbLZfyueLw=; b=ktwjthYyieiuBoyYAitV/LCncP+xnMvfs1+Vcc47X/cxmhXBLl9YtXRuXjB1vDsVA6 NWRF0P4rLkFYGgjq51wK3Kl/8xA8DLMmjcPrV54rmGJKiqZzTHMhFmxFeogBT1ajiWbp spFirwrx45tPVq0rmIPYXUfcn3WUEre1D3joGTgWKNOZluJ33XHJZyjJBPNsaiPedbGR OVx8/Oh5ArlxI65Mi0qkzgZDw+jyrIEOHt5pUbx4idArkPBjvUnvEchZfY9x3FxRgjM6 k/nZx5NJaVQnyGULwFk3gR3tk+S0LFhXrziFI6UOF8xWKKED99gn8RYVQCuotoc/57at OLPw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id u19si228523edo.5.2021.11.10.22.47.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Nov 2021 22:47:37 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 1AB6lb17017646 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 11 Nov 2021 07:47:37 +0100 Received: from random.ppmd.siemens.net (random.ppmd.siemens.net [139.25.68.25]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1AB6lbcU012388; Thu, 11 Nov 2021 07:47:37 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v6 01/13] oe imports in central location Date: Thu, 11 Nov 2021 07:47:16 +0100 Message-Id: <20211111064728.2375760-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211111064728.2375760-1-adriaan.schmidt@siemens.com> References: <20211111064728.2375760-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: sTlDqJTX2RDs Code taken from OE. Allows to import OE modules without first setting python paths manually. The reason is that we'd like to take sstate code unmodified from OE, and here it's expected that imports of oe and bb modules "just works". Signed-off-by: Adriaan Schmidt --- meta/classes/base.bbclass | 28 ++++++++++++++++++++++++++++ meta/classes/dpkg-base.bbclass | 5 ----- meta/classes/patch.bbclass | 5 ----- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 72d4cc0..13134ff 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -21,6 +21,34 @@ THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}"], d)}" +OE_IMPORTS += "os sys time oe.path oe.patch" +OE_IMPORTS[type] = "list" + +def oe_import(d): + import sys + + bbpath = d.getVar("BBPATH").split(":") + sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath] + + def inject(name, value): + """Make a python object accessible from the metadata""" + if hasattr(bb.utils, "_context"): + bb.utils._context[name] = value + else: + __builtins__[name] = value + + import oe.data + for toimport in oe.data.typed_value("OE_IMPORTS", d): + try: + imported = __import__(toimport) + inject(toimport.split(".", 1)[0], imported) + except AttributeError as e: + bb.error("Error importing OE modules: %s" % str(e)) + return "" + +# We need the oe module name space early (before INHERITs get added) +OE_IMPORTED := "${@oe_import(d)}" + def get_deb_host_arch(): import subprocess host_arch = subprocess.check_output( diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 83500da..8a39a6d 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -248,11 +248,6 @@ do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb[dirs] = "${S}" python do_devshell() { - import sys - - oe_lib_path = os.path.join(d.getVar('LAYERDIR_core'), 'lib') - sys.path.insert(0, oe_lib_path) - bb.build.exec_func('dpkg_do_mounts', d) isar_export_proxies(d) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 3060755..2337693 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -92,11 +92,6 @@ def should_apply(parm, d): should_apply[vardepsexclude] = "DATE SRCDATE" python patch_do_patch() { - import sys - - oe_lib_path = os.path.join(d.getVar('LAYERDIR_core'), 'lib') - sys.path.insert(0, oe_lib_path) - import oe.patch patchsetmap = { -- 2.30.2