Skip to content

Commit e042558

Browse files
committed
doc: update GSG for v0.1, add console code-block
Console screen shots are hard to maintain, so use the .. code-block:: console directive to show terminal console-like display (black background with white text) Change existing .. code-block:: console uses to .. code-block: none Replace screen-shot images in apl-nuc getting started guide with text-based console display. Update apl-nuc GSG content with v0.1 changes Signed-off-by: David B. Kinder <david.b.kinder@intel.com>
1 parent 1c712c5 commit e042558

File tree

8 files changed

+102
-63
lines changed

8 files changed

+102
-63
lines changed

doc/developer-guides/contribute_guidelines.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ The name in the commit message ``Signed-off-by:`` line and your email must
171171
match the change authorship information. Make sure your :file:`.gitconfig`
172172
is set up correctly by using:
173173

174-
.. code-block:: console
174+
.. code-block:: none
175175
176176
git config --global user.name "David Developer"
177177
git config --global user.email "david.developer@company.com"

doc/getting-started/apl-nuc.rst

Lines changed: 64 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@ on your platform. You'll need a network connection for your platform to
3636
complete this setup.
3737

3838
.. note::
39-
ACRN requires Clear Linux version 22140 or newer. The instructions below
40-
have been validated with version 22140 and need some adjustment to work
41-
with newer versions. You will see a note when the instruction needs to be
42-
adjusted.
39+
40+
ACRN v0.1 (and the current master branch) requires Clear Linux
41+
version 23690 or newer. If you use a newer version of Clear Linux,
42+
you'll need to adjust the instructions below to reference the version
43+
number of Clear Linux you are using.
4344

4445
#. Download the compressed Clear installer image from
45-
https://download.clearlinux.org/releases/22140/clear/clear-22140-installer.img.xz
46+
https://download.clearlinux.org/releases/23690/clear/clear-23690-installer.img.xz
4647
and follow the `Clear Linux installation guide
4748
<https://clearlinux.org/documentation/clear-linux/get-started/bare-metal-install>`__
4849
as a starting point for installing Clear Linux onto your platform. Follow the recommended
@@ -61,11 +62,20 @@ complete this setup.
6162
6263
# swupd autoupdate --disable
6364
65+
#. If you have an older version of Clear Linux already installed
66+
on your hardware, use this command to upgrade Clear Linux
67+
to version 23690 (or newer):
68+
69+
.. code-block:: none
70+
71+
# swupd update -m 23690 # or newer version
72+
6473
#. Use the ``swupd bundle-add`` command and add these Clear Linux bundles:
6574

6675
.. code-block:: none
6776
68-
# swupd bundle-add vim network-basic service-os kernel-pk
77+
# swupd bundle-add vim network-basic service-os kernel-pk \
78+
desktop openssh-server
6979
7080
.. table:: Clear Linux bundles
7181
:widths: auto
@@ -84,6 +94,12 @@ complete this setup.
8494
| kernel-pk | Run the Intel "PK" kernel(product kernel source) |
8595
| | and enterprise-style kernel with backports |
8696
+--------------------+---------------------------------------------------+
97+
| desktop | Graphical desktop application, with Weston |
98+
| | compositing window manager included |
99+
+--------------------+---------------------------------------------------+
100+
| openssh-server | Server-side support for secure connectivity and |
101+
| | remote login using the SSH protocol |
102+
+--------------------+---------------------------------------------------+
87103

88104
Add the ACRN hypervisor to the EFI Partition
89105
============================================
@@ -99,9 +115,9 @@ partition. Follow these steps:
99115
100116
# ls -1 /mnt/EFI/org.clearlinux
101117
bootloaderx64.efi
102-
kernel-org.clearlinux.native.4.16.6-563
103-
kernel-org.clearlinux.pk414-sos.4.14.34-28
104-
kernel-org.clearlinux.pk414-standard.4.14.34-28
118+
kernel-org.clearlinux.native.4.17.6-590
119+
kernel-org.clearlinux.pk414-sos.4.14.52-63
120+
kernel-org.clearlinux.pk414-standard.4.14.52-63
105121
loaderx64.efi
106122
107123
.. note::
@@ -214,24 +230,31 @@ partition. Follow these steps:
214230
# clr-boot-manager set-timeout 20
215231
# clr-boot-manager update
216232
217-
#. Reboot and select "The ACRN Service OS" to boot, as shown in
218-
:numref:`gsg-bootmenu`:
233+
#. Reboot and select "The ACRN Service OS" to boot, as shown below:
219234

220-
.. figure:: images/gsg-bootmenu.png
221-
:align: center
222-
:width: 650px
223-
:name: gsg-bootmenu
224235

225-
ACRN Service OS Boot menu
236+
.. code-block:: console
237+
:emphasize-lines: 1
238+
:caption: ACRN Service OS Boot Menu
239+
240+
=> The ACRN Service OS
241+
Clear Linux OS for Intel Architecture (Clear-linux-native-4.17.6.590)
242+
Clear Linux OS for Intel Architecture (Clear-linux-pk414-sos-4.14.52.63)
243+
Clear Linux OS for Intel Architecture (Clear-linux-pk414-standard-4.14.52.63)
244+
EFI Default Loader
245+
Reboot Into Firmware Interface
226246
227247
#. After booting up the ACRN hypervisor, the Service OS will be launched
228-
automatically by default, as shown in :numref:`gsg-sos-console`:
248+
automatically by default, as shown here:
229249

230-
.. figure:: images/gsg-sos-console.png
231-
:align: center
232-
:name: gsg-sos-console
250+
.. code-block:: console
251+
:caption: Service OS Console
233252
234-
Service OS Console
253+
clr-7259a7c5bbdd4bcaa9a59d5841b4ace login: root
254+
You are required to change your password immediately (administrator enforced)
255+
New password:
256+
Retype new password:
257+
root@clr-7259a7c5bbdd4bcaa9a59d5841b4ace ~ # _
235258
236259
.. note:: You may need to hit ``Enter`` to get a clean login prompt
237260

@@ -249,13 +272,13 @@ automatically enabled after a system restart.
249272
Set up Reference UOS
250273
====================
251274

252-
#. On your platform, download the pre-built reference Clear Linux UOS image into your
253-
(root) home directory:
275+
#. On your platform, download the pre-built reference Clear Linux UOS
276+
image version 23690 (or newer) into your (root) home directory:
254277

255278
.. code-block:: none
256279
257280
# cd ~
258-
# curl -O https://download.clearlinux.org/releases/22140/clear/clear-22140-kvm.img.xz
281+
# curl -O https://download.clearlinux.org/releases/23690/clear/clear-23690-kvm.img.xz
259282
260283
.. note::
261284
In case you want to use or try out a newer version of Clear Linux as the UOS, you can
@@ -266,16 +289,16 @@ Set up Reference UOS
266289

267290
.. code-block:: none
268291
269-
# unxz clear-22140-kvm.img.xz
292+
# unxz clear-23690-kvm.img.xz
270293
271294
#. Deploy the UOS kernel modules to UOS virtual disk image (note: you'll need to use
272295
the same **standard** image version number noted in step 1 above):
273296

274297
.. code-block:: none
275298
276-
# losetup -f -P --show /root/clear-22140-kvm.img
299+
# losetup -f -P --show /root/clear-23690-kvm.img
277300
# mount /dev/loop0p3 /mnt
278-
# cp -r /usr/lib/modules/4.14.34-28.pk414-standard /mnt/lib/modules/
301+
# cp -r /usr/lib/modules/4.14.52-63.pk414-standard /mnt/lib/modules/
279302
# umount /mnt
280303
# sync
281304
@@ -294,7 +317,7 @@ Set up Reference UOS
294317

295318
.. note::
296319
In case you have downloaded a different Clear Linux image than the one above
297-
(``clear-22140-kvm.img.xz``), you will need to modify the Clear Linux file name
320+
(``clear-23690-kvm.img.xz``), you will need to modify the Clear Linux file name
298321
and version number highlighted above (the ``-s 3,virtio-blk`` argument) to match
299322
what you have downloaded above. Likewise, you may need to adjust the kernel file
300323
name on the second line highlighted (check the exact name to be used using:
@@ -359,15 +382,15 @@ each with their own way to install development tools:
359382
* On a Clear Linux development system, install the ``os-clr-on-clr`` bundle to get
360383
the necessary tools:
361384

362-
.. code-block:: console
385+
.. code-block:: none
363386
364387
$ sudo swupd bundle-add os-clr-on-clr
365388
$ sudo swupd bundle-add python3-basic
366389
$ sudo pip3 install kconfiglib
367390
368391
* On a Ubuntu/Debian development system:
369392

370-
.. code-block:: console
393+
.. code-block:: none
371394
372395
$ sudo apt install gcc \
373396
git \
@@ -390,7 +413,7 @@ each with their own way to install development tools:
390413

391414
* On a Fedora/Redhat development system:
392415

393-
.. code-block:: console
416+
.. code-block:: none
394417
395418
$ sudo dnf install gcc \
396419
git \
@@ -411,7 +434,7 @@ each with their own way to install development tools:
411434
412435
* On a CentOS development system:
413436

414-
.. code-block:: console
437+
.. code-block:: none
415438
416439
$ sudo yum install gcc \
417440
git \
@@ -447,7 +470,7 @@ repository has three main components in it:
447470

448471
You can build all these components in one go as follows:
449472

450-
.. code-block:: console
473+
.. code-block:: none
451474
452475
$ git clone https://github.com/projectacrn/acrn-hypervisor
453476
$ cd acrn-hypervisor
@@ -466,7 +489,7 @@ and are using it as the current working directory.
466489

467490
#. Build the ACRN hypervisor.
468491

469-
.. code-block:: console
492+
.. code-block:: none
470493
471494
$ cd hypervisor
472495
$ make PLATFORM=uefi
@@ -475,7 +498,7 @@ and are using it as the current working directory.
475498

476499
#. Build the ACRN device model (included in the acrn-hypervisor repo):
477500

478-
.. code-block:: console
501+
.. code-block:: none
479502
480503
$ cd ../devicemodel
481504
$ make
@@ -484,7 +507,7 @@ and are using it as the current working directory.
484507

485508
#. Build the ACRN tools (included in the acrn-hypervisor repo):
486509

487-
.. code-block:: console
510+
.. code-block:: none
488511
489512
$ cd ../tools
490513
$ for d in */; do make -C "$d"; done
@@ -507,7 +530,7 @@ based on the platform selected, assuming that you are under the top-level
507530
directory of acrn-hypervisor. The configuration file, named ``.config``, can be
508531
found under the target folder of your build.
509532

510-
.. code-block:: console
533+
.. code-block:: none
511534
512535
$ cd hypervisor
513536
$ make defconfig PLATFORM=uefi
@@ -526,7 +549,7 @@ are under the top-level directory of acrn-hypervisor, generate a default
526549
configuration file for UEFI, allow you to modify some configurations and build
527550
the hypervisor using the updated ``.config``.
528551

529-
.. code-block:: console
552+
.. code-block:: none
530553
531554
$ cd hypervisor
532555
$ make defconfig PLATFORM=uefi
@@ -538,7 +561,7 @@ the hypervisor using the updated ``.config``.
538561

539562
Refer to the help on menuconfig for a detailed guide on the interface.
540563

541-
.. code-block:: console
564+
.. code-block:: none
542565
543566
$ pydoc3 menuconfig
544567
@@ -550,7 +573,7 @@ Currently the ACRN hypervisor looks for default configurations under
550573
specified platform. The following steps allow you to create a defconfig for
551574
another platform based on a current one.
552575

553-
.. code-block:: console
576+
.. code-block:: none
554577
555578
$ cd hypervisor
556579
$ make defconfig PLATFORM=uefi
@@ -561,6 +584,6 @@ another platform based on a current one.
561584
Then you can re-use that configuration by passing the name (``xxx`` in the
562585
example above) to 'PLATFORM=':
563586

564-
.. code-block:: console
587+
.. code-block:: none
565588
566589
$ make defconfig PLATFORM=xxx
-123 KB
Binary file not shown.
-13.5 KB
Binary file not shown.

doc/getting-started/up2.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ You will need to keep these in mind in a few places:
4848

4949
* When mounting the EFI System Partition (ESP)
5050

51-
.. code-block:: console
51+
.. code-block:: none
5252
5353
# mount /dev/mmcblk0p1 /mnt
5454
@@ -58,7 +58,7 @@ You will need to keep these in mind in a few places:
5858

5959
* When configuring the EFI firmware to boot the ACRN hypervisor by default
6060

61-
.. code-block:: console
61+
.. code-block:: none
6262
6363
# efibootmgr -c -l "\EFI\acrn\acrn.efi" -d /dev/mmcblk0 -p 1 -L "ACRN Hypervisor" \
6464
-u "bootloader=\EFI\org.clearlinux\bootloaderx64.efi uart=mmio@0x9141e000"
@@ -69,7 +69,7 @@ UP2 serial port setting
6969
The serial port in the 40-pin HAT connector is located at ``MMIO 0x0x9141e000``.
7070
You can check this from the ``dmesg`` output from the initial Clearlinux installation.
7171

72-
.. code-block:: console
72+
.. code-block:: none
7373
7474
# dmesg | grep dw-apb-uart
7575
[2.150689] dw-apb-uart.8: ttyS1 at MMIO 0x91420000 (irq = 4, base_baud = 115200) is a 16550A
@@ -86,7 +86,7 @@ throughout the :ref:`getting_started` therefore is ``/dev/mmcblk0``
8686

8787
The UUID of the partition ``/dev/mmcblk0p3`` can be found by
8888

89-
.. code-block:: console
89+
.. code-block:: none
9090
9191
# blkid /dev/mmcblk
9292

doc/static/acrn-custom.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,22 @@
1414
}
1515
*/
1616

17+
/* pygments tweak for white-on-black console */
18+
19+
.highlight-console .highlight {
20+
background-color: black;
21+
}
22+
.highlight-console .highlight .go, .highlight-console .highlight .gp {
23+
color: white;
24+
}
25+
.highlight-console .highlight .hll {
26+
background-color: white;
27+
}
28+
.highlight-console .highlight .hll .go, .highlight-console .highlight .hll .gp {
29+
color: black;
30+
font-weight: bold;
31+
}
32+
1733
/* tweak doc version selection
1834
.rst-versions {
1935
position: static;

doc/tutorials/static-ip.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can set up a static IP address by copying the
2626
``/etc/systemd/network/`` directory. You can create this directory and
2727
copy the file with the following command:
2828

29-
.. code-block:: console
29+
.. code-block:: none
3030
3131
mkdir -p /etc/systemd/network
3232
cp /usr/lib/systemd/network/50-eth.network /etc/systemd/network
@@ -61,7 +61,7 @@ Activate the new configuration
6161
You do not need to reboot the machine after making the changes to the system, the
6262
following steps that restart the ``systemd-networkd`` service will suffice (run as ``root``):
6363

64-
.. code-block:: console
64+
.. code-block:: none
6565
6666
systemctl daemon-reload
6767
systemctl restart systemd-networkd

0 commit comments

Comments
 (0)