[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6480/8267] runqemu: drop RPC ports

[Emmanuele Bassi <ebassi src gnome org>]

commit 4d54ebab89595f0df38c58311b7bb012f591ec77
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Jun 22 01:30:06 2017 -0700

    runqemu: drop RPC ports
    
    The following commit has removed rpc ports from runqemu-export-rootfs, so
    runqemu should also remove them, otherwise "runqemu nfs" doesn't work. And use
    abspath for nfsroot, otherwise it doesn't work when it is a relative path.
    
    commit 6bb9860ef7ba9c84fe9bd3a81aa6555f67ebd38e
    Author: Cody P Schafer <dev codyps com>
    Date:   Tue Jun 6 18:30:49 2017 -0400
    
        runqemu-export-rootfs: don't change RPC ports
    
    [YOCTO #11687]
    
    (From OE-Core rev: d7c5c9344de6974997c39097a7767ec338c3cca3)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 26328e5..41b870c 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -784,16 +784,12 @@ class BaseConfig(object):
             all_instances.sort(key=int)
             self.nfs_instance = int(all_instances.pop()) + 1
 
-        mountd_rpcport = 21111 + self.nfs_instance
-        nfsd_rpcport = 11111 + self.nfs_instance
         nfsd_port = 3049 + 2 * self.nfs_instance
         mountd_port = 3048 + 2 * self.nfs_instance
 
         # Export vars for runqemu-export-rootfs
         export_dict = {
             'NFS_INSTANCE': self.nfs_instance,
-            'MOUNTD_RPCPORT': mountd_rpcport,
-            'NFSD_RPCPORT': nfsd_rpcport,
             'NFSD_PORT': nfsd_port,
             'MOUNTD_PORT': mountd_port,
         }
@@ -801,7 +797,7 @@ class BaseConfig(object):
             # Use '%s' since they are integers
             os.putenv(k, '%s' % v)
 
-        self.unfs_opts="nfsvers=3,port=%s,mountprog=%s,nfsprog=%s,udp,mountport=%s" % (nfsd_port, 
mountd_rpcport, nfsd_rpcport, mountd_port)
+        self.unfs_opts="nfsvers=3,port=%s,udp,mountport=%s" % (nfsd_port, mountd_port)
 
         # Extract .tar.bz2 or .tar.bz if no nfs dir
         if not (self.rootfs and os.path.isdir(self.rootfs)):
@@ -1006,7 +1002,7 @@ class BaseConfig(object):
 
         if self.fstype == 'nfs':
             self.rootfs_options = ''
-            k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, self.rootfs, self.unfs_opts)
+            k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, os.path.abspath(self.rootfs), 
self.unfs_opts)
             self.kernel_cmdline = 'root=%s rw highres=off' % k_root
 
         if self.fstype == 'none':