runqemu: use bindir_native property to run ifup/down scripts
Used self.bindir_native to point out to the native sysroot when running runqemu-ifup and runqemu-ifdown scripts. [YOCTO #11266] [YOCTO #11193] (From OE-Core rev: cc5513bf7a6114e14bb307acb88a44e9cf0aed8a) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
4d3bececf6
commit
4393cc550b
|
@ -920,7 +920,7 @@ class BaseConfig(object):
|
|||
gid = os.getgid()
|
||||
uid = os.getuid()
|
||||
logger.info("Setting up tap interface under sudo")
|
||||
cmd = 'sudo %s %s %s %s' % (self.qemuifup, uid, gid, self.get('STAGING_DIR_NATIVE'))
|
||||
cmd = 'sudo %s %s %s %s' % (self.qemuifup, uid, gid, self.bindir_native)
|
||||
tap = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8').rstrip('\n')
|
||||
lockfile = os.path.join(lockdir, tap)
|
||||
self.lock = lockfile + '.lock'
|
||||
|
@ -1140,7 +1140,7 @@ class BaseConfig(object):
|
|||
|
||||
def cleanup(self):
|
||||
if self.cleantap:
|
||||
cmd = 'sudo %s %s %s' % (self.qemuifdown, self.tap, self.get('STAGING_DIR_NATIVE'))
|
||||
cmd = 'sudo %s %s %s' % (self.qemuifdown, self.tap, self.bindir_native)
|
||||
logger.info('Running %s' % cmd)
|
||||
subprocess.call(cmd, shell=True)
|
||||
if self.lock_descriptor:
|
||||
|
|
|
@ -41,11 +41,11 @@ if [ $# -ne 2 ]; then
|
|||
fi
|
||||
|
||||
TAP=$1
|
||||
NATIVE_SYSROOT_DIR=$2
|
||||
STAGING_BINDIR_NATIVE=$2
|
||||
|
||||
TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl
|
||||
TUNCTL=$STAGING_BINDIR_NATIVE/tunctl
|
||||
if [ ! -e "$TUNCTL" ]; then
|
||||
echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native"
|
||||
echo "Error: Unable to find tunctl binary in '$STAGING_BINDIR_NATIVE', please bitbake qemu-helper-native"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
|
@ -49,11 +49,11 @@ fi
|
|||
|
||||
USERID="-u $1"
|
||||
GROUP="-g $2"
|
||||
NATIVE_SYSROOT_DIR=$3
|
||||
STAGING_BINDIR_NATIVE=$3
|
||||
|
||||
TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl
|
||||
TUNCTL=$STAGING_BINDIR_NATIVE/tunctl
|
||||
if [ ! -x "$TUNCTL" ]; then
|
||||
echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native"
|
||||
echo "Error: Unable to find tunctl binary in '$STAGING_BINDIR_NATIVE', please bitbake qemu-helper-native"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue