mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

runqemu: drop RPC ports

Browse Source 
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 6bb9860ef7
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>
This commit is contained in:
Robert Yang
2017-06-22 01:30:06 -07:00
committed by Richard Purdie
parent 1b1d6708dd
commit 4d54ebab89
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/runqemu
View File

@@ -784,16 +784,12 @@ class BaseConfig(object):
all_instances.sort(key=int) all_instances.sort(key=int)
self.nfs_instance = int(all_instances.pop()) + 1 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 nfsd_port = 3049 + 2 * self.nfs_instance
mountd_port = 3048 + 2 * self.nfs_instance mountd_port = 3048 + 2 * self.nfs_instance
# Export vars for runqemu-export-rootfs # Export vars for runqemu-export-rootfs
export_dict = { export_dict = {
'NFS_INSTANCE': self.nfs_instance, 'NFS_INSTANCE': self.nfs_instance,
'MOUNTD_RPCPORT': mountd_rpcport,
'NFSD_RPCPORT': nfsd_rpcport,
'NFSD_PORT': nfsd_port, 'NFSD_PORT': nfsd_port,
'MOUNTD_PORT': mountd_port, 'MOUNTD_PORT': mountd_port,
} }
@@ -801,7 +797,7 @@ class BaseConfig(object):
# Use '%s' since they are integers # Use '%s' since they are integers
os.putenv(k, '%s' % v) 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 # Extract .tar.bz2 or .tar.bz if no nfs dir
if not (self.rootfs and os.path.isdir(self.rootfs)): if not (self.rootfs and os.path.isdir(self.rootfs)):
@@ -1006,7 +1002,7 @@ class BaseConfig(object):
if self.fstype == 'nfs': if self.fstype == 'nfs':
self.rootfs_options = '' 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 self.kernel_cmdline = 'root=%s rw highres=off' % k_root
if self.fstype == 'none': if self.fstype == 'none':