aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Amstutz <florian.amstutz@scs.ch>2021-07-01 19:11:46 +0200
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2021-07-01 19:11:46 +0200
commit8d384b004dc28fa4b615d81b719583280b34993b (patch)
tree9460e64324ad44b5968b4118215b72eb88b17e88
parentec58333b3218b7ae890b4e69fd28c4dadb241474 (diff)
downloadopenembedded-core-contrib-abelloni/master-next-2305.tar.gz
openembedded-core-contrib-abelloni/master-next-2305.tar.bz2
openembedded-core-contrib-abelloni/master-next-2305.zip
devtool: deploy-target: Fix preserving attributes when using --stripabelloni/master-next-2305
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: Alexandre Belloni <alexandre.belloni@bootlin.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)