summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Amstutz <florian.amstutz@scs.ch>2022-02-02 02:15:14 -0800
committerAnuj Mittal <anuj.mittal@intel.com>2022-02-25 11:03:51 +0800
commitc17205c6fea6b7805786e3168a2c6c702f8f4b2e (patch)
treed985d316312be2515c72ed79cacd5b661f1714c4
parent1d9dbc540a23a77f6ddfbdf34a81a639f2ff82f5 (diff)
downloadopenembedded-core-contrib-c17205c6fea6b7805786e3168a2c6c702f8f4b2e.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: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--scripts/lib/devtool/deploy.py2
1 files changed, 1 insertions, 1 deletions
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'),