diff options
| author |   Florian Amstutz <florian.amstutz@scs.ch> | 2021-06-30 05:00:12 -0700 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-07-06 04:37:02 -1000 |
| commit | 9e2c7750f57bd1baa429d2f28a4c836ee57d1bfc (patch) | |
| tree | 5e45aff1460ecdfeee952523615158c2008f3356 | |
| parent | fa49622521b6386d8031b1e7519f087aa9d99b19 (diff) | |
| download | openembedded-core-contrib-9e2c7750f57bd1baa429d2f28a4c836ee57d1bfc.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: Steve Sakoman <steve@sakoman.com>
| -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 aaa25dda08..d802b22e8f 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) |