From: Adrian Freihofer Date: Sun, 22 Sep 2024 15:43:16 +0000 (+0200) Subject: devtool: drop useless variables X-Git-Tag: yocto-5.2~1751 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02b52a2de3bf5766bc05531138a2e23acb00a276;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git devtool: drop useless variables Drop some unused code. The actual intention was to look for remnants of S = WORKDIR, which required the extra complicated oe-local-files directory. The remaining code dealing with oe-local-files still seems to be useful. Signed-off-by: Adrian Freihofer Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index b2e1a6ca3a5..f2440ae804f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -18,7 +18,6 @@ import argparse_oe import scriptutils import errno import glob -import filecmp from collections import OrderedDict from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, update_unlockedsigs, check_prerelease_version, check_git_repo_dirty, check_git_repo_op, DevtoolError from devtool import parse_recipe @@ -814,10 +813,8 @@ def modify(args, config, basepath, workspace): staging_kbranch = get_staging_kbranch(srcdir) if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): oe.path.copyhardlinktree(srcdir, srctree) - workdir = rd.getVar('WORKDIR') unpackdir = rd.getVar('UNPACKDIR') srcsubdir = rd.getVar('S') - localfilesdir = os.path.join(srctree, 'oe-local-files') # Add locally copied files to gitignore as we add back to the metadata directly local_files = oe.recipeutils.get_recipe_local_files(rd)