From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a05:600c:1914:: with SMTP id j20mr5351431wmq.122.1634042195366; Tue, 12 Oct 2021 05:36:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6745:: with SMTP id l5ls1924145wrw.2.gmail; Tue, 12 Oct 2021 05:36:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6w2/b1lCsclqHfBNq9kSLDRoN469KJiLjCvifsNDpTIy4UmATHmbdeJ1BKVs9mTQ1GS/6 X-Received: by 2002:adf:bb52:: with SMTP id x18mr31978019wrg.169.1634042194517; Tue, 12 Oct 2021 05:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634042194; cv=none; d=google.com; s=arc-20160816; b=oNLypjumsbYNSxeODadqK5RsQRGwVym5pBIrdXCiXSkqyuynjCo4VcYDAmeNrxPkow +bnkob/GzWJN10oFXrTLvc+PlD5iCQK4kHcZ+Y0c7Cu3TsbyGUrfyGMIcKdW7YCRBnb2 mkEFbohYzCzJPq8nfTaeBBHE3jFWtUWeKtuyRfheGkJf0Azt0/p+eLWoxCkWr1/J5UYj j/vx+gBJfwuxih5eUorwXvnQb6hAxlHFflr4MqSwnS6pAtn3//ocJ4HhoGNzZXcctdW2 4m79ZWtmUiFq/aNID4uuqrlAxHGUEYA8Ni+0ppP89XfacP3nKh4l4M8SHuqcNOiO6G5S ZbXQ== 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=oieZsyM0YLczgS37KzYSbkRaBfkUSP3gRtY/1YZdhew=; b=aeMGNKVdbwlMRvgYyjQiUyyL07LG13i+Ty+5CBAier/3JjaP1qLTkBhA0C0eNbmvbq TjC/a6k8EMgJ1xB49oYCJ+iwfQ13QqrcXdi/4LOxGyfWFWhnSoHRC59mlVyJjozZ0Eaf wbjHp3X3zS9zjLUJTHZgTx+/Whn+8IKSM8rbyGL1nJzJZtYnmGONpt1C0zejEh2wcJRo KfnBpL9VM05dHMh/XTlBBL0kj67M0SprahpzW8YNKa5O625N/QNygQKjnq7yJlNk43o3 /Zz3rU6QzHvEk1BvLdQ5CCHCvxduvT/H6VTbT/NQMjKwdDTL/6L089A4ixPwhF4bl+BC wXoQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id a11si493862wrh.5.2021.10.12.05.36.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Oct 2021 05:36:34 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 19CCaXp4027078 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 12 Oct 2021 14:36:34 +0200 Received: from random.ppmd.siemens.net (random.ppmd.siemens.net [139.25.68.25]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 19CCaXOd017377; Tue, 12 Oct 2021 14:36:33 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 01/10] oe imports in central location Date: Tue, 12 Oct 2021 14:36:16 +0200 Message-Id: <20211012123625.1703627-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012123625.1703627-1-adriaan.schmidt@siemens.com> References: <20211012123625.1703627-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: WhJLANxfmhcw 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 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