[PATCH v2 03/14] devtool: ide-sdk: fix $@ overwritten by set in install_and_deploy script

[AdrianF <adrian.freihofer@siemens.com>]

From: Adrian Freihofer <adrian.freihofer@siemens.com>

The generated install_and_deploy shell script uses 'set $BUILDDIR $BITBAKEDIR'
to pass arguments to oe-init-build-env.  This overwrites $@, so the original
command-line arguments (e.g. -t user@host -P 2222) are lost before the
embedded deploy script can read them.

Save the original arguments in $_args before the 'set' call and pass
$_args to the deploy script instead of $@.

Extend the argument-parsing loop in the embedded Python deploy script to
handle -P/--port in addition to -t/--target, so that non-default SSH
ports are forwarded to devtool deploy-target.

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
---
 scripts/lib/devtool/ide_sdk.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py
index fea44740f3..940bb8211e 100755
--- a/scripts/lib/devtool/ide_sdk.py
+++ b/scripts/lib/devtool/ide_sdk.py
@@ -988,9 +988,16 @@ class RecipeModified:
         cmd_lines.append('        for key in my_dict:')
         cmd_lines.append('            setattr(self, key, my_dict[key])')
         cmd_lines.append('filtered_args = Dict2Class(filtered_args_dict)')
-        cmd_lines.append('if len(sys.argv) > 2:')
-        cmd_lines.append('    if sys.argv[1] == "-t" or sys.argv[1] == "--target":')
-        cmd_lines.append('        setattr(filtered_args, "target", sys.argv[2])')
+        cmd_lines.append('i = 1')
+        cmd_lines.append('while i < len(sys.argv) - 1:')
+        cmd_lines.append('    if sys.argv[i] in ("-t", "--target"):')
+        cmd_lines.append('        setattr(filtered_args, "target", sys.argv[i + 1])')
+        cmd_lines.append('        i += 2')
+        cmd_lines.append('    elif sys.argv[i] in ("-P", "--port"):')
+        cmd_lines.append('        setattr(filtered_args, "port", sys.argv[i + 1])')
+        cmd_lines.append('        i += 2')
+        cmd_lines.append('    else:')
+        cmd_lines.append('        i += 1')
         cmd_lines.append(
             'setattr(filtered_args, "recipename", "%s")' % self.bpn)
         cmd_lines.append('deploy_no_d("%s", "%s", "%s", "%s", "%s", "%s", %d, "%s", "%s", filtered_args)' %
@@ -1003,6 +1010,8 @@ class RecipeModified:
         """Generate a script which does install and deploy"""
         cmd_lines = ['#!/bin/sh']
 
+        # Save the original command-line args before 'set' overwrites $@
+        cmd_lines.append('_args="$@"')
         # . oe-init-build-env $BUILDDIR $BITBAKEDIR
         # Using 'set' to pass the build directory to oe-init-build-env in sh syntax
         cmd_lines.append('cd "%s" || { echo "cd %s failed"; exit 1; }' % (
@@ -1015,8 +1024,8 @@ class RecipeModified:
         cmd_lines.append(
             'bitbake %s -c install --force || { echo "bitbake %s -c install --force failed"; exit 1; }' % (self.bpn, self.bpn))
 
-        # Self contained devtool deploy-target
-        cmd_lines.append(self.gen_deploy_target_script(args) + ' "$@"')
+        # Self contained devtool deploy-target - use saved args, not $@ (overwritten by 'set')
+        cmd_lines.append(self.gen_deploy_target_script(args) + ' $_args')
 
         return self.write_script(cmd_lines, 'install_and_deploy')
 
-- 
2.55.0