[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6490/8267] oe-init-build-env-memres: swap parameter order

[Emmanuele Bassi <ebassi src gnome org>]

commit 14cea1a05fce23f00a98411951a855e075cbaec3
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Wed Jun 21 21:49:54 2017 +0200

    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>

 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 9e1425e..3f0d239 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -19,18 +19,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #
-# Normally this is called as '. ./oe-init-build-env-memres <portnumber> <builddir>'
+# Normally this is called as '. ./oe-init-build-env-memres <builddir> [portnumber]'
 #
 # This works in most shells (not dash), but not all of them pass the arguments
-# when being sourced.  To workaround the shell limitation use "set <portnumber>
-# <builddir>" prior to sourcing this script.
+# when being sourced.  To workaround the shell limitation use "set <builddir>
+# [portnumber]" prior to sourcing this script.
 #
-if [ -z "$1" ]; then
+if [ -z "$2" ]; then
     echo "No port specified, using dynamically selected port"
     port=-1
 else
-    port=$1
-    shift
+    port=$2
+    set -- "$1" "$3" "$4" "$5" "$6"
 fi
 
 if [ -n "$BASH_SOURCE" ]; then