From patchwork Wed Jan 29 20:20:12 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: 56261 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 CDA7EC02194 for ; Wed, 29 Jan 2025 20:20:48 +0000 (UTC) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.64]) by mx.groups.io with SMTP id smtpd.web10.22850.1738182040751011576 for ; Wed, 29 Jan 2025 12:20:40 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=RPg5deJq; 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.64, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MQlu/GlG1Azp3+d8otVbRXfJ5SUZypOXbzB6gYFvsxkdRilmSaP91yN9sz9rTGGGZiFI6UJprGSpFuMAU0CEo480vw+UK/GI6R3NrXtmPs8OT07b9MsGfjs8bTzC3ykPipmDZM1JrPuuCocGjtNS47hShUuT7DqNH3WVSIl2aYPB9Qz8nfDxMAZI+RoALvokOeXzzUgqL77vQEcIAW1I2cskD4UCIYWTaTnq1mQRJ9eEk4gVT+GawsxKfjZoWe0ppcHmGF3Z2Bj8rsip7C/IBPvyAN3EMGgDJfm/LtxGdaU8U1KHkVJ5mxrApiORLXJ12aUR6Z+SgYnU6F49GezLcA== 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=xl2cKz7Sg4pL7+y+i+jSLgZPI7kG6Vy9k5J++9TWvyvjFLrk1egeAFj8bIX9Oohn6wvibVtuTcGiPbukQCQzf1/PQ7BnhP7Q1JRiXcpetvM84ipRf5HxwzuAoFXqjeU/kUo414Q+BKOVbrpo82Tph+iR20hiQX93M3Rjg88s3VYiT6QLrpTCd6lpeBnt+StKgB1D6xge2kXzH4sqKYXP7vnKo8FBGbv/tQ5ElUS2yB+GL1YAB8xxUvU128wwniPoKO8lF8ImyW3wr1rm8amZkepiHpnQpxxpW3WxOwRLTRCLOmUnyBZ+Vg7JEvoA7rIDi7UOV+m0PyzAI/8mw5lzTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) 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=RPg5deJqv2QNZX2h51t0mgLWGRf5DthZwBaNy8dE73tOksfnm8jbpPqavx9YyhAg+4CeY04qn/6aEc5FSN4tgpecrgT6C/rKo9TNUicOou78F8sKjr7lQuU/7Tt3OmrJiTTUM7gtYBRNmaBvzhNG4s8H1FzQ+FN87KmNKjbhiJoc0VuGRb2TH+37Jn1BvEPTam0Ugx/FfYFlKgxK/9R2L3N/m55LA9HQC8A1wtNZhGjZvkMCw+xk9UF+wSdJMU4seS17n8v4aiLRMBVqJJLEh7PNgBqEZP6KvQh7IbhQGmu7Hliue5zH+C8iZ6MMMuJe0Qg2i2XyL2ZCLijQ+0uuqg== Received: from PH0PR07CA0082.namprd07.prod.outlook.com (2603:10b6:510:f::27) by MN2PR12MB4437.namprd12.prod.outlook.com (2603:10b6:208:26f::17) 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 20:20:32 +0000 Received: from SN1PEPF000397B3.namprd05.prod.outlook.com (2603:10b6:510:f:cafe::72) by PH0PR07CA0082.outlook.office365.com (2603:10b6:510:f::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.18 via Frontend Transport; Wed, 29 Jan 2025 20:20:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) 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.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by SN1PEPF000397B3.mail.protection.outlook.com (10.167.248.57) 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 20:20:30 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.34) 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 13:20:26 -0700 From: To: CC: Chris Laplante Subject: [PATCH v2 1/5] devtool: standard: cleanup imports; stop relying on transitive bb imports Date: Wed, 29 Jan 2025 15:20:12 -0500 Message-ID: <20250129202016.1833520-2-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129202016.1833520-1-chris.laplante@agilent.com> References: <20250129202016.1833520-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B3:EE_|MN2PR12MB4437:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b984db5-f460-4a90-912d-08dd40a260b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: /FSwaKsBLMadVCS5RCHd8Mv7fD0YZll6RUOOmi9LFf18GJC5c0dNNidgoVrsJkMMZjZQKu4jcXFACiCsHCZEFt6RLSLEcpyM7Jq3Ih4z2MpAgovVuOskdTyHdJw7tH3cH8D37pkyHqqLwGBD0oAl7gJYLn1F0CsKxW8kS/l4XzMwJLSodx04HEsJ14XpJLECRurYWEdmSTmW9bau+FgOOsmR8penyfCcXYEuU9NArXeutHsTOb7WZEckKtkb/qGc4tFSogQkEOcpU7TRrvcmz3kuPC0qg0rjS1GuH8Bh0jiRoApBGzhH6BXXFERK0m/LUtjCWb3h1oeNkAbLpccoV+OQat651C3mGxXCmpCQ/Uv1NTSRQ+k+Q2liiwm6TkZgOCu6L7MM3SQLMTCcBMOIU3Kn0AXU8Pr5YRx8qmTEkpFE9CRGYappdw9BAyp+zKO3MhKOAoDp0b8UcAEyrD8pBL0LNPu88Q1SQliey2V4yfMALdMU0hPg4hA54aobtVEmwKl60gCMDCD+DglOQQ9w+DTLlbnn/Mna5OiGk4tDeKzAW0mgVj8h6FaWxriGreHw/lUsRuz+CALXy2tD11dIEKCRlq3T4unfMD6wC/vWmcTMIpod0HX9soQf2Nyrg00aOihs/QClywpjiLVNX9bG3B6b3ZnFK3AnPArJrAervtZEnrlJUSBhOwUW/uzOhIei3ECJGes8kOyCFO00+YU6WQgP1V8jDk3l/Rd7N7b20CA2iSVehz4GOCZrRzmZOJPOOOFSWgOh6mM9p1ib2skPpoXBQo2aY7ziveAxt1RELCk2k7HZpDFO6D2QmIMErR0oKLNYbninZFFjEowVB+GXS+YpEt0Jmtu9gEeZwobzvL04JXKTzvP5k19+txS+KX8QfVtntgoJYh0RnZ1VYKk5wciPcBNf2T2q0sEcxQ/BubQs/pqSIn/Y45fxJARTFWjUwJ3vDRd4Uhv4/i1J1z/m0iA1ZVEP4XiU8WH9sCGq+S4DwXFOjXPmHM1jSknsZBY8NnXsZ2M2F25U6h6tku0h5jZlyE5BVQ8RpO8ewYrVWjRW7pSuz4RYfRFibFHvZayrBiN1xoOf9oxmgPKnzCthfDPK2xnUrJBAVjBpQrFhadLKLgPJil8WHOSCTm8reFDmLIq53AHUaDjq6gZgN642oRCbAF4a31ICMzGiiDdBYlIRk+LlmVySrfSQpYJD+s5TZ+zbY/0sDziAhGjeaAQE9AWtllzRorYJdjwGdHzftXYc/tCbbwgP6RFW5/QCjuGaMDwBQQBVS973FM0UizNisDJkvPwXGd2OKsr5qyj64rpdKGvFNZHV6qSgoZtV0jqZ6RRx/iwUW9QeQu+o+6HeDosHMGwdQohx2Jt6GiuVKtciENIlGQTqeJFkbWAJeyGJPJHm/OtePmwYzoqvSRNZoF1i6Eef98REuRADMEbe7v3KVaGonDsEH9BVotEF9IECC8akPtjQvqCMbz3sDTxavIAeGR2J77VLPUir0JId3ns= X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.windmz.agilent.com;CAT:NONE;SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 20:20:30.7154 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b984db5-f460-4a90-912d-08dd40a260b6 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.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-SN1PEPF000397B3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4437 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 20:20:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210416 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 20:20:13 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: 56257 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 F1992C0218F for ; Wed, 29 Jan 2025 20:20:38 +0000 (UTC) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (NAM02-SN1-obe.outbound.protection.outlook.com [40.107.96.59]) by mx.groups.io with SMTP id smtpd.web10.22845.1738182037128934956 for ; Wed, 29 Jan 2025 12:20:37 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=w7AKU9DX; 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.96.59, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YZ6yXdkQxsTCir2/KhmUvhRkbviny7OjvXnLLrZ55fFDOJML5ka0EahZRkRtA29wdR0T9x/Kyr5I31OfvgHveThc1IG3/DwUy/oCA3ZnGfOJPzIW71yxNlb5olImkJolK5IbMRQJZcdT5TRTMmqScnMi3EAhwstkdxzxbYowhw6lcXom/8rj9hFYfyYJuC9uVoSkn5YD80oqA2e6ooyWVNKIHwGzMLf+5qCQJ8rbMv24VVy6mzndeTQAxXzHol1mCeCsICaa78kUtRZ2EDJS7DJuIL+CAaeS1eto7D4o39LQggJTfkJjb9biISQ8JSYLY7yslY59AzLKIktA9i3teA== 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=C9ZOS7bUY9T7PGhtMjYI/2kkCvtb7GI2sIQphacGZNRUAifogTi+x69t0m1kpPFhdZ9YHlHLkW3pb4EFieJ+k94mdWZRnHrsGx8mieWNF1DXfQXfLkoiKhxPhtVaMgzBYJL7t8yS6aGr46iVEPMGohqMgG5b2iseh6nZ2/g0RFbCrPfNd5OBGYRtDeYS3x1l4ZXsmqj5deu0nt+d3lenCIh4uoOHCVYucZ/uXo3Bwtb6/+P5kUxZtwmqg4Dhopj1QWPhN+70eby0nj5AFuIi0xIald2zXTLh1JKwBDh/Sy0FxRumHga2J98dZB8aBbfiEnrXA44lfiJKfOJTnGYOdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) 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=w7AKU9DX5T0ntyM/2iOIlAUlcGYBr2kE6MiSapagh9q6tNjNAnI7sRGoiV7tZDHxkmqacaPxW+lTeZiDxoUBGPtUWd09DZTt6t/fRjmTKFCe8iTUmLwXSpvMb6TeAGP+yW1PnI03atmqwuSnp0ovgN41p2H9ddYk08b3C9k1WTUBzt33jwH2NaVQNC2QbWuRXif++ZoHbF8t0LnulmWFaVBr8ZCuXmzuZ5K/X2b/p+R/U3dZ4GEkLBYMp4h8V9jl7vYW802cAAO0bC0JRFaOyIEfBxKl9cPsUiMMxbWJmPY4OeBuryVa7e7ZTPr6+x4G/wQdvuey8AX71tZ+FV5lEg== Received: from PH8PR20CA0008.namprd20.prod.outlook.com (2603:10b6:510:23c::18) by IA1PR12MB9498.namprd12.prod.outlook.com (2603:10b6:208:594::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.20; Wed, 29 Jan 2025 20:20:34 +0000 Received: from SN1PEPF000397B4.namprd05.prod.outlook.com (2603:10b6:510:23c:cafe::ee) by PH8PR20CA0008.outlook.office365.com (2603:10b6:510:23c::18) 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 20:20:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) 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.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by SN1PEPF000397B4.mail.protection.outlook.com (10.167.248.58) 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 20:20:32 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.34) 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 13:20:26 -0700 From: To: CC: Chris Laplante Subject: [PATCH v2 2/5] devtool: standard: fix typo in variable Date: Wed, 29 Jan 2025 15:20:13 -0500 Message-ID: <20250129202016.1833520-3-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129202016.1833520-1-chris.laplante@agilent.com> References: <20250129202016.1833520-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B4:EE_|IA1PR12MB9498:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f9e0f4f-391d-48e0-9aca-08dd40a261ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: U0LyJtvTZwvhwqaL7DUvKZDY3eVGyAGsdvBRC/+g+2oamPFI59I9zmr0fQRwJ9/MqPVJstJeMnuc6OtByN7V7KF2Nt1/EpZ+0OV6ag/PtIpK3PN/Gj9RmiNeaulJ4PxNTxjhPBQhrVZB/FRbpbpw/0QE+kmQCJ0WEEEuoJoMdFoixi2EIT4QFxOLul2Aosx2w+QpzzoTvsO37gsobtzPgn4GAQpcGEO2rHZcpDr4prU+WcinaaFr6i3Afl88Axyp7kH0Di3orkB/mEmqD4LX8QMLM40IdZ/JYlV3rwlrswA2/GBuK0a9D20C6oMNksGTnhqNiOySSPmd5MhH3y1Vd8uP2vx5VuRL29B/YF1kxUKiyImYKjePLkcK49/XXeAthPmXf4VlpZOVBUGJeUuSzZtLWM+lGzmdSZJ+0stjIbtiavLw4ofC5J8d8X75bx0Op4Mdq3WvempupnoK3E9D44s/M9vt4CV0RKZ51DXm4HJ8QheCaa7CWpkJs+W+9BzL4N+7/MEduYo+VQqYjNxX4iAZTDBNsgZyBdsV0EtHSbhcyHfia0FT3awhOiJUYprY90lSHwFITtizSseETUXKfKa9/cd0gUzhnqWIyyG9YsbiW6GUeR8FamLRshIWPQEj2OFTidpOIy4cycOfZeBYQ2l1ufnSPkEC0GZUl1es5OdNqdIVSmTk/kG+VFbn2xfLkCLk93m7RVBQ3M9cwEMW7W1s49OPO7458/5Jlk7HF7GmOgaUJqJprEToVoGyMoc3apKRatarG/Q3zWiRMvuO5j3VBU/UpX9vpyUcDeUhjkKw6LYZmBnAYKBSflcyZrh1ZaJ26Kg5yDCMxMd81FqB17a2CYtdCtL/gKRrxT65GOBLgj/nPc8TnrqIk+1a66WSEWhJZSFwIdPql4iUW9UoHIsCIoNKwWjebJb+i6L57kgHS/9sLHi33A49FXGHmCqXyNM+74HuGA9MtKK6tYSvEQac+pr09LeoYbjSbWWUGbJPUfrX+WX8mJsFm+wy6bOqjvJsHStE/bnAhvV3bKLVsV9Dv9nQ5qfHxZ0jjPb9vFmngnJKeXZ+w5AEOUZHQpGJkSg6SBgZGK9clZrskh7GEp5RVUZNt9LfJjX4msT7ibA65IN42ALRRwyyBQCqujCF3t7Q5HHjMnR3WR2Qci4mTjEQC81reNnip7W/kMTbtoW8ACHhw1UNOD2JGd72IvojUiQu+2dxwZt4ALUZggBLpEc1F2AsYiheXWEprnKHHEzpWcMB6F/n8s+6cYOhiQ/IQQdIRuSgex9xNXeK1e8PPgOCDkja8T1OCsQNZYpFWqrQCvAEzn7vgG+YPLBsAL2o03oW+3hUiOy0lmPtWX6RmNA7A510jQj7MRQDYxyM94wi4ZxTB+k8Ko76zYjvlmJO2Rq3XZVXPrwZkOYwVsdWeCSDCAGGSIUtYS+iFD5lCBIaCA94PhuA8gnG2pznwesBvm5VjtMdzwvZpvKx/IYsuSF9xhwnEGsT8NhDrQUK9mg= X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.windmz.agilent.com;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 20:20:32.5754 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f9e0f4f-391d-48e0-9aca-08dd40a261ec 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.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-SN1PEPF000397B4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB9498 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 20:20:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210413 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 20:20:14 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: 56259 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 C9ABCC0218F for ; Wed, 29 Jan 2025 20:20:48 +0000 (UTC) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (NAM04-BN8-obe.outbound.protection.outlook.com [40.107.100.86]) by mx.groups.io with SMTP id smtpd.web10.22849.1738182040727325493 for ; Wed, 29 Jan 2025 12:20:40 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=f7RDvt0F; 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.86, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vv8HMWmmdLgZtZfOUeHxl+oQi9l4hXXsMP4oN6ZPAlXUiNUeI+oCR+Z33Uvl1THMRCFNWBfRW/9F22NLgk64aWt4LGg7FF64bawiL/XZrNoyjxV64VqOUc31ZNbNxFvE4dLYFOGJR4rJjHL39HH8Uu9sRPDq7ykufMfSViREosoA9+dJJ/m9c4w0uhMB1VyPzbQkMo4CbZXXM27iXuIFJHEvRte0jBrnDUHJ+REM74DmTW3Rt95o2tLier17RvV451v1lx1/fqlxdVvTUXfGrmRaUWlfQ9GZehZGtn8ayKHuRAYZwh0iymCy6BMp1H79ANldYyhHp6o+8hKq9vWFQA== 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=sH2YM8QJ3Ty2O32/uD7dwp7y9LtDvxdCXsa3kWtdR1ff3OoKHdiFV/ZHNoitekNKC+2E4SV3BDv5TDfNDH7t5ag2pF3XDb7Q4PdoBn7dB64mYkPI1eJG5ex02YFco1oCEBpElswiLrF0HGpuOINl5f92AB3DGfOP5ODbY991JNrDb8gugVLNGKNwEhlDpYb44x6gRdxaSei+o6zy9Ybco4J/ntnacZ21zKtMnoTwYSlZ/gzihO7lR5N5mW2sePKJjys+LU6hmPofc26rX6yQusiqoiu7g7uoHkgIZ9msn2uqwGXmeNHPuWdAx6rBC+rfAfFgBDr5qDv3YpNLv8mk/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) 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=f7RDvt0FnGm5QX70L0QshLKKqjQOsGhhxfnfl84ppKNLmmE4wgMS++lbYIMh8GNuuFkO8sxIdSja52A6PtBbBGPFDug7En/83TPicNJkWDLYuFdL0QqkWcnePGCy1KOmmKr9NnQy6AXcUOEO7b5U/PWx/3hYcN8Lv3G8okepskrMjkE7sVTW3TMmROPl1+/wICUDt3qd3k7aetNYFiorJ8vdEOHlf75MgBXKtkG3q7hN3N7S/JgFOf0r0jF83v6RVGxVASkBLptibZL4Di9KFXPDJKYmpsMqIXcSBmAM/n6d9D6kzbc582MzdjxLbsVECe1/BlkB6ACQM+rH50CH/g== Received: from SN7P222CA0017.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::15) by DS0PR12MB7534.namprd12.prod.outlook.com (2603:10b6:8:139::6) 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 20:20:35 +0000 Received: from SN1PEPF000397B5.namprd05.prod.outlook.com (2603:10b6:806:124:cafe::99) by SN7P222CA0017.outlook.office365.com (2603:10b6:806:124::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.18 via Frontend Transport; Wed, 29 Jan 2025 20:20:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) 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.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by SN1PEPF000397B5.mail.protection.outlook.com (10.167.248.59) 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 20:20:34 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.34) 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 13:20:27 -0700 From: To: CC: Chris Laplante Subject: [PATCH v2 3/5] devtool: standard: fix unbound variable usage Date: Wed, 29 Jan 2025 15:20:14 -0500 Message-ID: <20250129202016.1833520-4-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129202016.1833520-1-chris.laplante@agilent.com> References: <20250129202016.1833520-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B5:EE_|DS0PR12MB7534:EE_ X-MS-Office365-Filtering-Correlation-Id: 56104a92-1f39-4867-4407-08dd40a2630f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: UGkvE8NvCVJnjsfakhZ69SLyNk0jF9ktyWAWXqJJ3g8R9aDajiGn2htLUm2FsuGNmODD5hM7xUOdhjwBEbaPw3B4PQ8YXv0pQgIVpxLBatu+L9Y8oh4lAM0fO4LLSJB/xtle2NJWcb/xcyViSwY/EbcfxuPSNtHw/Ws2y0LYZ611d8gZYQMMfATWKuoh4n+glZ6fvgTMsi+MX0Nbd/da6AXXOQVGkeO3TFoA5MMfe1Hw3S3FZKkMo/zePp0olFZBTJh+iyPYUvBs2cZhr6BUYfy+VPJJ29mGN/2rPGFIAy0159PAMcPisHCLDmEupLi5G0iC8XaERaTVCkusoYRMHV+oCJDfPaPgktrKZXjdV1TdM0Rqh7Xo8Nec6D3pIIbsZmvNEvh3ZyexXmUppZW81VHdFfWNExRtLhps+dX0DoDSPCk5zH5uxVPMaGmB3TV8LzEzkOQ1f+ZSCYg/sF1KqPnSnCVYjaGXTOpbHLcBqKpMOjsLvhnlj5ImE7xPEaIeGfJ9hnAaZcTg8EWoorZFcpdxuKdpW1w/wGiMoINwLO8KfxE4FstzgKFAJ737f/1mBG8fEx1ZJiuVSDjLQTN6m9qZVD7mIRLqs5IqJk+nf48gWR1ZtnwBY2ZBeBIOy5lvDFqliM7ObckEZF9BT4PtXH+fZvZOC3eA40GyoAwFBTO0v4bsJWoAv0/unjvuNP/XQZuujtFCDVRfzYbhU/iYo9VXHzijdsE2AkoKQfN09fcAGW4JU0HBPtPeonus7f7p7nscfVo/ts92JlYRQFmLIxHYZm+ay4+qXmouLF8AqzN45kOuuwxpAskCk3rKNnlc8l8vt6lPprtzavsQVXacyolTDcDoTh/w4NO2pD69oXA0qHiwU00aLC1VoQa+Dk1kUbhHx0HLBw+aecHQrLr7WOKA1bPXQVIRDId8NkNUToLOKhVOw5rLhXL3+LK7XKzY+LXEGNMnsCA+GNvs2x7sz9VVfskaPlhzluL2peNJb5apdPx0ZNtORoJMo3ohNFTV9A9okgxT5Jpda6/dbYxLH6tq5kLl7SqiNngVMlbpv1nT9+K17S/rMMB1AhB4OXqv3c1VS0Xj0LcN+Jgbp9mkWwozeuo/7KkvLBJZ2M2Vuz22/f38JyoFtad1PlUsfrXYXiV6Xt6eF+Yym3hLNrB4hv+QAEQ2cqa4Qw0b4dagZoJQukN2FpjJt6yuJPjdcji/G2yjUnaYAFQDFYY3wJlTcdBI/BGo+OtWE6MX2PAbb3uySOQKz/bUcl7/AtHMvovB67Qj/owvBs8D2aXDPW4RqElt07gky8R0t9k+uazBss67zb8XDbhC9+jDH/5OMxWihIzvWY+5QyCgBAiwfsegUd7L5HSp771p86j9/nCKzX4k5m9y6YgyAI1NOjRM5c+EQuUg13DyeF1TyhpZLYlyhTgNjUgxvHcMqheggGXUAb6qweOWRtbxeMgWMx+Y1ZDqlsDS3IFxwTX+AUifmokpTt+y2GbxoXGQ3jIfhoOwb0s= X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.windmz.agilent.com;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 20:20:34.6521 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56104a92-1f39-4867-4407-08dd40a2630f 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.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-SN1PEPF000397B5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7534 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 20:20:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210415 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 20:20:15 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: 56258 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 C9A84C0218D for ; Wed, 29 Jan 2025 20:20:48 +0000 (UTC) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (NAM04-DM6-obe.outbound.protection.outlook.com [40.107.102.46]) by mx.groups.io with SMTP id smtpd.web11.22636.1738182039244555624 for ; Wed, 29 Jan 2025 12:20:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=YJPewq10; 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.102.46, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aWYNnngfaO1iPTQv3glJxKPL8+XJqGs4mVkR7PkmYE8gX/wRXizCDEI8AGtmooCgEi3yUHLDJuWVcDg07OZ/leYEghrzNsbtB54WMaHnEXfNWIlqdlqdwIe0tjWjuitFW9W+gp4tTpj2d6UV0orBgqw6UU7WrhoSQXYnO40ZydGTc9bz+MYilc+0TIP2/ysnQuXEJ9RDjtziCxQnpyQl8q0eaPw23ky90uCM/+L3u9+faZayV5wtowKonpPgkG42UCu+v5HItA00s/2EWRVedr/mqMZZLdqp77qNWySS0G/mr6IbfkuRYONfwxKBBwuPmUELLzq9RAeAiVcHulz2NQ== 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=Jt+ARnTEQW2AHEaDv4u4GcrmLuLeYhA9WhqVlWJEiKGjyScSvt1NeTTQPSeeMPlVd+shgP3S4OrLTKxQ3qRWfptzD0aHO7JD3Bz6K/WyYpl5H7vjjGf3zzlmiFYqDvi1u2l6AT2cI1954NtrE7buDH1ceAmtDNqoXO8zQQmXNwYi76FwwnMhjZKJ0CSjLOAXJcgrAHu5Tdbd7g45QkiyeUGGWxF37/sUBIR+k3cwT1T3mApvZ1bqI6JsmOCXwHFG/CRRQlxkUz4eK4siTlOol74iKmdcryt0IRuAkG8gP7VUiJzpXuaD4yTyFQFlP5/mQoBT6jPo2msU3La/Fl/5iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) 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=YJPewq10F7BYKRsDkRAh4UpAXrKaM80T+zbOqYTcbmuZjZC43OKZ/chhvcwGJDE12GbxO1H1f21O0OrGWrQjxJwWmB4t1nY/wdmiepzeeWkMRtYQJ9plYyHfDpK/P9nK3RcCcF/7VNuGSeyEoJ3sNnU0Pj0iA4eFbbmUJr5N6Q8lLxD96mHr3x5VT+dk71G/rUUg0PguYwO9RvKsC9392PiBhHfilbO/PEnwK06r/oR4bIyGwO8HBl6sr4Rba7rr5A7SJsOtOxeGLArO66d6FCxiX/giS3iyrjLFf/O6Pe79E6KjgVO0h/3Ir1sWc4kOKbE1CAxA9+CFtdLeNSTWMA== Received: from PH7PR02CA0023.namprd02.prod.outlook.com (2603:10b6:510:33d::30) by MN2PR12MB4063.namprd12.prod.outlook.com (2603:10b6:208:1dc::8) 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 20:20:35 +0000 Received: from SN1PEPF000397AE.namprd05.prod.outlook.com (2603:10b6:510:33d:cafe::e2) by PH7PR02CA0023.outlook.office365.com (2603:10b6:510:33d::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.18 via Frontend Transport; Wed, 29 Jan 2025 20:20:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) 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.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by SN1PEPF000397AE.mail.protection.outlook.com (10.167.248.52) 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 20:20:34 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.34) 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 13:20:28 -0700 From: To: CC: Chris Laplante Subject: [PATCH v2 4/5] devtool: standard: simplify get_staging_kver Date: Wed, 29 Jan 2025 15:20:15 -0500 Message-ID: <20250129202016.1833520-5-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129202016.1833520-1-chris.laplante@agilent.com> References: <20250129202016.1833520-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397AE:EE_|MN2PR12MB4063:EE_ X-MS-Office365-Filtering-Correlation-Id: 0529f886-b859-4077-9102-08dd40a2633f 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: Ogmd3zKSwj/vROytUeFG5xtKbkp08veKf6ZKEjViNjCdAh8ZwysXg6SoepgKBJCiVBcyzjuY1SlGDLlErhFKDSt31IUypazGwxJKbFPNGPjpnQ0lmCcIQnDQQNZQi4Dn1/tRf+yTnRC3sXQe/SPmRe+972CG3RNH0pfZeQL/pQUxgWb80MTgE5fTeHCbnCM8fTtMHi7bxcmm+I/wrBYmm09xcla/5xT2dAK5Q7tMk0UQuqZRC5QGtbFz5DL+td8gIPQpRGJrs2s1HUdOJiJQW7YNU6cV+RUU4Y9XjicH+dIaYDEQk5KZivR7xRvVCIt01Xd7uQ89/pCkyTdVuphkYq8WyFPFMGBPPrbk0cLpJA2j2nXalnOOz2PJAIxWIlUcAijMLn3hQjGOfwrarow12FQdCfupQC7ebY+87phxGxZ6jH+MtkxRU2sHeePKf44XoNut7WGMXBjMdJJJN55M5veLWFJ7lg+UJr6x7N63L9fxWra4UUxGQpt9L2E/XPBOAeFxz8j8sYfO2uCalHdIwSc3QVIZFI5ve5qhcyJv1h1t8XRsIoLHRXh66KdIC6xbxJm27tI5dao+8H4fDYS82GlrQzyzbJcMmhNgkFNCywLFUcA+0hWTZPHhog9aTldsSyyLIAYZ0DUlDyOJddJbUXJeLWSj4fy4xi3hQl3U30e1BgwQMVTmMj0Yf9997DrR7chG06c+TBooitECwZIdPf4/3VIKSlu8F6jmlaYduzgzX8IYTWK5IP64Px7Z6hutlXzjYykxBg801SN6wcVjRvvQURUdmG+KxAUoZnE5rZjY1CYkkrpH8yTFh4PSfIWYXTjMRNnCG7q/EbrNxRJAOWhm+4GEZhuSrocZvLkuOKZ+qwXY6JxtTokHzFG21jVp+N/uETh5VKzZqRpbbvW75J5j6lKos6v5x8tLuarJngJirXDQB8fJaPSFu37581tvyX794y8K4b6N1lA6Lr1WzFALPx+svoxGxyc345hMgcvYKV3uTzOgATgVDpE47LyLeDFYKIsgn2KbICBPVqXBTzkSINY5b2EpUmuSUs7nqu4nzdEekpn/NfKpr9rNYRzxKmTO8OVwIhCATk7B3ECsSjUPR+oNCBfGgTHSSjrZiXI6XHXO3qExVKBZ5LZx3jwBvNmDwrsAroi/oHJzMhbjhcyx3EFCrT94JsrIC5gVkmrgB+fkf8xXCOmSHo9UnN7ArIU2bTLRUI5w+JBX+cm1okZHxUt5/dGsCnUp5aD2cw2xYKIY4nL2twGCg3o6EodmUGYrpFp6Ai8Vz7JlszO4VLu97WfjG+d+/t6z6blunqdv0H1nyJRlHGBr/6+jCxiKtd12PGGCHGGC39GGJELXYi8bLI44FbRA72K5buMnbwFXkk/IojJIhptiGUf5SzGs71vSK0qBz61qp82TLEZA4Idn9JtUFdbEg5l/GNM6ABaLwevYNFvS4XEhP2wc3gpre22/VKiqaOSfJmvtaMmgujIqaLcCIsUHMaDKaGWFCo4= X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.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 20:20:34.9374 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0529f886-b859-4077-9102-08dd40a2633f 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.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-SN1PEPF000397AE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4063 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 20:20:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210414 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 20:20:16 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: 56260 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 DE800C02193 for ; Wed, 29 Jan 2025 20:20:48 +0000 (UTC) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (NAM04-MW2-obe.outbound.protection.outlook.com [40.107.101.66]) by mx.groups.io with SMTP id smtpd.web11.22637.1738182041492393377 for ; Wed, 29 Jan 2025 12:20:41 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=B0JBsecG; 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.101.66, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=V7z6RHcRg6vwQBxiJhCDzDY9DOSnMgf20eJT+FnVFsTK4PxNVR5V88RHl4BAvTy+I/84Vxjoowk6NxXBS0+mC3bU3fFeGhfMr2Q9I6QZ1xNcAPKGcKyMzrDED3Dc+GmXxaTHAaIOxIYLvN5QcTNAXcWkNnF/e5O1MUrFuGMw4WOOT1DNZoM03RTi283uqJi9oaSJ7mndZfjK02XW5l/2aRs8RRfEmfXRoz/ZRlgohF5JMrNwU7oZcbXswP7+CU6we/Ch6V8T3DEt6qHI3MtSxzCQmn8jjtAFaltTrsishquGVgynBmSB6geSHCAVw/eR1W8XdRnknSh6v0rFRl7hLA== 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=KhcMleQsFz3/qTxQD6gr4pxYk8geNmCRjSb2diU+LLo=; b=LxfbNvEQkcWT8ChXYGGSsWuIV8EsZeUNnaM+hi3ywTW7odlqJOpcsCEgJiSkI+MrKz46lTTZRa/Qt2kedfwIZfwCUVceMrEk+4NkHZwIRTh/y6i+YPAUSo3nOONoJhZEvKilFuH0gl4xIVOtnDFFwU23HkoG/GWbHLW7CuLQkP7K+BT3yuTQkKMu847ZMH17lCLX4MYA9Sj0xuhp9fI2O3DtmfW7OnqFFSzJ+jH91iDxZFlDeipff9FneJOnWQLEv9U/YskhPp/HQEZIgkvu7GGiyUzQVf0x492qS6nJaBZ2n8pwsUGPpAcu5LLxurihvhfGnJVDUwQJP3A7s/IHPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) 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=KhcMleQsFz3/qTxQD6gr4pxYk8geNmCRjSb2diU+LLo=; b=B0JBsecGX7cgDwEllkGEcdkll+K6M22lH/ob83vGat5sFhCQhZmf5h5HeW6aH7ayw4bzqJyoWwMLeG7Hu68V7VYM/n/ASWk1+xuOrD9qe0GjRhslISvpViNJIEFpdlPW723K+3opD8B4pXVdZNGf3AoRKcDAJTkCqQXEgJnsLYUC2rtK5EVwOGKywC2rr9YPkB4tNOoEJPJ30POvMZRyRDOv8RvUMMMDlZS591Lfm/8ciOxEyvaHldHgRcdHrUefsoIbair6iAOJnHSqQVLBBAq+E5xYTMP/VgDSowmdOLUEKi6J9o6UCOBgO4KvvJ9zJ1GfvO1czUqICVh7yQXa4Q== Received: from SA9P223CA0019.NAMP223.PROD.OUTLOOK.COM (2603:10b6:806:26::24) by CY5PR12MB6383.namprd12.prod.outlook.com (2603:10b6:930:3d::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 20:20:35 +0000 Received: from SN1PEPF000397AF.namprd05.prod.outlook.com (2603:10b6:806:26:cafe::96) by SA9P223CA0019.outlook.office365.com (2603:10b6:806:26::24) 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 20:20:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) 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.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by SN1PEPF000397AF.mail.protection.outlook.com (10.167.248.53) 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 20:20:35 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.34) 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 13:20:28 -0700 From: To: CC: Chris Laplante Subject: [PATCH v2 5/5] oeqa/selftest: also copy local changes from the 'scripts/' dir Date: Wed, 29 Jan 2025 15:20:16 -0500 Message-ID: <20250129202016.1833520-6-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129202016.1833520-1-chris.laplante@agilent.com> References: <20250129202016.1833520-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397AF:EE_|CY5PR12MB6383:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a3c5c95-70d1-4caa-b568-08dd40a263ae 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: tH24lDyQD69AMocPfTNu2OYuxzMqeblmPohMoPVsLeJ8vu70txisB1vqtLIaabIeal3JRvL/XIPMuijujX5vjZfrLDDZn3YC7g/LcYVVY4+ibZrSMHDgsQiw5qhQFNr52nD0UQ3qi7U9wnDbmmKzev6WAhr0HPyUL0XfigV1tSyfxbLSKx1LFKUgNX3lXyfqbJfDB1yvq8+Bd+OfGTfmzmleLmVOJtOC+bOE3dTro/E0GF206LufRsNgjptqO0RUJT63haMaSfeSuDzOQm/nDOed3mUpzgbH161x9TgRxMCmrq0HL+YqgG6I23++wyrNYieQx0ewXjwtJQ8QJtotl8feyRy2qPu3IzUeurnzbo1AVCqp4HE0Z+MgZvrc19oLfF2Hkkb7YceKixs1KeoGhYBar/u8dMKc3tfKaPMDzc4rNnknc5iGvSEaW0ugxo3OlWgO7hDedy3/rIxq7E8nxYWz3hD/4zrPnqDOPYi8mWJ7w3UleD7iw8r4xyPH2U4LzRbMnzg9UyO0aR37Z/nkTYu7Ue6Vli0eSiFwnycn6kKyRoHIWT1ToZzkvR6gxFq2CVUXjN2y1psChWvrseFkIiMBfDjnpgtnwHLZ2z5XOPYCBbk3nuaeGfA+9dDlzON/sYCq/iaTGwm3NInFb1jGikoTFaPYV4xw4q+smTBFUwTbu5AzmhSnJ0StaCHKU0Btdy4hF3CmpN8ET+wwHbIxxpQHgpBSzmotIsDHrUBArZGuMh6r48kgveQPDKn5pTi5LD3MiLDcXGlMj8HXp+GzmKaklaOjm3XCFTya62E22X+Dy5Xg0IOdMcEaJpGC6rlBtuza89W51hLCdVyylq/xl5Hu6VuMkGX8ziFZ5xtzlvBEJLk9/mUO+z8qY48pVuIt0H588O1jlGjSQwFtNpqamEfXg1QLziOQfBJMXXm3h2myaI0z6F48JJLOitTPFyzHsQefKnZRQbKcUQ0vZxW3YePPw3sY1iOAC/DNsKFcB2SaWP22FzH+1Ok+9onkOXNtS6cCbGrt34b1l2qOsLg4/b7k96YMXJmfBwymH/FAftbxG2ZO2T2jGgW69U3wSARPzY8QONLyCOQdDheCbeI9FjptI8FqFw4z1tMPGNhESKwUM+e5oeovnkxSVkMjbGMuRM0QbQNV0VwkHyS/lxQFtstWCzRCZ/w22sr/VJQk53zfh6n6Us0Tho2Re/ufqHjSky+3Yuzw2PkBCYsbBLCfDG7gYgALbmXZ3NusXexqKWgZ2A20qnPtw2wRoLHU4JhVnZimwy6e3scRHZoXK2dHuX4On0go5F12UhtpS/dNPxJQqsR8onh2xdB8OzyGqGMATIDt6QZpgWVBq59KjjJJh4yFGoCrWoLnJUII0Z1BPQc91xtzhEwSfpw7+a4BuUnu+9hoEQZIhEEdf+GKTF3e+l+kB4PTKgdMlPX6WorNxgZVxvbeg2o3HVEYihecaONpPHgrNG+MmaDOfLdPyJPqn1VMjp0YK3psqpoGsrvod0s= X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.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 20:20:35.6814 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0a3c5c95-70d1-4caa-b568-08dd40a263ae 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.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-SN1PEPF000397AF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6383 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 20:20:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210417 From: Chris Laplante The 'devtool' cases make a copy of 'poky', but before this patch, that only included modifications to the 'meta/' subdirectory. 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