diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-06-21 21:49:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-28 15:52:17 +0100 |
commit | 14cea1a05fce23f00a98411951a855e075cbaec3 (patch) | |
tree | e59063596c228afaaaf421045a6fcd5e82f0fb22 /oe-init-build-env-memres | |
parent | ad0d9ce3c6993288194bd06d8f3563cd09490389 (diff) | |
download | poky-14cea1a05fce23f00a98411951a855e075cbaec3.tar.gz |
oe-init-build-env-memres: swap parameter order
This script expected the port number to be specified first, which is
somewhat counter-intuitive especially if you're used to
oe-init-build-env; besides, in local usage you are unlikely to need to
specify a custom port. Given that few people are using this yet (based
on the issues I have recently fixed), switch the arguments around so
that the two scripts behave consistently.
(From OE-Core rev: 5d8f4c46329fbd38ebd034c1e32aa49dfec5f529)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'oe-init-build-env-memres')
-rwxr-xr-x | oe-init-build-env-memres | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres index 9e1425ea83..3f0d239a10 100755 --- a/oe-init-build-env-memres +++ b/oe-init-build-env-memres | |||
@@ -19,18 +19,18 @@ | |||
19 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
20 | 20 | ||
21 | # | 21 | # |
22 | # Normally this is called as '. ./oe-init-build-env-memres <portnumber> <builddir>' | 22 | # Normally this is called as '. ./oe-init-build-env-memres <builddir> [portnumber]' |
23 | # | 23 | # |
24 | # This works in most shells (not dash), but not all of them pass the arguments | 24 | # This works in most shells (not dash), but not all of them pass the arguments |
25 | # when being sourced. To workaround the shell limitation use "set <portnumber> | 25 | # when being sourced. To workaround the shell limitation use "set <builddir> |
26 | # <builddir>" prior to sourcing this script. | 26 | # [portnumber]" prior to sourcing this script. |
27 | # | 27 | # |
28 | if [ -z "$1" ]; then | 28 | if [ -z "$2" ]; then |
29 | echo "No port specified, using dynamically selected port" | 29 | echo "No port specified, using dynamically selected port" |
30 | port=-1 | 30 | port=-1 |
31 | else | 31 | else |
32 | port=$1 | 32 | port=$2 |
33 | shift | 33 | set -- "$1" "$3" "$4" "$5" "$6" |
34 | fi | 34 | fi |
35 | 35 | ||
36 | if [ -n "$BASH_SOURCE" ]; then | 36 | if [ -n "$BASH_SOURCE" ]; then |