summaryrefslogtreecommitdiffstats
path: root/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2020-02-18 16:33:28 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-11 14:41:44 +0000
commitcff864901861f80e0c3ed030499ae88d5f01befc (patch)
treef85cd59aaf8615f1f836fb18e98d4c0660c96317 /documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
parent0daf901b5be2c1e3ac7e4c274b293e4679ecc10d (diff)
downloadpoky-cff864901861f80e0c3ed030499ae88d5f01befc.tar.gz
manuals: Updates to reflect that MACHINE defaults to qemux86-64
meta-yocto commit 69ddecdb1516 [local.conf.sample: change default MACHINE to qemux86-64] switched the default MACHINE from 'qemux86' to 'qemux86-64' but some documents which either explicitly mentioned the default, or where this was implicit didn't receive an equivalent update. Where it made sense we continue this change in default to the docs. In other places, such as the kernel-dev manual, we note the new default and instruct the user how to switch back to 'qemux86'. Eventually we should probably update the kernel-dev manual to use the default, but for now the intention was to limit the impact of these changes. Note that ext3 has also been replaced with ext4 for image generation, so while we are modifying runqemu lines to qemux86-64 we also make the change to reference ext4 such that the runqemu commands will function properly. (From yocto-docs rev: 8c1d8ab1170f47a2c2692beb903ab0b7c6835b7b) Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml')
-rw-r--r--documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
index 1daeb2547f..15dd1af42d 100644
--- a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
+++ b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
@@ -266,7 +266,7 @@
266 meta-toolchain 266 meta-toolchain
267 meta-ide-support 267 meta-ide-support
268 268
269 You can also run generated qemu images with a command like 'runqemu qemux86' 269 You can also run generated qemu images with a command like 'runqemu qemux86-64'
270 </literallayout> 270 </literallayout>
271 Among other things, the script creates the 271 Among other things, the script creates the
272 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink>, 272 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink>,
@@ -332,7 +332,7 @@
332 QEMU, which is a Quick EMUlator that ships with 332 QEMU, which is a Quick EMUlator that ships with
333 the Yocto Project: 333 the Yocto Project:
334 <literallayout class='monospaced'> 334 <literallayout class='monospaced'>
335 $ runqemu qemux86 335 $ runqemu qemux86-64
336 </literallayout> 336 </literallayout>
337 If you want to learn more about running QEMU, see the 337 If you want to learn more about running QEMU, see the
338 "<ulink url="&YOCTO_DOCS_DEV_URL;#dev-manual-qemu">Using the Quick EMUlator (QEMU)</ulink>" 338 "<ulink url="&YOCTO_DOCS_DEV_URL;#dev-manual-qemu">Using the Quick EMUlator (QEMU)</ulink>"