diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2020-11-20 20:17:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-04 10:55:00 +0000 |
commit | fa0cb4d34b1073f215fa3c680f2316208739d53d (patch) | |
tree | ba89c1f4289fd6456af4409a6a19caf6548dfb9c /documentation/dev-manual/dev-manual-qemu.xml | |
parent | a038e58f3cd82c56102444bdc5ac76c9f1550a0d (diff) | |
download | poky-fa0cb4d34b1073f215fa3c680f2316208739d53d.tar.gz |
sphinx: import docs
The Yocto Project docs was migrated from Docbook to Sphinx in YP
3.2. This 3.1 is an LTS release, and since 3.1 docs are 'close to'
the docs in 3.2, we agreed to backport sphinx docs onto 3.1.
This first patch brings all changes done in 3.2 until:
7f64574f7 README: include detailed information about sphinx
There are other changes after this commit, but they will be
selectively backported in individual patches.
This patch was generated with the following command:
git cherry-pick -n \
$(git log --reverse --oneline \
ac352ad7f95db7eeacb53c2778caa31800bd7c26..7f64574f7 \
| cut -f1 -d' ')
The following commits were applies in the dunfell docs, but not in
master, so they were first reverted (and squashed into this change). A
commit will reintroduce the content from these patches in the Sphinx
files in a followup patch.
069c27574 Documenation: Prepared for the 3.1.1 release
bd140f0f9 Documentation: Add 3.1.1 version updates missing from previous commit
17cc71a8f Documenation: Prepared for the 3.1.2 release
1a69e2c02 Documenation: Prepared for the 3.1.3 release
8910ac1c7 Documenation: Prepared for the 3.1.4 release
(From yocto-docs rev: c25fe058b88b893b0d146f3ed27320b47cdec236)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual/dev-manual-qemu.xml')
-rw-r--r-- | documentation/dev-manual/dev-manual-qemu.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/documentation/dev-manual/dev-manual-qemu.xml b/documentation/dev-manual/dev-manual-qemu.xml index 5ccc0dfe83..1a526dd2f5 100644 --- a/documentation/dev-manual/dev-manual-qemu.xml +++ b/documentation/dev-manual/dev-manual-qemu.xml | |||
@@ -1,6 +1,7 @@ | |||
1 | <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" | 1 | <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" |
2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | 2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" |
3 | [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] > | 3 | [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] > |
4 | <!--SPDX-License-Identifier: CC-BY-2.0-UK--> | ||
4 | 5 | ||
5 | <chapter id='dev-manual-qemu'> | 6 | <chapter id='dev-manual-qemu'> |
6 | 7 | ||
@@ -105,7 +106,7 @@ | |||
105 | You need to be sure you have a pre-built kernel that | 106 | You need to be sure you have a pre-built kernel that |
106 | will boot in QEMU. | 107 | will boot in QEMU. |
107 | You also need the target root filesystem for your target | 108 | You also need the target root filesystem for your target |
108 | machine’s architecture: | 109 | machine's architecture: |
109 | <itemizedlist> | 110 | <itemizedlist> |
110 | <listitem><para> | 111 | <listitem><para> |
111 | If you have previously built an image for QEMU | 112 | If you have previously built an image for QEMU |
@@ -552,7 +553,7 @@ | |||
552 | A root filesystem that has one of the following | 553 | A root filesystem that has one of the following |
553 | filetype extensions: "ext2", "ext3", "ext4", "jffs2", | 554 | filetype extensions: "ext2", "ext3", "ext4", "jffs2", |
554 | "nfs", or "btrfs". | 555 | "nfs", or "btrfs". |
555 | If the filename you provide for this option uses “nfs”, it | 556 | If the filename you provide for this option uses "nfs", it |
556 | must provide an explicit root filesystem path. | 557 | must provide an explicit root filesystem path. |
557 | </para></listitem> | 558 | </para></listitem> |
558 | <listitem><para> | 559 | <listitem><para> |
@@ -566,7 +567,7 @@ | |||
566 | <replaceable>MACHINE</replaceable>: | 567 | <replaceable>MACHINE</replaceable>: |
567 | The architecture of the QEMU machine, which must be one | 568 | The architecture of the QEMU machine, which must be one |
568 | of the following: "qemux86", "qemux86-64", "qemuarm", | 569 | of the following: "qemux86", "qemux86-64", "qemuarm", |
569 | "qemuarm64", "qemumips", “qemumips64", or "qemuppc". | 570 | "qemuarm64", "qemumips", "qemumips64", or "qemuppc". |
570 | The <replaceable>MACHINE</replaceable> and | 571 | The <replaceable>MACHINE</replaceable> and |
571 | <replaceable>QEMUARCH</replaceable> options are basically | 572 | <replaceable>QEMUARCH</replaceable> options are basically |
572 | identical. | 573 | identical. |
@@ -673,7 +674,7 @@ qemux86" or "qemux86-64". | |||
673 | <listitem><para> | 674 | <listitem><para> |
674 | The build host <filename>/dev/vhost-net</filename> | 675 | The build host <filename>/dev/vhost-net</filename> |
675 | directory has to be either readable or writable | 676 | directory has to be either readable or writable |
676 | and “slirp-enabled”. | 677 | and "slirp-enabled". |
677 | </para></listitem> | 678 | </para></listitem> |
678 | </itemizedlist> | 679 | </itemizedlist> |
679 | </para></listitem> | 680 | </para></listitem> |