diff options
| author |   Florian Amstutz <florian.amstutz@scs.ch> | 2022-02-02 02:15:14 -0800 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-02-19 09:59:34 -1000 |
| commit | b293bcf4c312156cb57814dd71f13f8ab2a8ae80 (patch) | |
| tree | d11a7e24c2dbab51d3a1ccd3e99074f32cc208a2 /scripts | |
| parent | 64434ffd6d406e4c3d1e9ca2fb72fa97990346d8 (diff) | |
| download | openembedded-core-contrib-b293bcf4c312156cb57814dd71f13f8ab2a8ae80.tar.gz | |
devtool: deploy-target: Remove stripped binaries in pseudo context
deploy-target may fail the second time with "pseudo abort" because
devtool-deploy-target-stripped is deleted outside of pseudo's fakeroot
context.
Signed-off-by: Florian Amstutz <florian.amstutz@scs.ch>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2338a33b690b0bbe279cde3f73764911b239cb50)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/deploy.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index d802b22e8f..e0f8e64b9c 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py @@ -170,7 +170,7 @@ def deploy(args, config, basepath, workspace): srcdir = recipe_outdir recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'devtool-deploy-target-stripped') if os.path.isdir(recipe_outdir): - bb.utils.remove(recipe_outdir, True) + exec_fakeroot(rd, "rm -rf %s" % recipe_outdir, shell=True) exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), |