From patchwork Tue Oct 12 04:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 924 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 12 Oct 2021 15:04:27 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f55.google.com (mail-wr1-f55.google.com [209.85.221.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 19CD4OWB003858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Oct 2021 15:04:24 +0200 Received: by mail-wr1-f55.google.com with SMTP id d13-20020adfa34d000000b00160aa1cc5f1sf15684152wrb.14 for ; Tue, 12 Oct 2021 06:04:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634043859; cv=pass; d=google.com; s=arc-20160816; b=HozZxI6WOOpNEBaLKZB4P4u9+Z3+yaWDz7JmfenF/6blcy1L6EPL0Nob0BKqdv588g kPgVeLmEa61GMVPRxPKMYLdu8/ufZNSvLpayBSpjbdJbeN54TEM/Ebf90/0mpd+VN/pJ uvcUpQkdHhbOykVFF9F2h2JdyxcioBBrK+UQrmgL8AtFHV7DCP9YqVuDoIb9rI98oqA7 GCOUOaffy4SWMzLxB+2FqO1IkWgg3yROGwXN+atBvgAyAtuuIst+ya83ktFN2iJpeqdK O79BhfN5QKVyD1WVrby+d4aX9x2zW4l/oU9ALP+3UzC6he+HbN6eKpQ2lfwZcfjtRP+4 qjSg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=MgsSFcaD6qKFuMEsczB3gRzg50CuZpPKbITRqEU5Seo=; b=ybZn1FKu/kuW2Fnw4w42HafCUTbnwnsaWd7UYYXeOeLwe++RtEs3gjrMJCqoc4VnAq egbeLEpCQD0avMR4TMsNjssyU/Plrd6Bp1cHuYIF1tOyknZxJl0fjg2nimmeS/UCGhLA bmnhQ7UnHH5iRtYFdmbnIUOFwP4wLooh4UXeMKVEfLLHiXVtjKdaWkOBo7fp6kotWLhN cAzfyYAHi28mbd/EUa+z8dtPAUpy/TUbRlfgLkw2eAVqQ489rWs4d8lrzjZhTMMc9p4/ eB25SFf6ymHIB0/M23BjBLZP0xQggCloGL8qmMEAZaNZSXdyqtmAUKY42Tuh+V3VkjQP Dr7A== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=MgsSFcaD6qKFuMEsczB3gRzg50CuZpPKbITRqEU5Seo=; b=ajiAkD3tmAVIWfmshbLR48MNT2O4Y2dIa23TRtMaqnnAzaJb8jWNuAPbXUecwTScxE d1nuUgpJ7J6eL7/fSn64wq+ASyi1bCJflFkKem/0LztUYmQzDY8DYNzyA2lwIWwBUhaf O0VMhLmrGniq8YKHyoBme209+WZoUl1xAEOE3585ftCh+6nhiw1C315hV8sxZH7HhARw NmtXDqoA66XYqJWoxAGTj8L6d/11jALg5MTrMhL6F+6wLIYvQOoK5RAljqbFQjqKmWk1 xLDmX7r4nlQKrTCYlXkz5vATjbAZQqZffN3oTxXHSoj4O8b9+imiA1TDDeiWWg30jAh8 FosA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=MgsSFcaD6qKFuMEsczB3gRzg50CuZpPKbITRqEU5Seo=; b=ZjnOqP9UJ8/T5UXlvljzit6fhj5SL4GXqnIgXobuJ0TZ0ZLI/Dj4QanxNjte9BvZx6 q9Vgn57SosuOalEHxfdHJeKEDj0kE9yadKf0ZDKuNenrdvX+PspGkVhPLLqRdfic/k2D ySWUevs34GM6lhsMR7p71BI6WNFjGDXd2TgZ2OSfbBthHhVcBp59HpD5Ly80kCHFbywr fYqjXxGfz44NUUsOSCRSrW2aOe0cUnWyvdl9WN0jfppKlmlhl32ITZcQVcpkAZgCgwqn IlJqyM2uJKlGha8vaRXG8+h7Je4BpnE48XBazV8A43NHVNZIcnFKG8LhDSgeH6eSOj2I fQdg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530QGZ7l4iMgY0Xk7ibMbS8St2zZ862pdiEFQRlW+o71JOfkUkaZ /qI8Ruy4/dH/dNV0lDj7Fiw= X-Google-Smtp-Source: ABdhPJygwCBkRfL3dXLfSly1hRG+JKdZUMxAwBl21D+X796vMbqS7DaNvlxdIV5wQqJoXylcXrGSnQ== X-Received: by 2002:a05:600c:35d4:: with SMTP id r20mr4751930wmq.76.1634043859406; Tue, 12 Oct 2021 06:04:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6745:: with SMTP id l5ls2042091wrw.2.gmail; Tue, 12 Oct 2021 06:04:18 -0700 (PDT) X-Received: by 2002:adf:f309:: with SMTP id i9mr31603369wro.256.1634043858457; Tue, 12 Oct 2021 06:04:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634043858; cv=none; d=google.com; s=arc-20160816; b=I22dNbJ3fDPPq1WlUzDN1q7bdOvB8/sQWKDGzQLeE5uHmmfHSi44+ZExiy2RM/GV2r Ya8Noha0eNSnE+14vExeXS2hgnJe5KQKfztu8nKf4mIMdkI5KUT71uY8sZ246Xvfpx1B JKWH3Q4mDNwnUYjGjEpvGlaj7iLZCEVEvMGX9ZP5AVQ0YHdEQc3fKjGJLsc2KSReoo2j 7caIhe76xt6wZZLIbZ5N/G1/2fd+gG2K3NCRHyQgWqt0sG5P+AwxRkVzxXGWkLAw1uKC 00WJhJ7Lfa6bxQYu8tebaRa22qg9+Eh6U87hh8KraanRPapnWFbteJV6+/wQqGH6k5Cq ukZg== 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=nLqoxn5PwCqcvZyJRrPsQygTGCZMFG6r/icSYrWdxcTVCMHh+qCP2FdkGA2VdYRtlE qhw4MiEiFdXLzjpplvrbGoXdBDYBY5FBnNrkhRNsTodTc6ooNUILk8K3sQLBgvqAGZMJ PQP0X3xoAtrqp4645ye1Zy69atH+JpE+KVvlyyygWYpBxOF7FwVJxI8zsiKZ/JnxE76G ukNXq32PF2Qhws6OEJ+P6sI9wzvgR6RVTWc8cYSuJLJVmBY6Ga5ykZfEvLF8pu+y5M+U GmdcIDhV0BGfMcvHbwFRvkbRxVbyWrHfxd9Ohwn6fJ6AQN9lvQaFFhiJdz8HhaZ5zLf5 tQ9g== 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 Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b72si149190wmd.1.2021.10.12.06.04.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Oct 2021 06:04:18 -0700 (PDT) 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; 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 19CD4Hw6002039 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 12 Oct 2021 15:04:18 +0200 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 19CD4HmJ009739; Tue, 12 Oct 2021 15:04:17 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [RFC PATCH 1/5] oe imports in central location Date: Tue, 12 Oct 2021 15:04:09 +0200 Message-Id: <20211012130413.1719424-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012130413.1719424-1-adriaan.schmidt@siemens.com> References: <20211012130413.1719424-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX 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 = {