diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 7d61773980..1739c84853 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -2585,11 +2585,6 @@ class DevtoolIdeSdkTests(DevtoolBase): i_and_d_script_path = os.path.join( self._workspace_scripts_dir(recipe_name), i_and_d_script) self.assertExists(i_and_d_script_path) - del_script = "delete_package_dirs_" + recipe_id - del_script_path = os.path.join( - self._workspace_scripts_dir(recipe_name), del_script) - self.assertExists(del_script_path) - runCmd(del_script_path, cwd=tempdir) def _devtool_ide_sdk_qemu(self, tempdir, qemu, recipe_name, example_exe): """Verify deployment and execution in Qemu system work for one recipe. diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 65873b088d..350a8b02ca 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -712,42 +712,6 @@ class RecipeModified: binaries.append(abs_name[d_len:]) return sorted(binaries) - def gen_delete_package_dirs(self): - """delete folders of package tasks - - This is a workaround for and issue with recipes having their sources - downloaded as file:// - This likely breaks pseudo like: - path mismatch [3 links]: ino 79147802 db - .../build/tmp/.../cmake-example/1.0/package/usr/src/debug/ - cmake-example/1.0-r0/oe-local-files/cpp-example-lib.cpp - .../build/workspace/sources/cmake-example/oe-local-files/cpp-example-lib.cpp - Since the files are anyway outdated lets deleted them (also from pseudo's db) to workaround this issue. - """ - cmd_lines = ['#!/bin/sh'] - - # Set up the appropriate environment - newenv = dict(os.environ) - for varvalue in self.fakerootenv.split(): - if '=' in varvalue: - splitval = varvalue.split('=', 1) - newenv[splitval[0]] = splitval[1] - - # Replicate the environment variables from bitbake - for var, val in newenv.items(): - if not RecipeModified.is_valid_shell_variable(var): - continue - cmd_lines.append('%s="%s"' % (var, val)) - cmd_lines.append('export %s' % var) - - # Delete the folders - pkg_dirs = ' '.join([os.path.join(self.workdir, d) for d in [ - "package", "packages-split", "pkgdata", "sstate-install-package", "debugsources.list", "*.spec"]]) - cmd = "%s rm -rf %s" % (self.fakerootcmd, pkg_dirs) - cmd_lines.append('%s || { "%s failed"; exit 1; }' % (cmd, cmd)) - - return self.write_script(cmd_lines, 'delete_package_dirs') - def gen_deploy_target_script(self, args): """Generate a script which does what devtool deploy-target does @@ -785,8 +749,6 @@ class RecipeModified: """Generate a script which does install and deploy""" cmd_lines = ['#!/bin/bash'] - cmd_lines.append(self.gen_delete_package_dirs()) - # . oe-init-build-env $BUILDDIR # Note: Sourcing scripts with arguments requires bash cmd_lines.append('cd "%s" || { echo "cd %s failed"; exit 1; }' % (