From patchwork Wed Jan 29 18:14:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 56252 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 37AE1C0218F for ; Wed, 29 Jan 2025 18:15:28 +0000 (UTC) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.42]) by mx.groups.io with SMTP id smtpd.web11.19504.1738174525905298795 for ; Wed, 29 Jan 2025 10:15:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=Uky51S5M; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.244.42, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VMnpO9tMPd5JpOLl93ioXJTnjuMyhx8kqXUzbgS4NKvXQ6jz8Wsl1Xly7iwYle3lpxWBBvp9SN3FhiI9Wjj4Ge9xRFZxmzF+28GGPaHTyQMN0adAA19RYuL9wDRONs3gsU4G6YSEzbo0qmRxE/eng3xO4ZBL1c76oRjEzIYfM2okcAqut5LgUDtUze9HzPGO9H4fUtW9gOKKuw7tyrJFu831j4bHcajOQpz8nT30D1itE/A/v0buonOviRpFMwT99/YOvu4gEG/v5ttvPqadOOaKZCUw+CwG6OAICholYrKS6MXrXRJ8N3iqJjXm0iz/ND0k5Uo30InvJ2DzniPlTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KFHp4J6LVREK+aImh08omPfFNhcOLGnhzhT3RUakteQ=; b=Qpg4QCfZzDP2bAqe4ZiH1sdwOAHZyI7Q9p3p4igfnltBJwf2nKDBW4qgbqlvX3Hjv+fmOQ4o66ItxtIdLkZEljJK5OlkuYItI3FYnQ+wcMZe+/ZW/juPUz6MXPJOYVJOtbZVUeUJ2FCghGP7E5IX/RqRHt5UwO/RGVq74p6RSomyW5L1LQ3AaxLURH2KfsX7KS/L6AXPo/GD1wi91UKmKpH+aMYVOoYFmX72goNGfEV9OllRzBnZ+yWhvp5FV4xhWY/sqQh2khNGeABA0Bk449hi4boBjd6S6xt/yjk1NWGOu8cw4MPmNdX0y+YgVOoWL/pz65a93+GpbUYUvx1IhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.37) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KFHp4J6LVREK+aImh08omPfFNhcOLGnhzhT3RUakteQ=; b=Uky51S5Mp3XcRNAF6QvhPZXbo7BO/hwQ2/E3x5bLWVH24WvhEBjtJMwqZzyASAZUM57p+TbCBL4tf09kwSn/LoqCFiHRflKwLuvKZmdWa1GYC7iDr75LD86enEMCXx3OdgVioAt9a0SbfE8p5Q2IVsdsRmiWNDv4xKV/WS15Ug9qvmrdPROzS2dZQ0o1eMx1bigQAekR7JAVBw9m689MLC6SfjqfWA2S8hEGFE0Q2d7dl36NXnaIWPPX0If2e2b3ddvFT7FQR7yuki4uGU15jahijhjS79XisyT9ShWpQ6AnTu9KZ0dVja6fyNr5IprFzyYGfREk4uUxiA1Buu3xLw== Received: from BN0PR04CA0068.namprd04.prod.outlook.com (2603:10b6:408:ea::13) by DS0PR12MB7656.namprd12.prod.outlook.com (2603:10b6:8:11f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.24; Wed, 29 Jan 2025 18:15:21 +0000 Received: from BN1PEPF00004688.namprd05.prod.outlook.com (2603:10b6:408:ea:cafe::93) by BN0PR04CA0068.outlook.office365.com (2603:10b6:408:ea::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.17 via Frontend Transport; Wed, 29 Jan 2025 18:15:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.37) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.37 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.37; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.37) by BN1PEPF00004688.mail.protection.outlook.com (10.167.243.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Wed, 29 Jan 2025 18:15:21 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 29 Jan 2025 11:14:39 -0700 From: To: CC: Chris Laplante Subject: [PATCH 1/5] devtool: standard: cleanup imports; stop relying on transitive bb imports Date: Wed, 29 Jan 2025 13:14:52 -0500 Message-ID: <20250129181456.1826467-1-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004688:EE_|DS0PR12MB7656:EE_ X-MS-Office365-Filtering-Correlation-Id: ebd7e2f3-5161-469e-506e-08dd4090e49e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: 81wnhrMlYGIu038JoEVAuvOVWkoMQIdUaeOYbEvgcg7/oApUUUqGBsB+JonOhd9k+AWHeufGXb/EIqUXfSOtiJ5cRxQAbyte19fA/O5LdMoEe5ehxkPJMH5vZdqN7f4Moh3Vrmgt5aoAO8n3a4kdNjOvQbl2pEJpbiGa2lqVdFaDmq8CseCVbGk/lmW4/hXeV6iMLDnFCVWmwFa2SrwDcq44VIT5fMgj021AeFZlJRuM460sZXVhhx2X65RaScLQ6wImIqkOWO1HZW4O4g00gyNq6/3XVafZYQhVzyrqBFM8N44ilA6TbRtzDY+5nLrhuRpOiXPIKGXQ5pee4b2yqTlT+iaYAq1s5iZFeESixGQabPqo65Aeb2IPVSGmMX4xzxWP1DryGF/j+d5mfmPX2b87CvGqCfGToIahggsPw7eMmtnDbIx6nHt78EllmU+PA8It4OTgTqBQcAyCl7Kn0Hl/FcPYtCr1MVYZ8gS1iWvr7G2rxYKtHKeAJbwG/wE8G0acXKq/ZnoUPRFrytlalvdvWdK+z7abef9EBWNl6fsXmlS6sgw1gBSHVSomgVnfGzSxcoxyrUJrlZWUXa8TpQ5tUlGifYp1aqQo6E5BwgQftqp1/gtWgqEojgPVgXJiFNbHT7uj5QDj68DnEYuY2Qea1QDGcaxa1E/xWFk8QVkYCgGhIdlSO/ycnRu23gDoAwLl1/hWx7ju0Hu109LNrz/lFono7dRfG9J3JLSaHYUpkv2Lp9J8jlQ/65XhAelHjabPRem4XMaPPoq1lzSSW1jvyfYnVVIW9u3Kv8GLJyQR3kC7G0MZAENFTra4bCAveNEs370HKGguOcC78TQGeMWhsjUKaun9/DhvC4SvQ2zGmW4CvPHg69b99LEPAYUYdR7HTj6hSHcO8jLRxdIb/h7d0zO6/X4H//k3n07G6Ef/RyhH/WQOTYskOSnB7t7AFHCDEt4ctDFm4rAdxZtEbHyMtLX9SBIAklzjB7YN1w27pR3G2tHimLkvlKoraF/aBhx6gIEQJm8dmQOr/ks3rvdnGmUAEURgPMdXxX2ptqrq2jUuE/JXFpKpzI2RF2hh3oopDGQ5xHdZphHIHFnMpo/HA/Beog64j5n0DzO4Qdtxyp5uCtc3vObwQoS9GuuywnLwE7JdZmzUSwIYFHgJ2faomvB/i07ec0HP1CyCKSxrWGpaFaQT7Q7eFkuL+/sbQZakeFEdHiJqdAbEaV8F7EIz+tQzCYvnEyWIrxvoD26YQ0dlGlm0u3MpQ3z2xEgPU4kOCPshk4M84+H3bfZlF66O3htbcfQv6za7B+56zUzRsZmZDwQToE2vyGHX9w0bfVjvXEQCSWlQ2fgFH4b/jn8y2foPz9yuJBoEqweNO3L36ahe2YZxFo2MPHN2q/BQ9R0y/zU26u/HiBNJZYaUcKiNDHRG722NmMqpiK0/686Pq9yM5AhWI7RpFFfkqdNyXAQv2Jziv9dhIcc8uO7HIA477zCQzA2PVe+iNlZdiQw= X-Forefront-Antispam-Report: CIP:192.25.218.37;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg1.windmz.agilent.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 18:15:21.0277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ebd7e2f3-5161-469e-506e-08dd4090e49e X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.37];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BN1PEPF00004688.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7656 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 ; Wed, 29 Jan 2025 18:15:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210404 From: Chris Laplante Signed-off-by: Chris Laplante --- scripts/lib/devtool/standard.py | 41 ++++++++++++++++++--------------- scripts/lib/devtool/upgrade.py | 1 + 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index fa846ce61a..305536f6f0 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -19,9 +19,12 @@ import scriptutils import errno import glob 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 +import bb.utils + logger = logging.getLogger('devtool') override_branch_prefix = 'devtool-override-' @@ -29,7 +32,8 @@ override_branch_prefix = 'devtool-override-' def add(args, config, basepath, workspace): """Entry point for the devtool 'add' subcommand""" - import bb + import bb.data + import bb.process import oe.recipeutils if not args.recipename and not args.srctree and not args.fetch and not args.fetchuri: @@ -304,6 +308,7 @@ def add(args, config, basepath, workspace): def _check_compatible_recipe(pn, d): """Check if the recipe is supported by devtool""" + import bb.data if pn == 'perf': raise DevtoolError("The perf recipe does not actually check out " "source and thus cannot be supported by this tool", @@ -373,7 +378,7 @@ def _copy_file(src, dst, dry_run_outdir=None, base_outdir=None): def _git_ls_tree(repodir, treeish='HEAD', recursive=False): """List contents of a git treeish""" - import bb + import bb.process cmd = ['git', 'ls-tree', '-z', treeish] if recursive: cmd.append('-r') @@ -388,7 +393,7 @@ def _git_ls_tree(repodir, treeish='HEAD', recursive=False): def _git_modified(repodir): """List the difference between HEAD and the index""" - import bb + import bb.process cmd = ['git', 'status', '--porcelain'] out, _ = bb.process.run(cmd, cwd=repodir) ret = [] @@ -426,8 +431,6 @@ def _ls_tree(directory): def extract(args, config, basepath, workspace): """Entry point for the devtool 'extract' subcommand""" - import bb - tinfoil = setup_tinfoil(basepath=basepath, tracking=True) if not tinfoil: # Error already shown @@ -450,8 +453,6 @@ def extract(args, config, basepath, workspace): def sync(args, config, basepath, workspace): """Entry point for the devtool 'sync' subcommand""" - import bb - tinfoil = setup_tinfoil(basepath=basepath, tracking=True) if not tinfoil: # Error already shown @@ -474,9 +475,9 @@ def sync(args, config, basepath, workspace): def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, workspace, fixed_setup, d, tinfoil, no_overrides=False): """Extract sources of a recipe""" - import oe.recipeutils - import oe.patch import oe.path + import bb.data + import bb.process pn = d.getVar('PN') @@ -677,8 +678,6 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works def _add_md5(config, recipename, filename): """Record checksum of a file (or recursively for a directory) to the md5-file of the workspace""" - import bb.utils - def addfile(fn): md5 = bb.utils.md5_file(fn) with open(os.path.join(config.workspace_path, '.devtool_md5'), 'a+') as f: @@ -697,7 +696,6 @@ def _add_md5(config, recipename, filename): def _check_preserve(config, recipename): """Check if a file was manually changed and needs to be saved in 'attic' directory""" - import bb.utils origfile = os.path.join(config.workspace_path, '.devtool_md5') newfile = os.path.join(config.workspace_path, '.devtool_md5_new') preservepath = os.path.join(config.workspace_path, 'attic', recipename) @@ -739,6 +737,7 @@ def get_staging_kver(srcdir): return staging_kerVer def get_staging_kbranch(srcdir): + import bb.process staging_kbranch = "" if os.path.exists(srcdir) and os.listdir(srcdir): (branch, _) = bb.process.run('git branch | grep \\* | cut -d \' \' -f2', cwd=srcdir) @@ -757,7 +756,8 @@ def get_real_srctree(srctree, s, workdir): def modify(args, config, basepath, workspace): """Entry point for the devtool 'modify' subcommand""" - import bb + import bb.data + import bb.process import oe.recipeutils import oe.patch import oe.path @@ -1183,7 +1183,7 @@ def _get_patchset_revs(srctree, recipe_path, initial_rev=None, force_patch_refre """Get initial and update rev of a recipe. These are the start point of the whole patchset and start point for the patches to be re-generated/updated. """ - import bb + import bb.process # Get current branch stdout, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', @@ -1309,6 +1309,7 @@ def _export_patches(srctree, rd, start_revs, destdir, changed_revs=None): """ import oe.recipeutils from oe.patch import GitApplyTree + import bb.process updated = OrderedDict() added = OrderedDict() seqpatch_re = re.compile('^([0-9]{4}-)?(.+)') @@ -1378,6 +1379,7 @@ def _export_patches(srctree, rd, start_revs, destdir, changed_revs=None): def _create_kconfig_diff(srctree, rd, outfile): """Create a kconfig fragment""" + import bb.process # Only update config fragment if both config files exist orig_config = os.path.join(srctree, '.config.baseline') new_config = os.path.join(srctree, '.config.new') @@ -1415,6 +1417,8 @@ def _export_local_files(srctree, rd, destdir, srctreebase): - for removed dict, the absolute path to the existing file in recipe space """ import oe.recipeutils + import bb.data + import bb.process # Find out local files (SRC_URI files that exist in the "recipe space"). # Local files that reside in srctree are not included in patch generation. @@ -1506,7 +1510,7 @@ def _determine_files_dir(rd): def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wildcard_version, no_remove, no_report_remove, dry_run_outdir=None): """Implement the 'srcrev' mode of update-recipe""" - import bb + import bb.process import oe.recipeutils dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' @@ -1607,7 +1611,6 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wildcard_version, no_remove, no_report_remove, initial_rev, dry_run_outdir=None, force_patch_refresh=False): """Implement the 'patch' mode of update-recipe""" - import bb import oe.recipeutils recipefile = rd.getVar('FILE') @@ -1786,6 +1789,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil def _guess_recipe_update_mode(srctree, rdata): """Guess the recipe update mode to use""" + import bb.process src_uri = (rdata.getVar('SRC_URI') or '').split() git_uris = [uri for uri in src_uri if uri.startswith('git://')] if not git_uris: @@ -1807,6 +1811,8 @@ def _guess_recipe_update_mode(srctree, rdata): return 'patch' def _update_recipe(recipename, workspace, rd, mode, appendlayerdir, wildcard_version, no_remove, initial_rev, no_report_remove=False, dry_run_outdir=None, no_overrides=False, force_patch_refresh=False): + import bb.data + import bb.process srctree = workspace[recipename]['srctree'] if mode == 'auto': mode = _guess_recipe_update_mode(srctree, rd) @@ -1929,6 +1935,7 @@ def status(args, config, basepath, workspace): def _reset(recipes, no_clean, remove_work, config, basepath, workspace): """Reset one or more recipes""" + import bb.process import oe.path def clean_preferred_provider(pn, layerconf_path): @@ -2032,8 +2039,6 @@ def _reset(recipes, no_clean, remove_work, config, basepath, workspace): def reset(args, config, basepath, workspace): """Entry point for the devtool 'reset' subcommand""" - import bb - import shutil recipes = "" diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index eed3a49e4b..94b6c11a37 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -169,6 +169,7 @@ def _get_uri(rd): def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, keep_temp, tinfoil, rd): """Extract sources of a recipe with a new version""" + import oe.patch def __run(cmd): """Simple wrapper which calls _run with srctree as cwd""" From patchwork Wed Jan 29 18:14:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 56251 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 46D98C0218D for ; Wed, 29 Jan 2025 18:15:28 +0000 (UTC) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (NAM04-BN8-obe.outbound.protection.outlook.com [40.107.100.85]) by mx.groups.io with SMTP id smtpd.web10.19618.1738174526121121790 for ; Wed, 29 Jan 2025 10:15:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=YRAJPWfq; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.100.85, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hKDoq6WElbKHBBGBwxee1ft3DcyLhKYJ9gXdVZv2cp9bOhNo1ZxRl58gyZqiHhrF0Aq2T4a3FuLJypBuuEflS52VgEPxIQeqfP3qED3AC9n1AiHim3kf6uSaT261tmc7JYZstTzg0Iv+t0/xr8J2a/fmyuyFwAhJgRMbXZt+cMEdmRFMjvS6H5XwzZX5r6rbsmk1342zr7I56O+W2s2+WWk7el5pZzeCIt0XUAfzsc2aL3mURNUy4ltFd2X3XB2SOzZDBA/hRvEqKYg4ToVaNaYibcj3pc7xW+v6znAmdMP9kA7sSE8xMDcHMNqkZ2VzpZ4V1NzuuOJqFHputelfFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0kUVxHHuq27/f80AZL7g2Ae26nnrUoPuW8nnia8Ge2w=; b=rSctpUOIh4WXfUP+EzvDVPwZFyP1oBRbqnchPALg8CJZkwBtIQwR4tgvhTmZne+i740H/x980fdyEJOJd4wtihQmiERcns49xqadBU868AJkfKURVHftqH64Nv9fa2d/Y+Qgzjg08BeKPDnUPd6dhbCaMGASqbgtLtv29DU6k4+IIjiovQoz4hvgiw0IAjiKdhGUDitnm2SH5zp4egAh90M/o8C/p9n35n40sOhK/ggl+Nj69ZJ0BDCV9eXfCHHRIfmpMfFfnpBSK7a4W4cz0iUn4bQsMsrsDWIQcnEiLolapAyDq56Mf/csa8Nlirur07HJ2NQaO6EVbO4kqag8ew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.37) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0kUVxHHuq27/f80AZL7g2Ae26nnrUoPuW8nnia8Ge2w=; b=YRAJPWfq2McLEHzVYphFwRWTFxjDOllvaEuAyKeWLTKvyNNlhzX3BMygnBXeJCcSvABH7L3d9dN46YDTxSu4Q+OU6ejVQV3IMVxLyrqe51Rc6R9espeobMdI0ka2aUxOxgBBiF5vPCEMe4yLaEzuZhchrT1levEfgeGbCZwEad+j5o2AesP6vlDFVx5AEdsuTuW09Og99fPtZ1HCLSf8AIT7iSeBwAp7Gmrof7+BTlxop5f6qIMvKONv7DVBks/9XD5bGPjXkqOr22C3NabjTzypMLWXmxRM8YVp7FNLs72LSqrtI2NQktMyPe7D4mappCYlcM9AekW8HsTBc0UbEg== Received: from BN9PR03CA0117.namprd03.prod.outlook.com (2603:10b6:408:fd::32) by DS7PR12MB5861.namprd12.prod.outlook.com (2603:10b6:8:78::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.23; Wed, 29 Jan 2025 18:15:21 +0000 Received: from BN1PEPF00004689.namprd05.prod.outlook.com (2603:10b6:408:fd:cafe::de) by BN9PR03CA0117.outlook.office365.com (2603:10b6:408:fd::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8377.24 via Frontend Transport; Wed, 29 Jan 2025 18:15:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.37) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.37 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.37; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.37) by BN1PEPF00004689.mail.protection.outlook.com (10.167.243.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Wed, 29 Jan 2025 18:15:21 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 29 Jan 2025 11:14:40 -0700 From: To: CC: Chris Laplante Subject: [PATCH 2/5] devtool: standard: fix typo in variable Date: Wed, 29 Jan 2025 13:14:53 -0500 Message-ID: <20250129181456.1826467-2-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129181456.1826467-1-chris.laplante@agilent.com> References: <20250129181456.1826467-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004689:EE_|DS7PR12MB5861:EE_ X-MS-Office365-Filtering-Correlation-Id: f3a06606-3e46-435b-d330-08dd4090e49e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: cS46PB0bJGsMcI3nC4+b5Kij3uKNzNeFtwCCK/ViyhC8lB7fMzMAl3yBICU7vbPBOESKl9HXL+dR/b8YEtxMK4WerZeZ3Uue7WwB530+m8xeIuFOM8rqUiNdsrVrr6ohoZHJx1w9uyi6jpGvw2MW3x0vwKSLRVXZBgpUNDHnbuJO50PmAcXqeP+9ulNEeZ/C1c6ZH5432tMnFYeXOf3tU6Svqj1TI52iOikfZetmOGRrUnL1ZEeevHtHzwbsvm13GPFf/wmKmtCVZmpXMcqfOzKhRaKFgHhoHtVLfnKu3joooYr0s+VpXyp5DL0xKJkbLsq+3BeMxkKHKWrij4mHqVSJhYozzITycR1ttJglRYyYdrb9e1TaeQMupxmjWEIVdd+UDq2z3COhyaPO8wzsLABu/B62c028TuewRC9Ye2GXZzHdXoPW/UD3XaMzBpxFpLfGRAzrobXycttIqtyChtUCo8Yb+KVrhZ+vyLb68TWYzyb+qbQn0GxFOv1ufJ1QYMZcc8Ih22laaPj0hmK2JV+s/yemyEtTitRp13svQC8eZrW3ZjYoKsuGv2M0+WimO/+LSJQwhqyEVZPzVRhDNehG1Qy3pLsiGUzhmOGZSlhPX/R4KdpZgixKk7+mqqkt4LmaSBD8mN/0wxWEs7a8BOBNWsKNaUgVllz4da/w9PkeFM0HPuzwmqnPyebEkyZIM93EKdw9nmJNhrmjG4tA81o+uwDWCwLtWcNzIQM/mRzU1nPSfIbQxLOMfaWlIoY2q9fjkfZFFhJEn8eAxakvlM7M3DMIKMVAniCthV1MSWRCn1Nxl92+8JeGMVz0h90ocQUTx7YBZ0+b8tLD5K30yeczF0vPA2J03nEUQgXSunUeIJXu+La6DEit2LokZcc4Vy2+QenFn/1/9r2GhNc/nlPlQ0a86shDiBktjNauhI2mQIDnbYP3mj18bdZpYSdQgRvemzGifykmLdDOMCDkXx+h3iJtNac8tp/PO5yZN7WulxyjaMoXJ3GZuJHwKDdTdWDT8BbtwKicBa1Xxai1hepgLoB33e0o12mnVZ53MyBFlhOSlGI4qSUJs/IkC0bYw9pCMzUsdoe2tL8usbjYeCamwu2IuYXsplEz7OeYTvsgLVPv7wKVhG9XxowXrgY5CYFQkq7gJA5cUfGOX9M6m60bop991nayE2j1//9swfxQHxOQjmSsddY1pWw2toMcp3NUfaHJNQ4ttEgMMqxvvAneTi6thbPVlDi5M7XkZThBVfwzypCP5abDm0X2yAZvoqFtwtzJU1VHl/TJqeoP2mKehVpQhgYs2NxJKQ6CEsare91FoyETafYtSu7T+8IvGuzXoNT5PAPz6j4jF/Hpjs68CE6aUGMWVpZ2dP9XQIgFS6UL6lYh6JoBOZa0JZXIqwUlOjlAApehGzqhkUFe2ifheW9ILbNTqxHxMVBz8tlZT0LYT0G0u+t2k3WPnmkh0omjO7BKYgzIGGjUp0hL0ak0RDWJVwQDGhns1/nvCyI= X-Forefront-Antispam-Report: CIP:192.25.218.37;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg1.windmz.agilent.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 18:15:21.0310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3a06606-3e46-435b-d330-08dd4090e49e X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.37];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BN1PEPF00004689.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5861 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 ; Wed, 29 Jan 2025 18:15:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210405 From: Chris Laplante Signed-off-by: Chris Laplante --- scripts/lib/devtool/standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 305536f6f0..ca89c8e882 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1477,7 +1477,7 @@ def _export_local_files(srctree, rd, destdir, srctreebase): added[fragment_fn] = {} else: if fragment_fn in updated: - revoved[fragment_fn] = updated[fragment_fn] + removed[fragment_fn] = updated[fragment_fn] del updated[fragment_fn] # Special handling for cml1, ccmake, etc bbclasses that generated From patchwork Wed Jan 29 18:14:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 56255 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 4137DC02194 for ; Wed, 29 Jan 2025 18:15:38 +0000 (UTC) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (NAM02-BN1-obe.outbound.protection.outlook.com [40.107.212.42]) by mx.groups.io with SMTP id smtpd.web10.19623.1738174531612701841 for ; Wed, 29 Jan 2025 10:15:31 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=JCAwNyAM; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.212.42, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AvaTq9YtGrEaENS0JdA0r+Kh5kuyXb5NV+SvPo3Do896f3qxTL2sJzZ+oCS0KVnTzFRkZeWIufUQVodRu5/Kq1Kh2lhSwCzEu7iqpMCjO5iuCL9ZG376Y8p3D0P3o3bKKi0zqKVvI5PTOAbxMzO8uiRnXH8gYIXwlMfjQWZXxo/E3zY/8W9gXxYlYZOhaqPeyuurXsml1OFqgbeOGuqDk2LQiTBFnw6KxmMEyJnDZkU5KKASaU6SmYMeLoQTMw3IG00prG0vbA9SKFQqUdXvOsMVOYAt/3virerIqBGXYD/Hd7vWFiMzO7UYg/yyFTu71pJG3YIDaMUFt1wTRTo3iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N/yQkaPSubMUB74LxW83l6ZIjA0hEdWKYL/C4Nhxcoo=; b=Yvc8eynpkCNx7llZWTBJa4rqFTT7U/dE/7N9Osh2eLoP/XaVrmc0FViMpjMnzMRrBXSXS1/k3sZddQDt4nAdSdVFWJ3k9R0UUtJs6g1CLOfrLSqEt+f1jy2wdEBB7g8avvx+CXazTW679Be22C2E7kKiwEV29nBy1NDG9/LE98ZG/QZbvQPn4uY6u25BOybryRo1Y0JNyKgYV3V1/zy+7h59gbpLKao7lGP6MiPBjVn40kjfMz/UN8/rn7BhFDkfsMsZC6JoDFlb3FGqcLs83+5XhNinLnUbfBs5yqpCXN0PRETN1hIpt+WANNyftz7lEUa0LZlSZtsn771XrrEFqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.37) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N/yQkaPSubMUB74LxW83l6ZIjA0hEdWKYL/C4Nhxcoo=; b=JCAwNyAMQlUvJ0c/tcso34CKZIBmX+SaoTGPqsJJp/q41bLbcBb82Q9j3KgM5I/hrM8hDam/kqs42IQJyhvmWVXcKh91JUkKh9kSXgxGCSDAMNlj3c7QHKj8B0yTVcSnZiyaT/I8g5RHChA4shRPQvBc6utVmY4u5grvci/DBuQKV6025Si0g4qs6YJK1SGoCKQr6sK1YewfZ5y1wLIlU7sBG4zIUZ+4PKrinvPv0mE7BbYZWzF0nKP3YWdxgrxqK4L1s4l4chJ7LjfSd1yuu2+Agyj9QwGZnpAiwZkV4OyBUIUWsUWBY8OU86S/3RSufCZ3oAhY6hy+KIjxhwgw1A== Received: from BN9PR03CA0110.namprd03.prod.outlook.com (2603:10b6:408:fd::25) by SJ2PR12MB7800.namprd12.prod.outlook.com (2603:10b6:a03:4c1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.17; Wed, 29 Jan 2025 18:15:23 +0000 Received: from BN1PEPF00004689.namprd05.prod.outlook.com (2603:10b6:408:fd:cafe::90) by BN9PR03CA0110.outlook.office365.com (2603:10b6:408:fd::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8356.14 via Frontend Transport; Wed, 29 Jan 2025 18:15:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.37) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.37 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.37; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.37) by BN1PEPF00004689.mail.protection.outlook.com (10.167.243.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Wed, 29 Jan 2025 18:15:21 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 29 Jan 2025 11:14:40 -0700 From: To: CC: Chris Laplante Subject: [PATCH 3/5] devtool: standard: fix unbound variable usage Date: Wed, 29 Jan 2025 13:14:54 -0500 Message-ID: <20250129181456.1826467-3-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129181456.1826467-1-chris.laplante@agilent.com> References: <20250129181456.1826467-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004689:EE_|SJ2PR12MB7800:EE_ X-MS-Office365-Filtering-Correlation-Id: 25f277a2-690c-4c65-3010-08dd4090e51d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: QydcTl4i/WR/g73j9xWIkM0A5IVX3Z4n3V/gGxuGVDrgbu0GEWsCpONAlxmMZ2PnR4BdHrPxjxzFHcLowDUYm9w3YEdsXr1Oi7te3Q+0hKGQQggQFDA4Mxs5j/P2U0xk53nBW+3XVtzyjJKix02RiEfu6ah9Nr1aPljdOocJ62YKwkqEWjz1PBwjSgZRO/KUCNl24jyJtPmJ1MVGJ2+i37e+yGAqHn375VQu59UA3/oLWtN06Hf8zYjnqVnym6KcVgXxqIRbO31hu//WOcPkFq6lcu6wK/cbsyQWUZ2Jw5lB8I0r4fq4/BLUUyr4Lj1BHIxAelegg2nTxP5F9HGaUemYFXLb3poiXcYEfGKH8wtcRJdhYS8E3PNbvkVAmdctb6iZp4XaSS/Kek3CQytQoYUNnWTOd8wApi3DvuJaoqW+QmmTXukDUrL/hf6GbK7abatmjjZsWNJxZKFL4v9WSpzQdCAQ1lANKonbjfk8uSJun8W4Tua67mHX4qv3qNJo3Trki0s3HTNOcVBVYQfdoTObNl4dEMv4FIEgzfZ4f6OV67xmVDXTbGTlk1ibCk3ivPOwT+3N5bpyw/1uPdHhVl2oq0I59+SJH7wQSeZZ7Tx+y9TxPBg8JgvYwqMChmoGufmDkaqauenkj+3SGY/W6lV5X3CepoBuNX/wuk3+USDYfINvnMlrSGUv1zGImsAdLo2fbn83dtw9aTtYjvOMiWpcdTzWjgH0WLpMFo+C4FNR1G5oKg5W1/C2bJOjRLWiTn+P+Bhb+wXQlW00TtKHPkbqFAfsxD5w+oNhnQ3la030bNLYR7DbxfZoaif+7GYvfIcnGMA6jza0uo7HDHZ7aMFMHkKBpqqOL7l2pNqAXSyu9p7J32/3UEI7croXzRc2GiV53X1j4BctYfGROo48Ow0CuAsUU6LCp25vXfWY5Vx3eaO3YNWA6Mux1LxBc9rS2R+2vQG1fbVqWhRQhm5pVt9Mqe9pKB+E+nCjQG7LKWccFgFngipS9cT3lXwcnOAh5hpt6RqbONbMUAaqxPwto9GtLjj2nCTvhgutSP90hL4jJZ13+xK7mKKNwn69GiDPRq8+kOt0M8CPWYvXooH3LHqj0AiDDQsGuLbZlmC3r0UTdRqni4U6P4icCAiHPuLRNeTgLTV7MJ5FJCNjlYkVXKgeOPW7DKH/YR6V2j+He9goTangNGILTDAXmkVVv1o7BzAAuUVC4bGOMPF15sYzM7Gy1X6CXVM8s6cEF7PyqV87q2qeMwiFDk0j0kl7nkWrMIem4PlINv5usjJoYi9oaNaJ+jkcp1qosa4W170JV9xqRFHoNNsjNZ+0aUzsMqwPb5izU2B1GLzdqncMCMZjI+gIfy1OuRluQ6BcNk5dTfTafAQ3ctVsf6gnWB1iCrASf2VpTe1mMTCYLciYXBhtirZmVcwttJS9dji+Wjp+OjDC7HADuNzbTD0Lhp+k783DAa59z1650aEQlPOBJi9Yu27Ss01Nk452mlXy2M5AI+s= X-Forefront-Antispam-Report: CIP:192.25.218.37;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg1.windmz.agilent.com;CAT:NONE;SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 18:15:21.8592 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25f277a2-690c-4c65-3010-08dd4090e51d X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.37];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BN1PEPF00004689.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7800 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 ; Wed, 29 Jan 2025 18:15:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210408 From: Chris Laplante Signed-off-by: Chris Laplante --- scripts/lib/devtool/standard.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index ca89c8e882..20c94616b2 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -209,7 +209,7 @@ def add(args, config, basepath, workspace): for fn in os.listdir(tempdir): shutil.move(os.path.join(tempdir, fn), recipedir) else: - raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout)) + raise DevtoolError(f'Failed to create a recipe file for source {source}') attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile)) if os.path.exists(attic_recipe): logger.warning('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe) @@ -542,6 +542,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works tempbasedir = d.getVar('WORKDIR') bb.utils.mkdirhier(tempbasedir) tempdir = tempfile.mkdtemp(prefix='devtooltmp-', dir=tempbasedir) + appendbackup = None try: tinfoil.logger.setLevel(logging.WARNING) @@ -552,7 +553,6 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works appendbackup = os.path.join(tempdir, os.path.basename(appendfile) + '.bak') shutil.copyfile(appendfile, appendbackup) else: - appendbackup = None bb.utils.mkdirhier(os.path.dirname(appendfile)) logger.debug('writing append file %s' % appendfile) with open(appendfile, 'a') as f: @@ -1018,6 +1018,7 @@ def rename(args, config, basepath, workspace): origfnver = '' recipefilemd5 = None + newrecipefilemd5 = None tinfoil = setup_tinfoil(basepath=basepath, tracking=True) try: rd = parse_recipe(config, tinfoil, args.recipename, True) @@ -1095,6 +1096,7 @@ def rename(args, config, basepath, workspace): # Rename source tree if it's the default path appendmd5 = None + newappendmd5 = None if not args.no_srctree: srctree = workspace[args.recipename]['srctree'] if os.path.abspath(srctree) == os.path.join(config.workspace_path, 'sources', args.recipename): @@ -1331,6 +1333,7 @@ def _export_patches(srctree, rd, start_revs, destdir, changed_revs=None): # values, but they ought to be anyway... new_basename = seqpatch_re.match(new_patch).group(2) match_name = None + old_patch = None for old_patch in existing_patches: old_basename = seqpatch_re.match(old_patch).group(2) old_basename_splitext = os.path.splitext(old_basename) @@ -1548,6 +1551,7 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi local_files_dir = tempfile.mkdtemp(dir=tempdir) srctreebase = workspace[recipename]['srctreebase'] upd_f, new_f, del_f = _export_local_files(srctree, rd, local_files_dir, srctreebase) + removedentries = {} if not no_remove: # Find list of existing patches in recipe file patches_dir = tempfile.mkdtemp(dir=tempdir) @@ -1724,6 +1728,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil for basepath, param in upd_p.items(): path = param['path'] patchdir = param.get('patchdir', ".") + patchdir_param = {} if patchdir != "." : patchdir_param = dict(patchdir_params) if patchdir_param: From patchwork Wed Jan 29 18:14:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 56253 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 38C36C0218D for ; Wed, 29 Jan 2025 18:15:38 +0000 (UTC) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (NAM04-BN8-obe.outbound.protection.outlook.com [40.107.100.50]) by mx.groups.io with SMTP id smtpd.web11.19508.1738174528091904354 for ; Wed, 29 Jan 2025 10:15:28 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=eOGRjz/2; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.100.50, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nQ3Umn0aR5N64yVM58CNh3wsyq0drZDZT7LcxrASOLwvtuxh5ZCWtwv2gKDBWjrGVb+/FRE7+FlD9ZZXxlBc87/7NWST5zc50fN3DjX38RnboPS/0x/2rCTDzihNuvWjhF0SC53BR8nsjromluQU+UYSQ6m2SEq9dx9qx0PjUBt4mpaoDHqsYU5HocNyUI4fF5pdXrQPNkWUr5wZPKoQznXvM3j97iHxyRrWT1/YvFDd3TLdt19H/+AEKmVjmZsrx7hLW3rI8N3gDcCX1yU6RUzHnstoHwUL8KJVGbfVAZ2KJgiLiBLLLdgloJaHtdsKj2304DXu43R5SfK9CyabNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JZxAs3OZReTsx692I5e2LWPsluISO1jrE/4TUjRHMkk=; b=yvH3OXfaUdagND5C5FVAddNb7GZJNPy4ETCKWq4E9E26ssOOGnZMFSVT/ckgxpBCB6jzSkzNrHTULG67bByrwmto0A9fok2824YJeUYoOu/C2819hj+CF+5q4mdBf4ECJrn7Dh/NcGoQcsgakVF3w5zxl3R2+iLHdWhcKpKqaMM6ZVTopu+Ait0HJMXjD6tbyob/tUD7RtUXo6NeufzBibGvzSoUDUlb+eD4EltgMaIcHy4FwAxSnDOZEnyTV8+BUwSC2ej7YvBgYuSfo0eku2WAqBLsJPBgMQuskyeYUPBohZrRYdejHDexh1o+skFhn4JlsNRPNX9omJCbVBLVQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.37) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JZxAs3OZReTsx692I5e2LWPsluISO1jrE/4TUjRHMkk=; b=eOGRjz/2rINK/wNb6kYkHoUcMEc/i7ZUFxW+E3S5Wz7KoMQe1IPmEYinDuL7Y01Ylf/4LMxpmm8Y0orBPZ5R2VNpPtSqi7LgiEiLj2SxerK+01UeLCW4UMEBMstgzzn0eoGv9m6o5S8h2IvQBjeq8v5oHZawG0wnpRkiVMhq+y547tA8jtMGHkoJYqXjYi0sbNVTPhQCQtBewI1ocr57ReTCcv3Ro32y8whgXZxx9UT1q7ABJOd7uKSwbDIiv5Z0xTmcQQC3L9l2paM68lF29Zghv75J0j9oBmM8C5P9Tzd5ku2OvB6xDMMFuHk+f9Ddf8PD/iP+dQ9owAH/akIDng== Received: from BL6PEPF0001640C.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:13) by DM4PR12MB6493.namprd12.prod.outlook.com (2603:10b6:8:b6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.22; Wed, 29 Jan 2025 18:15:23 +0000 Received: from BN1PEPF0000468A.namprd05.prod.outlook.com (2a01:111:f403:c803::3) by BL6PEPF0001640C.outlook.office365.com (2603:1036:903:4::a) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8377.23 via Frontend Transport; Wed, 29 Jan 2025 18:15:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.37) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.37 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.37; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.37) by BN1PEPF0000468A.mail.protection.outlook.com (10.167.243.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Wed, 29 Jan 2025 18:15:22 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 29 Jan 2025 11:14:41 -0700 From: To: CC: Chris Laplante Subject: [PATCH 4/5] devtool: standard: simplify get_staging_kver Date: Wed, 29 Jan 2025 13:14:55 -0500 Message-ID: <20250129181456.1826467-4-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129181456.1826467-1-chris.laplante@agilent.com> References: <20250129181456.1826467-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000468A:EE_|DM4PR12MB6493:EE_ X-MS-Office365-Filtering-Correlation-Id: 597eb987-6e01-4ea5-87cc-08dd4090e595 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: 0zlaHuKj5XzD5DU8xPX/FTTFgb1YgxyL8HFykVmuUVjqUH8tbrA4yPUfCUWzlABPIwuOPurCebCnSpm5+tmPebsTnwjaUHISfRkcV3QRiUSrUWQCOKBqf0mkaqPw9UGcON4AlR++Mx+p3tuDE30fHSKJ4RuowwfPpteHHUB/7xvp176rwM3Y4WK1zrMH6w7UE5XNrzw7rdnu818RkoX2NpO3LxQAEziGoB54tfq+RPnt4p9F/exzguADJIvhXOgVe4IyhNNtRi2rb6Iqw2Oj6wvit13a+qYwf2w/qJkE/4Ecnac5swdHUsZFrJzXe66u7YgMM2DrWxboTr5tM25IRGhpth/fFif9Fs+SUk05GWix3HZ/SnELcF3v/Lzzv37ZtdYaFdSrauOIAmoOzO3HPbF0MsLG9Cs5K6Kt7rZ0wD3+uhE/9xq57mtA4J6Wh/o/LLfUeUYpUNF2rOQtWvFLdLWdPTW8pIWqjKV4P75gt0UVhHqSSQGGEhXxK8mflONCmRR/eYBB6J1YnjftkWgXMIz20TpWQ7tdUlzz37wISpb2I2OOFUcCwfXYG0ZgXcI3LNPw105lR357OVWyr7JcO4OD3T4gHpfc0B0/y1CKl1OHsu8u6AeAqbK6Ok9c/z8SmD2BQYsxevbKXFWuQwJAuQf7lrlduE3oHXrvROtqKRPufw6DxvVrEmZO9VTl4hEYncLg5lm97CstBfoInrfYSK9VmtWib5iSowSu4traGsqzpeTFBDV5tirgr3ySQZZw79NM+pyqZiFD09C7LYFt9wtc0oqNxcVC/VSkJuS32GfHccMMgbYJTTdIx6D2vHwjdOS5LyAsN/7VAo7IxvPltdbsRrKQ8vrQVh/Y+B2mHGQAIFq72bluCFFbgEb9Lsgh3fp0Crzgs4oxfWDTyPDqy91+ct/G608OYEAWS/eDJVocICIYSkZsUcB3fq8y3KHUHGuJUdgRAtQoXtaEBiS/+xyo7tq9k4DpYyCp5FnFRoxyCDF7vW3oeh8ZF8zNGZBKHgPfFPLaHHQ9IOUZRw0QSm0XWfLDmdaiT2WBBHPdXPCVnOz7K9CBu0l2TQVzrbgVq4t+8WgAJlzhL4ZyPuv45YNG8IT32qTS3ETMmrGNWNAnvO/e89KkvTch/kOLPeVd1Pvvcc/fMWu+UrvUR9neWiTmpmtQKtVwbXaC4JTyFK8yYwV+zt/VJQTOUFuVvVKDUuG7yUFXd1ldYqFPdNGKAL1sL45UumHncQ3eRzgX2fP6p2KWW50m0s8fW1jEL/laATXt1/hhNbLuXty7D3o+KKYSy1YdJYxNs+OiEl0gyrhPQCRsKpDBQ7wUYuuNgaCJ25TaJFj1HaEINFZuCXgNP/nq0ZZ277dCg3SWqcF5oc0gE0gnAFtXf8Z9Hzrg2B2FB7slqnRLUpr03YpfrzHlls/erN+x42D1FBc5MsWP9g5M9+vgYA93wwpuJzJ/GCL9QzLu2gxrvjs/QKn3XBbwvtfW1mphdqb74isPf9yAc84= X-Forefront-Antispam-Report: CIP:192.25.218.37;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg1.windmz.agilent.com;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 18:15:22.6478 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 597eb987-6e01-4ea5-87cc-08dd4090e595 X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.37];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BN1PEPF0000468A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6493 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 ; Wed, 29 Jan 2025 18:15:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210406 From: Chris Laplante The goal is to make this more Pythonic, as it was a little cryptic the first time I looked at it. Signed-off-by: Chris Laplante --- scripts/lib/devtool/standard.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 20c94616b2..0cdb9c6cfb 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -726,15 +726,13 @@ def _check_preserve(config, recipename): def get_staging_kver(srcdir): # Kernel version from work-shared - kerver = [] - staging_kerVer="" - if os.path.exists(srcdir) and os.listdir(srcdir): + import itertools + try: with open(os.path.join(srcdir, "Makefile")) as f: - version = [next(f) for x in range(5)][1:4] - for word in version: - kerver.append(word.split('= ')[1].split('\n')[0]) - staging_kerVer = ".".join(kerver) - return staging_kerVer + # Take VERSION, PATCHLEVEL, SUBLEVEL from lines 1, 2, 3 + return ".".join(line.rstrip().split('= ')[1] for line in itertools.islice(f, 1, 4)) + except FileNotFoundError: + return "" def get_staging_kbranch(srcdir): import bb.process From patchwork Wed Jan 29 18:14:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 56254 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 3CC23C0218F for ; Wed, 29 Jan 2025 18:15:38 +0000 (UTC) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.84]) by mx.groups.io with SMTP id smtpd.web10.19621.1738174529563243509 for ; Wed, 29 Jan 2025 10:15:29 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=1xq2aJUk; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.243.84, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vzgY+QgxyYg+nLWehuaOpz3DLZnaBur9YZHpl/t3oNE+cGZaoVo1aukYv44/yXYNRNvq2WDr2365hqAaCA/1yK+3SNMKsA1WJv35WX7+kQv5D2g4PXckATqVd5WMwTuOK8IYcy5qTk4HBOJXCCSctHi2Fo/lDeEgft14zxAgbiOyu9pe/P5/j/fwvF2RmpdxfeBDcvFtULZjgCRiDMdQihNnagVOYf6owm7NrgXwE1e85qmzVNDj+xcZO3PZcCDOCbXvwhz6MDoLE1F1vD6At7++E9SdtJgOPD65lHBg/Sib1DJFQUzdpBvImDYtVjyYM1Vok2y3FPW7Hg2rWTc3Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7huP7lNPvRUIRBfm7/YA1CaHJaPsoNkD5gNlwfWwWd4=; b=BhNb9lAAw7lZ0OBCKWyBHgth/Q/32tL37pdQ/WYoVgwq71Hp9ADPEzI0Z4N9f5dJmlomBNcvCefgj8M3HzgbgcJCVSJQ9csfqDOdSx6QNqJTdCNs6ncZGOUpxLMoPFpxj3SngcPs9sAhZOk/wzdsnRO4xnlAuRFfIYaKNiLQ4mGdLH+BAEF6TDX1cGF6P7Xz0E8heH72J3EuHrOKCc4wkf2tnUkY5lyDZMW+63meG6pg7SdXTNRzyNDGO46ftzQ6/IOhYg6P8GGa1ZnJSUXjrgYACp4jHry8NtYXSBnBtbGruk6+uo7sSQAbBFvFr9Tn1xq+1zq4fYxFZ65xr5+UBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.37) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7huP7lNPvRUIRBfm7/YA1CaHJaPsoNkD5gNlwfWwWd4=; b=1xq2aJUkhf5UQcKolj9bqCwgcPllMw9wUt+nefapblFUJfRYVOb1h17lTArvI7GCYpEP3LgjuOuZX6uGFiDvRT7DnyxOvUxe/772ARNEa5cH0LkMk+ZxXDx+8NiT2We6Vy3H9pQVqfrmwElfktBTMun3DYYZji72VcDLKZK1Hvvkt/4x6Et1oUj7Uau3WDaC69xjDbMd/k3b8FRwamCRqa80F89Ghe0th07G1IBenaDHeGz9QxNRbtvoqiDOJ2v54tLXiMViUHweyuhtIBZf8VX+KJ/jzA4ts5ELI+2Au0lWqe7lkveR+y6QM3qNYERbmKnJ184isv6HFKfu3GFL/A== Received: from BN9P222CA0003.NAMP222.PROD.OUTLOOK.COM (2603:10b6:408:10c::8) by DS0PR12MB8199.namprd12.prod.outlook.com (2603:10b6:8:de::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.18; Wed, 29 Jan 2025 18:15:24 +0000 Received: from BN1PEPF0000468E.namprd05.prod.outlook.com (2603:10b6:408:10c:cafe::c) by BN9P222CA0003.outlook.office365.com (2603:10b6:408:10c::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8356.21 via Frontend Transport; Wed, 29 Jan 2025 18:15:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.37) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.37 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.37; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.37) by BN1PEPF0000468E.mail.protection.outlook.com (10.167.243.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Wed, 29 Jan 2025 18:15:24 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 29 Jan 2025 11:14:41 -0700 From: To: CC: Chris Laplante Subject: [PATCH 5/5] oeqa/selftest: when setting up the local 'poky' copy, also copy local changes from the 'scripts/' dir Date: Wed, 29 Jan 2025 13:14:56 -0500 Message-ID: <20250129181456.1826467-5-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129181456.1826467-1-chris.laplante@agilent.com> References: <20250129181456.1826467-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000468E:EE_|DS0PR12MB8199:EE_ X-MS-Office365-Filtering-Correlation-Id: 743d7e20-8a52-40e7-9959-08dd4090e6a3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: fNYP5PHfr27kFBcopcDvB/TnWC42rl0kzIFBhsCFoAzxYRVOF4Vfwk93kz/YXFaR9Yl6GaUTvaTbl36y+PFqIeeaYNttGnLy1Nw7PKVfock8sUR+rIaPNPJmbFCyZov5wJC4QCJofEFrXG11U6gUppu0eW4BdL7aWbuci64yXG/rTqjZDhySNmN9w4vmU1ynOHYgxacYcTKaO0qo9ou7ytsuN/2JrN3GsMZEpH6S+01OyFLCCgT2Din/P69CTaVdN9rsofkqWbgKE75oRpvh2uYxCxAr5XtvWOMwF5uPC/7t4Q5JpM9qtipQwUm5KSnMmdLQG93DWfOj3kR2VipuPEQA2ZPhOsAeA88GpPsVZt8M9rot39Fs5QA4b9MnfnASwdQawHJqz78RA3px51BKZQIJ9Z+8iWlQa+rBed9nisNI3kH2qllPPkbb/o/nJV7C3CuAfpb16p5h8RtLW0Kkrk/gaMSvb2nbKq6q/58e6/w7ylhoiMVjrLVsUvIaVCYT61JEUnSdJ/8m3ICxG7BskzMSSCehMZBgEN2WwEcLUV2K8lF4zqhqXn2SEPew8/7m53GRLyvSUKdkgeE1NKWu7Dx8RdcRb+haPWqijqjzc9B4PP/i7cGlO6jFaWxV3sSrDQzuc78cl95dGvSJUmAOXuym+7unxek8xa3SQ015BP2seucLUDYjxbBEhcIunXK04nB5YjJ5m5SjJAC9jK/6xT5wW+5DTk9IlqfR1I67KXyrVhhO7Q8rcIwGJiVF3zbPc8b0rHYVgag9441ZabzxmHxl//cqTMy4950a8yUjVB13MlTzObIMsN5gIlqIlukxu+I7mdBksUnTOeJ47KRZ24l1Ksd7x2rwDuUd6tbIz0U+nfMotBdhMshJ08o29tS7i1uD4S/wV3F0fy1j3Xz3bgcKR1xYo2YZW0TzxTX3lW7hkjSH7FghiZWcgVo4ARCo5LRESFl+Ux1YYE/JI/UFBttJwmcsBcnoq7VOG2+rTF9AWturEnbvhz+ytamjBETK3mpxJWcT0C/DFf1N8/+vjMfAX1UInXD6KjHn5W9rusN9Zy5TX7qAq95J1r9klxh8trXvnpjoDNRWYUXW1KjSO3FOoH2Og9zTF/ERR5XOvI23WKFAts0xJjO0i0pRo3mrHd3PGP1+ZNS5GvNyo9mVWhJZ01Zmz32OUaDpAKDZeKiiqyiAff+RdP454QuxsVQycCLzEf9eAzQ+rYtWqEMEXBwz7Ta9vqwF6P0cBZSdEH+sSsivns+I3Oka0BlfAEEc5cdqmiLlc97HRx+T63yaaLl7aeeyx4z7c4kGrr5RBndtMGxNFHb7YptgxNIpqYRxQVTqpQiaPFsSLXbpC1yPRef8zkY08dTWYCxF5/2hF/FnXhj8oHweBP3FmpA5p4RH7KCFuiXGAwUDBs3hnhec3oeJOGGkbjxgYc77Udz+VysR7E16LglInhKdHboJAbRIf+9yYlvrKglCmOLfajE2GH5mi/4Midgryko3fKrX6a0= X-Forefront-Antispam-Report: CIP:192.25.218.37;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg1.windmz.agilent.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 18:15:24.4021 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 743d7e20-8a52-40e7-9959-08dd4090e6a3 X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.37];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BN1PEPF0000468E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8199 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 ; Wed, 29 Jan 2025 18:15:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210407 From: Chris Laplante It's very frustrating to make changes to scripts/ and have them be silently ignored by oe-selftest. Signed-off-by: Chris Laplante --- meta/lib/oeqa/selftest/cases/devtool.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index fb9d7966ed..e09e9755a3 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -64,11 +64,15 @@ def setUpModule(): # under COREBASE and we don't want to copy that, so we have # to be selective. result = runCmd('git status --porcelain', cwd=oldreporoot) + + # Also copy modifications to the 'scripts/' directory + canonical_layerpath_scripts = os.path.normpath(canonical_layerpath + "../scripts") + for line in result.output.splitlines(): if line.startswith(' M ') or line.startswith('?? '): relpth = line.split()[1] pth = os.path.join(oldreporoot, relpth) - if pth.startswith(canonical_layerpath): + if pth.startswith(canonical_layerpath) or pth.startswith(canonical_layerpath_scripts): if relpth.endswith('/'): destdir = os.path.join(corecopydir, relpth) # avoid race condition by not copying .pyc files YPBZ#13421,13803