diff mbox series

devtool: deploy-target: Remove stripped binaries in pseudo context

Message ID x2nP.1643796914734675638.1xeB@lists.openembedded.org
State Accepted, archived
Commit 2338a33b690b0bbe279cde3f73764911b239cb50
Headers show
Series devtool: deploy-target: Remove stripped binaries in pseudo context | expand

Commit Message

Florian Amstutz Feb. 2, 2022, 10:15 a.m. UTC 
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>
---
scripts/lib/devtool/deploy.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--
2.25.1
diff mbox series

Patch

diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index 833322571f..e14a587417 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'),