From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a05:6402:1c09:: with SMTP id ck9mr22066145edb.389.1637313902441; Fri, 19 Nov 2021 01:25:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:7f8e:: with SMTP id qk14ls1091103ejc.3.gmail; Fri, 19 Nov 2021 01:25:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYfxlFlPzT+X45UqMSa6x8qTaaUdhYSUxUL4CM1Q20RvHvcr/P768nK9jDPtkf79dMs7eZ X-Received: by 2002:a17:907:3daa:: with SMTP id he42mr5991201ejc.160.1637313901283; Fri, 19 Nov 2021 01:25:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637313901; cv=none; d=google.com; s=arc-20160816; b=ntaCkGCiDlVeEWYbTbzA2UuMZ4Z3/+63smVkUWDHnILLLqJbJuMsyxKBUVMgTZ0S6i Kr5GImvFJVCdmc8gOxI1itEKubYgzRTXQWEBMru7p+iUWZ3zUL+eVoaps57M5ixVnh5c EGWbJdKNaDue545GamvwyCEME9NEU4u3LGUP5MLEFAP2Y6iqpE0pAcLsssPJJCAWLIvK Y9ak5R7BpW3ICaz735fZuIuj36rLzd0cPwNuC5h6Q+jchpSYIq9/ZIkdE5m5QLJRAUca GyQ/MiAu+OspV2CZXtJdhpevuzKV+a49ayPqNrDZIczax2Gh0VvbKXTPLWxggfeYwlvg Djig== 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:to:from; bh=zJuCsTpLJyC0olGNo9AXxsFckJfsZyOClZcpOkkUIeo=; b=H8pankJMkYzHRanxNDPF1/Gn0Z09UC/W6GpnOipkCUZtmuuW7+qhzXWLQqo5ENePL1 EDrbDo6XgsO2teQFhOYKx12MOmwx+ql3QZf1uwYUs54uJY6j4cENGRrsh7iRl0dhOYsL WqG/XXInsAAGFg/IHxDyrF1QSC31v8SKDGsyqWgSPm5O0ZiZAzX4hwKAvzPPc9Dml33D IsszAmmo26xCtqTFVFgFGLxMPF/HCp+zG8vW4rKzp0HiPPoDBWind6wgr2QNqTOxk6Jh IbcTAbEMBQZBAgIdS5AiUqtIKuAuOQKe7D9BEHxviyO2yNHSM3Gd8mKbAElViu0/hshd pX2g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o19si144581edz.5.2021.11.19.01.25.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 01:25:01 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1AJ9OxJW020762 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 10:25:00 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 1/5] oe imports in central location Date: Fri, 19 Nov 2021 10:24:55 +0100 Message-Id: <20211119092459.27376-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119092459.27376-1-ubely@ilbers.de> References: <20211119092459.27376-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: yVXkmlxHYPeg From: Adriaan Schmidt Code taken from OE. Allows to import OE modules without first setting python paths manually. 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 72d4cc0b..13134fff 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 8bbc4165..2af15f93 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 3060755a..2337693d 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.20.1