diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 | ||||
-rwxr-xr-x | scripts/crosstap | 2 | ||||
-rwxr-xr-x | scripts/oe-setup-builddir | 8 | ||||
-rwxr-xr-x | scripts/runqemu | 16 |
4 files changed, 14 insertions, 14 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 5637a02451..642f0eb637 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py | |||
@@ -217,7 +217,7 @@ class TestImage(OESelftestTestCase): | |||
217 | if distro and distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04', 'almalinux-8.5']: | 217 | if distro and distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04', 'almalinux-8.5']: |
218 | self.skipTest('virgl headless cannot be tested with %s' %(distro)) | 218 | self.skipTest('virgl headless cannot be tested with %s' %(distro)) |
219 | 219 | ||
220 | render_hint = """If /dev/dri/renderD* is absent due to lack of suitable GPU, 'modprobe vgem' will create one sutable for mesa llvmpipe sofware renderer.""" | 220 | render_hint = """If /dev/dri/renderD* is absent due to lack of suitable GPU, 'modprobe vgem' will create one suitable for mesa llvmpipe software renderer.""" |
221 | try: | 221 | try: |
222 | content = os.listdir("/dev/dri") | 222 | content = os.listdir("/dev/dri") |
223 | if len([i for i in content if i.startswith('render')]) == 0: | 223 | if len([i for i in content if i.startswith('render')]) == 0: |
diff --git a/scripts/crosstap b/scripts/crosstap index 73c8947442..5aa72f14d4 100755 --- a/scripts/crosstap +++ b/scripts/crosstap | |||
@@ -353,7 +353,7 @@ bitbake workspace. | |||
353 | 353 | ||
354 | Anything after -- option is passed directly to stap. | 354 | Anything after -- option is passed directly to stap. |
355 | 355 | ||
356 | Legacy script invocation style supported but depreciated: | 356 | Legacy script invocation style supported but deprecated: |
357 | %prog <user@hostname> <sytemtap-script> [systemtap options] | 357 | %prog <user@hostname> <sytemtap-script> [systemtap options] |
358 | 358 | ||
359 | To enable most out of systemtap the following site.conf or local.conf | 359 | To enable most out of systemtap the following site.conf or local.conf |
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5a51fa793f..d4ac074ad9 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir | |||
@@ -94,9 +94,9 @@ into your configuration please add entries to conf/bblayers.conf. | |||
94 | 94 | ||
95 | EOM | 95 | EOM |
96 | 96 | ||
97 | # Put the abosolute path to the layers in bblayers.conf so we can run | 97 | # Put the absolute path to the layers in bblayers.conf so we can run |
98 | # bitbake without the init script after the first run | 98 | # bitbake without the init script after the first run. |
99 | # ##COREBASE## is deprecated as it's meaning was inconsistent, but continue | 99 | # ##COREBASE## is deprecated as its meaning was inconsistent, but continue |
100 | # to replace it for compatibility. | 100 | # to replace it for compatibility. |
101 | sed -e "s|##OEROOT##|$OEROOT|g" \ | 101 | sed -e "s|##OEROOT##|$OEROOT|g" \ |
102 | -e "s|##COREBASE##|$OEROOT|g" \ | 102 | -e "s|##COREBASE##|$OEROOT|g" \ |
@@ -115,7 +115,7 @@ The Yocto Project has extensive documentation about OE including a reference | |||
115 | manual which can be found at: | 115 | manual which can be found at: |
116 | https://docs.yoctoproject.org | 116 | https://docs.yoctoproject.org |
117 | 117 | ||
118 | For more information about OpenEmbedded see their website: | 118 | For more information about OpenEmbedded see the website: |
119 | https://www.openembedded.org/ | 119 | https://www.openembedded.org/ |
120 | 120 | ||
121 | EOM | 121 | EOM |
diff --git a/scripts/runqemu b/scripts/runqemu index 5c108ec23a..9ddd47267c 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -73,11 +73,11 @@ of the following environment variables (in any order): | |||
73 | gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs gtk or sdl options) | 73 | gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs gtk or sdl options) |
74 | egl-headless - enable headless EGL output; use vnc (via publicvnc option) or spice to see it | 74 | egl-headless - enable headless EGL output; use vnc (via publicvnc option) or spice to see it |
75 | (hint: if /dev/dri/renderD* is absent due to lack of suitable GPU, 'modprobe vgem' will create | 75 | (hint: if /dev/dri/renderD* is absent due to lack of suitable GPU, 'modprobe vgem' will create |
76 | one sutable for mesa llvmpipe sofware renderer) | 76 | one suitable for mesa llvmpipe software renderer) |
77 | serial - enable a serial console on /dev/ttyS0 | 77 | serial - enable a serial console on /dev/ttyS0 |
78 | serialstdio - enable a serial console on the console (regardless of graphics mode) | 78 | serialstdio - enable a serial console on the console (regardless of graphics mode) |
79 | slirp - enable user networking, no root privileges is required | 79 | slirp - enable user networking, no root privilege is required |
80 | snapshot - don't write changes to back to images | 80 | snapshot - don't write changes back to images |
81 | kvm - enable KVM when running x86/x86_64 (VT-capable CPU required) | 81 | kvm - enable KVM when running x86/x86_64 (VT-capable CPU required) |
82 | kvm-vhost - enable KVM with vhost when running x86/x86_64 (VT-capable CPU required) | 82 | kvm-vhost - enable KVM with vhost when running x86/x86_64 (VT-capable CPU required) |
83 | publicvnc - enable a VNC server open to all hosts | 83 | publicvnc - enable a VNC server open to all hosts |
@@ -352,10 +352,10 @@ class BaseConfig(object): | |||
352 | def check_arg_path(self, p): | 352 | def check_arg_path(self, p): |
353 | """ | 353 | """ |
354 | - Check whether it is <image>.qemuboot.conf or contains <image>.qemuboot.conf | 354 | - Check whether it is <image>.qemuboot.conf or contains <image>.qemuboot.conf |
355 | - Check whether is a kernel file | 355 | - Check whether it is a kernel file |
356 | - Check whether is a image file | 356 | - Check whether it is an image file |
357 | - Check whether it is a nfs dir | 357 | - Check whether it is an NFS dir |
358 | - Check whether it is a OVMF flash file | 358 | - Check whether it is an OVMF flash file |
359 | """ | 359 | """ |
360 | if p.endswith('.qemuboot.conf'): | 360 | if p.endswith('.qemuboot.conf'): |
361 | self.qemuboot = p | 361 | self.qemuboot = p |
@@ -366,7 +366,7 @@ class BaseConfig(object): | |||
366 | self.kernel = p | 366 | self.kernel = p |
367 | elif os.path.exists(p) and (not os.path.isdir(p)) and '-image-' in os.path.basename(p): | 367 | elif os.path.exists(p) and (not os.path.isdir(p)) and '-image-' in os.path.basename(p): |
368 | self.rootfs = p | 368 | self.rootfs = p |
369 | # Check filename against self.fstypes can hanlde <file>.cpio.gz, | 369 | # Check filename against self.fstypes can handle <file>.cpio.gz, |
370 | # otherwise, its type would be "gz", which is incorrect. | 370 | # otherwise, its type would be "gz", which is incorrect. |
371 | fst = "" | 371 | fst = "" |
372 | for t in self.fstypes: | 372 | for t in self.fstypes: |