Skip to content

Commit 2a25f4e

Browse files
NanlinXiewenlingz
authored andcommitted
Doc: Remove CL release number from GSG document
Signed-off-by: Xie, nanlin <nanlin.xie@intel.com>
1 parent fea541b commit 2a25f4e

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

devicemodel/samples/nuc/launch_uos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \
2828
-s 2,pci-gvt -G "$3" \
2929
-s 5,virtio-console,@pty:pty_port \
3030
-s 6,virtio-hyper_dmabuf \
31-
-s 3,virtio-blk,/home/clear/uos/clear-27230-kvm.img \
31+
-s 3,virtio-blk,/home/clear/uos/uos.img \
3232
-s 4,virtio-net,tap0 \
3333
--mac_seed $mac_seed \
3434
-k /usr/lib/kernel/default-iot-lts2018 \

doc/getting-started/apl-nuc.rst

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ complete this setup.
3737

3838
.. note::
3939

40-
ACRN v0.5 (and the current master branch) requires Clear Linux
41-
version 27230 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.
40+
Please refer to Release Note for the Clear Linux version number, and
41+
you will need to adjust the instruction below to reference the version
42+
number of Clear Linux you are using. Below document will use version
43+
27230 as example.
4444

4545
#. Download the compressed Clear installer image from
4646
https://download.clearlinux.org/releases/27230/clear/clear-27230-installer.img.xz
@@ -83,7 +83,7 @@ complete this setup.
8383

8484
.. code-block:: none
8585
86-
$ sudo swupd update -m 26770 # or newer version
86+
$ sudo swupd update -m 27230 # or newer version
8787
8888
#. Use the ``sudo swupd bundle-add`` command and add these Clear Linux bundles:
8989

@@ -101,7 +101,7 @@ complete this setup.
101101
| service-os | Add the acrn hypervisor, the acrn devicemodel and |
102102
| | Service OS kernel |
103103
+--------------------+---------------------------------------------------+
104-
| kernel-iot-lts2018 | Run the Intel kernel"kernel-iot-lts2018" |
104+
| kernel-iot-lts2018 | Run the Intel kernel "kernel-iot-lts2018" |
105105
| | which is enterprise-style kernel with backports |
106106
+--------------------+---------------------------------------------------+
107107

@@ -298,7 +298,7 @@ Set up Reference UOS
298298
$ cd ~
299299
$ mkdir uos
300300
$ cd uos
301-
$ curl -O https://download.clearlinux.org/releases/27230/clear/clear-27230-kvm.img.xz
301+
$ curl https://download.clearlinux.org/releases/27230/clear/clear-27230-kvm.img.xz -o uos.img.xz
302302
303303
.. note::
304304
In case you want to use or try out a newer version of Clear Linux as the UOS, you can
@@ -309,16 +309,16 @@ Set up Reference UOS
309309

310310
.. code-block:: none
311311
312-
$ unxz clear-27230-kvm.img.xz
312+
$ unxz uos.img.xz
313313
314314
#. Deploy the UOS kernel modules to UOS virtual disk image (note: you'll need to use
315315
the same **iot-lts2018** image version number noted in step 1 above):
316316

317317
.. code-block:: none
318318
319-
$ sudo losetup -f -P --show clear-27230-kvm.img
319+
$ sudo losetup -f -P --show uos.img
320320
$ sudo mount /dev/loop0p3 /mnt
321-
$ sudo cp -r /usr/lib/modules/4.19.13-1901141830.iot-lts2018 /mnt/lib/modules/
321+
$ sudo cp -r /usr/lib/modules/"`readlink /usr/lib/kernel/default-iot-lts2018 | awk -F '2018.' '{print $2}'`.iot-lts2018" /mnt/lib/modules
322322
$ sudo umount /mnt
323323
$ sync
324324
@@ -333,18 +333,9 @@ Set up Reference UOS
333333
.. literalinclude:: ../../devicemodel/samples/nuc/launch_uos.sh
334334
:caption: devicemodel/samples/nuc/launch_uos.sh
335335
:language: bash
336-
:emphasize-lines: 24,27
337-
338-
.. note::
339-
In case you have downloaded a different Clear Linux image than the one above
340-
(``clear-27230-kvm.img.xz``), you will need to modify the Clear Linux file name
341-
and version number highlighted above (the ``-s 3,virtio-blk`` argument) to match
342-
what you have downloaded above. Likewise, you may need to adjust the kernel file
343-
name on the second line highlighted (check the exact name to be used using:
344-
``ls /usr/lib/kernel/org.clearlinux.iot-lts2018*``).
345336

346337
By default, the script is located in the ``/usr/share/acrn/samples/nuc/``
347-
directory. You can edit it there, and then run it to launch the User OS:
338+
directory. You can run it to launch the User OS:
348339

349340
.. code-block:: none
350341

0 commit comments

Comments
 (0)