diff options
author | Florian Amstutz <florian.amstutz@scs.ch> | 2021-06-30 05:00:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-02 07:24:21 +0100 |
commit | 73efc71b2c31a00ea873c32cb24eef95aa2c49c1 (patch) | |
tree | bfd6dcad96920a187951ec0b5b879224e2572bb7 /scripts/lib/devtool/deploy.py | |
parent | 2b3ced714a2388f1dac43915e67fdd6c62892238 (diff) | |
download | poky-73efc71b2c31a00ea873c32cb24eef95aa2c49c1.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]
(From OE-Core rev: 02661f20faf11d0fa2f1874bd423f5d9fa7a31c9)
Signed-off-by: Florian Amstutz <florian.amstutz@scs.ch>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/deploy.py')
-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 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): | |||
168 | if args.strip and not args.dry_run: | 168 | if args.strip and not args.dry_run: |
169 | # Fakeroot copy to new destination | 169 | # Fakeroot copy to new destination |
170 | srcdir = recipe_outdir | 170 | srcdir = recipe_outdir |
171 | recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'deploy-target-stripped') | 171 | recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'devtool-deploy-target-stripped') |
172 | if os.path.isdir(recipe_outdir): | 172 | if os.path.isdir(recipe_outdir): |
173 | bb.utils.remove(recipe_outdir, True) | 173 | bb.utils.remove(recipe_outdir, True) |
174 | exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) | 174 | exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) |