summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Amstutz <florian.amstutz@scs.ch>2021-06-30 05:00:12 -0700
committerAnuj Mittal <anuj.mittal@intel.com>2021-07-13 13:48:58 +0800
commit421a199ad31f7cd7fb50e3abf9cdd41fed5532dd (patch)
tree454d5f02bc8ccd8e775997312d59e845ab5473b1
parent3bea0da687d28c80f0b63e2ad81573a3601bb482 (diff)
downloadopenembedded-core-contrib-421a199ad31f7cd7fb50e3abf9cdd41fed5532dd.tar.gz
devtool: deploy-target: Fix preserving attributes when using --strip
Commit a2db4fa127a3347fc6df31f895fb0b552669119e added ${WORKDIR}/deploy-* to PSEUDO_IGNORE_PATHS. This breaks the --strip mode since ${D} is copied to deploy-target-stripped. Use the directory devtool-deploy-target-stripped instead. [YOCTO #14451] Signed-off-by: Florian Amstutz <florian.amstutz@scs.ch> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 02661f20faf11d0fa2f1874bd423f5d9fa7a31c9) 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 e5af2c95ae..833322571f 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -168,7 +168,7 @@ def deploy(args, config, basepath, workspace):
if args.strip and not args.dry_run:
# Fakeroot copy to new destination
srcdir = recipe_outdir
- recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'deploy-target-stripped')
+ 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, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True)