MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

devtool: drop S = WORKDIR workaround

Browse Source 
Dropping support for S = WORKDIR allows to drop this ugly workaround.

With S = WORKDIR it was possible to refer to a file via oe-local-files
symlink or via direct file path. Ensuring the pseudo database is
consistent for both paths was extra complicated and required this bad
function. Really nice to drop it now!

(From OE-Core rev: 2b799fdf267f44c26797593984d9828c4fd0fd31)

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Freihofer 2024-09-22 17:43:14 +02:00 committed by Richard Purdie
parent 8634e46b40
commit 21917a63ab
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/lib/oeqa/selftest/cases/devtool.py
View File

@ -2585,11 +2585,6 @@ class DevtoolIdeSdkTests(DevtoolBase):
i_and_d_script_path = os.path.join(
self._workspace_scripts_dir(recipe_name), i_and_d_script)
self.assertExists(i_and_d_script_path)
del_script = "delete_package_dirs_" + recipe_id
del_script_path = os.path.join(
self._workspace_scripts_dir(recipe_name), del_script)
self.assertExists(del_script_path)
runCmd(del_script_path, cwd=tempdir)
def _devtool_ide_sdk_qemu(self, tempdir, qemu, recipe_name, example_exe):
"""Verify deployment and execution in Qemu system work for one recipe.

38
scripts/lib/devtool/ide_sdk.py
View File

@ -712,42 +712,6 @@ class RecipeModified:
binaries.append(abs_name[d_len:])
return sorted(binaries)
def gen_delete_package_dirs(self):
"""delete folders of package tasks
This is a workaround for and issue with recipes having their sources
downloaded as file://
This likely breaks pseudo like:
path mismatch [3 links]: ino 79147802 db
.../build/tmp/.../cmake-example/1.0/package/usr/src/debug/
cmake-example/1.0-r0/oe-local-files/cpp-example-lib.cpp
.../build/workspace/sources/cmake-example/oe-local-files/cpp-example-lib.cpp
Since the files are anyway outdated lets deleted them (also from pseudo's db) to workaround this issue.
"""
cmd_lines = ['#!/bin/sh']
# Set up the appropriate environment
newenv = dict(os.environ)
for varvalue in self.fakerootenv.split():
if '=' in varvalue:
splitval = varvalue.split('=', 1)
newenv[splitval[0]] = splitval[1]
# Replicate the environment variables from bitbake
for var, val in newenv.items():
if not RecipeModified.is_valid_shell_variable(var):
continue
cmd_lines.append('%s="%s"' % (var, val))
cmd_lines.append('export %s' % var)
# Delete the folders
pkg_dirs = ' '.join([os.path.join(self.workdir, d) for d in [
"package", "packages-split", "pkgdata", "sstate-install-package", "debugsources.list", "*.spec"]])
cmd = "%s rm -rf %s" % (self.fakerootcmd, pkg_dirs)
cmd_lines.append('%s || { "%s failed"; exit 1; }' % (cmd, cmd))
return self.write_script(cmd_lines, 'delete_package_dirs')
def gen_deploy_target_script(self, args):
"""Generate a script which does what devtool deploy-target does
@ -785,8 +749,6 @@ class RecipeModified:
"""Generate a script which does install and deploy"""
cmd_lines = ['#!/bin/bash']
cmd_lines.append(self.gen_delete_package_dirs())
# . oe-init-build-env $BUILDDIR
# Note: Sourcing scripts with arguments requires bash
cmd_lines.append('cd "%s" || { echo "cd %s failed"; exit 1; }' % (