diff options
Diffstat (limited to 'scripts/lib/devtool/deploy.py')
-rw-r--r-- | scripts/lib/devtool/deploy.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index aaa25dda08..b4f9fbfe45 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py | |||
@@ -168,9 +168,9 @@ 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 | exec_fakeroot(rd, "rm -rf %s" % recipe_outdir, shell=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) |
175 | os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) | 175 | os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) |
176 | oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), | 176 | oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), |
@@ -201,9 +201,9 @@ def deploy(args, config, basepath, workspace): | |||
201 | print(' %s' % item) | 201 | print(' %s' % item) |
202 | return 0 | 202 | return 0 |
203 | 203 | ||
204 | extraoptions = '' | 204 | extraoptions = '-o HostKeyAlgorithms=+ssh-rsa' |
205 | if args.no_host_check: | 205 | if args.no_host_check: |
206 | extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' | 206 | extraoptions += ' -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' |
207 | if not args.show_status: | 207 | if not args.show_status: |
208 | extraoptions += ' -q' | 208 | extraoptions += ' -q' |
209 | 209 | ||
@@ -274,9 +274,9 @@ def undeploy(args, config, basepath, workspace): | |||
274 | elif not args.recipename and not args.all: | 274 | elif not args.recipename and not args.all: |
275 | raise argparse_oe.ArgumentUsageError('If you don\'t specify a recipe, you must specify -a/--all', 'undeploy-target') | 275 | raise argparse_oe.ArgumentUsageError('If you don\'t specify a recipe, you must specify -a/--all', 'undeploy-target') |
276 | 276 | ||
277 | extraoptions = '' | 277 | extraoptions = '-o HostKeyAlgorithms=+ssh-rsa' |
278 | if args.no_host_check: | 278 | if args.no_host_check: |
279 | extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' | 279 | extraoptions += ' -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' |
280 | if not args.show_status: | 280 | if not args.show_status: |
281 | extraoptions += ' -q' | 281 | extraoptions += ' -q' |
282 | 282 | ||