From patchwork Sun Sep 22 15:43:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 49439 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9BA1CF9C6C for ; Sun, 22 Sep 2024 15:58:36 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.17397.1727020708539703122 for ; Sun, 22 Sep 2024 08:58:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=adCLRcrU; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: adrian.freihofer@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42e82f7f36aso9330905e9.0 for ; Sun, 22 Sep 2024 08:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727020707; x=1727625507; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BZiyxK/AyT5J3chrJALy6KYuEvDgwg7c4JvbAmKYDsI=; b=adCLRcrUZygAGCNRl7PFi6gQbkaWFtmIvNqUWyc4vRQxO+02OJe5FYbckY5Ba3HSLm lF10odA1UvNfPhCrmG6cIHZO4efyo42qHvVoQ7DM2b1v7uaYUtH2E1aDwS4suQcM8bPm dTQ5ZhYnG+g5laRdDb3mCDtuuMPp4A/PSt/BjWPQfe9o6uMDRc33oyLHrUGNEOZNEbf2 5aNtVGagkgIKAf6n6Owt0rC1MUSePnxVEGeSwxJtUhJ8qHPHNuEHqXHFY7HbfAuKW3m7 mW3FCavaS4BNp5vY7isQqqGn12S4fCB2R8JNJK6Dtz6j7JilUUxypwVfpCYSvZ2vHPFh zlRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727020707; x=1727625507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BZiyxK/AyT5J3chrJALy6KYuEvDgwg7c4JvbAmKYDsI=; b=tGhNIYHO+9U6ncWeD46/vlaFBy5vbXaVtA1g4quxr4dBPF3gRkkUBC5l4LCMy/p3mX snZAgl7a6+Hd4jC4WuDXPVM6cV9S3GeI/yWHdZj889dOAijVw5QVZAUKb+PrLJxjP2+g AVT5caRYTF3Ce9YGDqvX+hEQvCfBaY18qALiBfDUdbD73G3hnEfO8MMffTWl7Pj6TCZd swlav6UYvCfUGxs1No4jv0pesleAQ4ftabCe+ZpQEKG9J+gJ2o/BhYDdX3UmCL6eOAJt /PEGPyZygkDmdi5sI+klFEgE6DedVKdOHR2Ou1bwtsp+rRz0r22MfXQPut4vq+/iqdpz CKDA== X-Gm-Message-State: AOJu0YywyfKUE5mTzjlU0y+AthR9+QLgRaWBCYrxgVjS1ONykirIURdp urrD7TLYwR2eT3pQgUvG5WM7QtKfu8PE9AU1YLiAyMfO1rHiVVZAgR9L5Q== X-Google-Smtp-Source: AGHT+IFGNcPmboDzkkY1Kfzafceoo+RQRnqhzsMTZyHSGCTUNfI7Wuou9FoaDJEaErYuU8kv4la6tQ== X-Received: by 2002:a05:600c:5493:b0:42c:c37b:4d53 with SMTP id 5b1f17b1804b1-42e7ab42a88mr60961495e9.0.1727020706445; Sun, 22 Sep 2024 08:58:26 -0700 (PDT) Received: from wsadrian16.fritz.box ([2a02:169:59a6:0:55c4:f628:91f3:4287]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e7540e429sm104126405e9.3.2024.09.22.08.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 08:58:26 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH 1/3] devtool: drop S = WORKDIR workaround Date: Sun, 22 Sep 2024 17:43:14 +0200 Message-ID: <20240922155810.1139539-2-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240922155810.1139539-1-adrian.freihofer@siemens.com> References: <20240922155810.1139539-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 22 Sep 2024 15:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204790 Dropping support for S = WORKDIR allows to drop this ugly workaround. With S = WORKDIR it was possible to refer to a file via oe-local-files symlink or via direct file path. Ensuring the pseudo database is consistent for both paths was extra complicated and required this bad function. Really nice to drop it now! Signed-off-by: Adrian Freihofer --- meta/lib/oeqa/selftest/cases/devtool.py | 5 ---- scripts/lib/devtool/ide_sdk.py | 38 ------------------------- 2 files changed, 43 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 7d617739809..1739c84853b 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -2585,11 +2585,6 @@ class DevtoolIdeSdkTests(DevtoolBase): i_and_d_script_path = os.path.join( self._workspace_scripts_dir(recipe_name), i_and_d_script) self.assertExists(i_and_d_script_path) - del_script = "delete_package_dirs_" + recipe_id - del_script_path = os.path.join( - self._workspace_scripts_dir(recipe_name), del_script) - self.assertExists(del_script_path) - runCmd(del_script_path, cwd=tempdir) def _devtool_ide_sdk_qemu(self, tempdir, qemu, recipe_name, example_exe): """Verify deployment and execution in Qemu system work for one recipe. diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 65873b088d5..350a8b02ca2 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -712,42 +712,6 @@ class RecipeModified: binaries.append(abs_name[d_len:]) return sorted(binaries) - def gen_delete_package_dirs(self): - """delete folders of package tasks - - This is a workaround for and issue with recipes having their sources - downloaded as file:// - This likely breaks pseudo like: - path mismatch [3 links]: ino 79147802 db - .../build/tmp/.../cmake-example/1.0/package/usr/src/debug/ - cmake-example/1.0-r0/oe-local-files/cpp-example-lib.cpp - .../build/workspace/sources/cmake-example/oe-local-files/cpp-example-lib.cpp - Since the files are anyway outdated lets deleted them (also from pseudo's db) to workaround this issue. - """ - cmd_lines = ['#!/bin/sh'] - - # Set up the appropriate environment - newenv = dict(os.environ) - for varvalue in self.fakerootenv.split(): - if '=' in varvalue: - splitval = varvalue.split('=', 1) - newenv[splitval[0]] = splitval[1] - - # Replicate the environment variables from bitbake - for var, val in newenv.items(): - if not RecipeModified.is_valid_shell_variable(var): - continue - cmd_lines.append('%s="%s"' % (var, val)) - cmd_lines.append('export %s' % var) - - # Delete the folders - pkg_dirs = ' '.join([os.path.join(self.workdir, d) for d in [ - "package", "packages-split", "pkgdata", "sstate-install-package", "debugsources.list", "*.spec"]]) - cmd = "%s rm -rf %s" % (self.fakerootcmd, pkg_dirs) - cmd_lines.append('%s || { "%s failed"; exit 1; }' % (cmd, cmd)) - - return self.write_script(cmd_lines, 'delete_package_dirs') - def gen_deploy_target_script(self, args): """Generate a script which does what devtool deploy-target does @@ -785,8 +749,6 @@ class RecipeModified: """Generate a script which does install and deploy""" cmd_lines = ['#!/bin/bash'] - cmd_lines.append(self.gen_delete_package_dirs()) - # . oe-init-build-env $BUILDDIR # Note: Sourcing scripts with arguments requires bash cmd_lines.append('cd "%s" || { echo "cd %s failed"; exit 1; }' % ( From patchwork Sun Sep 22 15:43:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 49440 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C50C9CF9C6E for ; Sun, 22 Sep 2024 15:58:36 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.17399.1727020709981168025 for ; Sun, 22 Sep 2024 08:58:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JwJHLBVA; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: adrian.freihofer@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42cb1758e41so27732735e9.1 for ; Sun, 22 Sep 2024 08:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727020708; x=1727625508; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sNaJtlpXb+aVtjgNhuyvvuUQzCVhXkLOnRPGLKFknu8=; b=JwJHLBVA8TN6hdogXg2xOz62MEbZi58segxgqar2DsEoLqqFAxRinYhJmvIn016Sct JtjcyaTVQHbprAjjQEF+HKUgcM/4Nj/s+GCnZlLHLA4tz9Q0odJxofgSiXo1q4Ren20C fwRolRtR4uOnb5vDFnEz4jpE7zneEdP4PPRvvGf4X/0QffF+ct1fHBlBuluePi2blbgG j7uojwruGaF594/nCFN0xioz38qImlgp3w5U+nSs9CMj5De/BDXvZdY6VIkEhc9lMbUB UGSVLTg/aXtvxgdNLa9fnllbHyNR2w0SxTTk/4EDYapjEpMfyHg1FZe+Aoh0lg78sGDz wOeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727020708; x=1727625508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sNaJtlpXb+aVtjgNhuyvvuUQzCVhXkLOnRPGLKFknu8=; b=oc1mi9slzfsDQHq6kdSEvut6SCSzdJdnAd0+nk6JtS4L3skX2jH7j00Ml+7eM/BjLq WGqPI/VVk/ft7/QVD9TamBynfU/Bo1Vp7uEcoNtH0XB70CtjoxtvUW4wUDg5B/VXDrLl 7wwt0FTOizpHUVjonTm0rOIuPwM4RHnHIabMZzUmVniiDdbJQ9gZjNWZFfuOdpVTn38m WDzDIDD5ohgQ1Mvkgcfc4drIYFj9TPtTzjmn1+WZRGtFIbmU6QazNm3qUSz13CO0NanH Hy6NcH1uQXFFO5YjyNWfr8fOH8+x5DzrB/JHNRcqM4LL1rY03utnoK8cXv1Uqp+9xN+Y I/OA== X-Gm-Message-State: AOJu0YyF6Lpj8ACKM0BE/Atg83QBOJ+2YwZ9ghyJTNbJ+u4giEUGwCnQ Do3LBurmK3lZtWeGOPqnkU7qTu76VeF83A1K0kVzln3vASEe5C+rsq/6LA== X-Google-Smtp-Source: AGHT+IGtTZq18QiZi+kxAaVoP42aI4+e6Lazf40V5siElen0/fmnUFiUi6gZlUoDR9vg5eqGTE3Sjw== X-Received: by 2002:adf:ef89:0:b0:374:babf:ac4d with SMTP id ffacd0b85a97d-37a42392ec2mr3868603f8f.58.1727020707809; Sun, 22 Sep 2024 08:58:27 -0700 (PDT) Received: from wsadrian16.fritz.box ([2a02:169:59a6:0:55c4:f628:91f3:4287]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e7540e429sm104126405e9.3.2024.09.22.08.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 08:58:27 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH 2/3] devtool: menuconfig remove useless code Date: Sun, 22 Sep 2024 17:43:15 +0200 Message-ID: <20240922155810.1139539-3-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240922155810.1139539-1-adrian.freihofer@siemens.com> References: <20240922155810.1139539-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 22 Sep 2024 15:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204791 When I tried to understand whether oe-local-files is actually still needed here, I found some useless lines that can be dropped. Signed-off-by: Adrian Freihofer --- scripts/lib/devtool/menuconfig.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/lib/devtool/menuconfig.py b/scripts/lib/devtool/menuconfig.py index 18daef30c3b..1054960551b 100644 --- a/scripts/lib/devtool/menuconfig.py +++ b/scripts/lib/devtool/menuconfig.py @@ -23,9 +23,6 @@ import os import bb import logging -import argparse -import re -import glob from devtool import setup_tinfoil, parse_recipe, DevtoolError, standard, exec_build_env_command from devtool import check_workspace_recipe logger = logging.getLogger('devtool') @@ -34,7 +31,6 @@ def menuconfig(args, config, basepath, workspace): """Entry point for the devtool 'menuconfig' subcommand""" rd = "" - kconfigpath = "" pn_src = "" localfilesdir = "" workspace_dir = "" @@ -51,7 +47,6 @@ def menuconfig(args, config, basepath, workspace): raise DevtoolError("This recipe does not support menuconfig option") workspace_dir = os.path.join(config.workspace_path,'sources') - kconfigpath = rd.getVar('B') pn_src = os.path.join(workspace_dir,pn) # add check to see if oe_local_files exists or not @@ -70,7 +65,7 @@ def menuconfig(args, config, basepath, workspace): logger.info('Launching menuconfig') exec_build_env_command(config.init_path, basepath, 'bitbake -c menuconfig %s' % pn, watch=True) fragment = os.path.join(localfilesdir, 'devtool-fragment.cfg') - res = standard._create_kconfig_diff(pn_src,rd,fragment) + standard._create_kconfig_diff(pn_src,rd,fragment) return 0 From patchwork Sun Sep 22 15:43:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 49438 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7C19CF9C64 for ; Sun, 22 Sep 2024 15:58:36 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.17400.1727020710349103238 for ; Sun, 22 Sep 2024 08:58:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GaIt7MwJ; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: adrian.freihofer@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42cb7a2e4d6so31599295e9.0 for ; Sun, 22 Sep 2024 08:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727020708; x=1727625508; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rBMyV1tUjrGgtLiH349aXw5SZDOl/Cavs1KXCW11h9g=; b=GaIt7MwJNHJ7LCdvzmNZsTFkxikZFghnCa/5qt2OB7m/kO8uc6w1edjunf6Gv3fd2M cKfE1tgmytA5ctlbeCfGOLfjeqcho/D01alkTfJPSaRSbuJtwXySyx5UeC/2bFzFOZZ3 /f5H8h9+vXW2mw3bDzlp483/DEA4zz4h7JaqY4feV+Pf/guErV3HoiXXHJgF/ucsoWr8 wGfpxElWvjOz0a4D+zPcKti3ZN7LbxgpZFjxaj+fp0dTXJ84eXjOhr4oTegF8rCcDCvu d8MNUohS7aOqB5Rvfq7Ie2T2Yd3jOmYo+XQezWoUWoryJM68uH84mHEChfJ+rXlUYsyd i/ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727020708; x=1727625508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rBMyV1tUjrGgtLiH349aXw5SZDOl/Cavs1KXCW11h9g=; b=YUwoMMOU9PzgRW/a7OKpKEgR2uoWSf0B6Xace65ovAXDDDG5FwZRhAVy2ldDXUVMTg 6nvKiIAZDQUdE9Jkwwor3nmK3GnNe0FsV1QPZb2EboYr4MJNeHYI/oPJ4v9vQvBMY90B 2iPVQXBc+cmEurCROPQfh7BD4eKAqUXSaeGnzy2I7K4YOSLClZaD8F58W6roXr/3xCKA ktqHl7OytI7GRIF2WlMifZi7knCqBGgK1Eh2XfkyNuGnkdnm6welqsiFN7VYxcgsFTIp 2rujW6Z1X3bZ+hMifx5bzNHlZViIqlJuJM8NWhz2x75qsEIECnvm10tpr33MD4iS59aU pmaQ== X-Gm-Message-State: AOJu0YxWoxOX/8tGb8BxRm8qqznED1vFQrgmg7jTq5HNLnne87Q/mqpq oxKsclhGNqCz40O0dt6jjwIU2kF8cjl7SI6ZT9KGA83ppHKBFpGtomhR4A== X-Google-Smtp-Source: AGHT+IFd/CeUuimRiZ3ylWZyDSmGJnx/clYezErSzxq+uL9gpLssZ7yoW/XiFiJv9lLaX/CVlQyjuQ== X-Received: by 2002:a05:600c:3553:b0:42c:bae0:f059 with SMTP id 5b1f17b1804b1-42e7abe1274mr56013705e9.5.1727020708413; Sun, 22 Sep 2024 08:58:28 -0700 (PDT) Received: from wsadrian16.fritz.box ([2a02:169:59a6:0:55c4:f628:91f3:4287]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e7540e429sm104126405e9.3.2024.09.22.08.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 08:58:28 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH 3/3] devtool: drop useless variables Date: Sun, 22 Sep 2024 17:43:16 +0200 Message-ID: <20240922155810.1139539-4-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240922155810.1139539-1-adrian.freihofer@siemens.com> References: <20240922155810.1139539-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 22 Sep 2024 15:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204792 Drop some unused code. The actual intention was to look for remnants of S = WORKDIR, which required the extra complicated oe-local-files directory. The remaining code dealing with oe-local-files still seems to be useful. Signed-off-by: Adrian Freihofer --- scripts/lib/devtool/standard.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index b2e1a6ca3a5..f2440ae804f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -18,7 +18,6 @@ import argparse_oe import scriptutils import errno import glob -import filecmp from collections import OrderedDict from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, update_unlockedsigs, check_prerelease_version, check_git_repo_dirty, check_git_repo_op, DevtoolError from devtool import parse_recipe @@ -814,10 +813,8 @@ def modify(args, config, basepath, workspace): staging_kbranch = get_staging_kbranch(srcdir) if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): oe.path.copyhardlinktree(srcdir, srctree) - workdir = rd.getVar('WORKDIR') unpackdir = rd.getVar('UNPACKDIR') srcsubdir = rd.getVar('S') - localfilesdir = os.path.join(srctree, 'oe-local-files') # Add locally copied files to gitignore as we add back to the metadata directly local_files = oe.recipeutils.get_recipe_local_files(rd)