github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-10 13:19:31 +00:00
Code Issues Projects Releases Wiki Activity

Doc: Update GSG for v0.5 version and launch and acrn.conf sample script

Browse Source 
modify sbl_up2 version and scripts
This commit is contained in:
wenlingz
2019-01-16 11:11:09 +08:00
committed by Wang, Hongbo
parent b4a1dd2b56
commit 34b4294334
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
doc/getting-started/apl-nuc.rst
View File

@@ -37,13 +37,13 @@ complete this setup.
.. note::
ACRN v0.4 (and the current master branch) requires Clear Linux
version 26770 or newer. If you use a newer version of Clear Linux,
ACRN v0.5 (and the current master branch) requires Clear Linux
version 27230 or newer. If you use a newer version of Clear Linux,
you'll need to adjust the instructions below to reference the version
number of Clear Linux you are using.
#. Download the compressed Clear installer image from
https://download.clearlinux.org/releases/26770/clear/clear-26770-installer.img.xz
https://download.clearlinux.org/releases/27230/clear/clear-27230-installer.img.xz
and follow the `Clear Linux installation guide
<https://clearlinux.org/documentation/clear-linux/get-started/bare-metal-install>`__
as a starting point for installing Clear Linux onto your platform. Follow the recommended
@@ -74,12 +74,12 @@ complete this setup.
.. note::
The Clear Linux installer will automatically check for updates and install the
latest version available on your system. If you wish to use a specific version
(such as 26770), you can achieve that after the installation has completed using
``sudo swupd verify --fix --picky -m 26770``
(such as 27230), you can achieve that after the installation has completed using
``sudo swupd verify --fix --picky -m 27230``
#. If you have an older version of Clear Linux already installed
on your hardware, use this command to upgrade Clear Linux
to version 26770 (or newer):
to version 27230 (or newer):
.. code-block:: none
@@ -118,9 +118,9 @@ partition. Follow these steps:
$ sudo ls -1 /boot/EFI/org.clearlinux
bootloaderx64.efi
kernel-org.clearlinux.native.4.19.8-670
kernel-org.clearlinux.iot-lts2018-sos.4.19.5-29
kernel-org.clearlinux.iot-lts2018.4.19.5-29
kernel-org.clearlinux.native.4.20.2-683
kernel-org.clearlinux.iot-lts2018-sos.4.19.13-1901141830
kernel-org.clearlinux.iot-lts2018.4.19.13-1901141830
kernel-org.clearlinux.pk414-sos.4.14.74-115
loaderx64.efi
@@ -250,9 +250,9 @@ partition. Follow these steps:
:caption: ACRN Service OS Boot Menu
=> The ACRN Service OS
Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-4.19.5-29)
Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-sos-4.19.5-29)
Clear Linux OS for Intel Architecture (Clear-linux-native.4.19.8-670)
Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-4.19.13-1901141830)
Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-sos-4.19.13-1901141830)
Clear Linux OS for Intel Architecture (Clear-linux-native.4.20.2-683)
EFI Default Loader
Reboot Into Firmware Interface
@@ -291,14 +291,14 @@ Set up Reference UOS
====================
#. On your platform, download the pre-built reference Clear Linux UOS
image version 26770 (or newer) into your (root) home directory:
image version 27230 (or newer) into your (root) home directory:
.. code-block:: none
$ cd ~
$ mkdir uos
$ cd uos
$ curl -O https://download.clearlinux.org/releases/26770/clear/clear-26770-kvm.img.xz
$ curl -O https://download.clearlinux.org/releases/27230/clear/clear-27230-kvm.img.xz
.. note::
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
.. code-block:: none
$ unxz clear-26770-kvm.img.xz
$ unxz clear-27230-kvm.img.xz
#. Deploy the UOS kernel modules to UOS virtual disk image (note: you'll need to use
the same **iot-lts2018** image version number noted in step 1 above):
.. code-block:: none
$ sudo losetup -f -P --show clear-26770-kvm.img
$ sudo losetup -f -P --show clear-27230-kvm.img
$ sudo mount /dev/loop0p3 /mnt
$ sudo cp -r /usr/lib/modules/4.19.5-29.iot-lts2018 /mnt/lib/modules/
$ sudo cp -r /usr/lib/modules/4.19.13-1901141830.iot-lts2018 /mnt/lib/modules/
$ sudo umount /mnt
$ sync
@@ -337,7 +337,7 @@ Set up Reference UOS
.. note::
In case you have downloaded a different Clear Linux image than the one above
(``clear-26770-kvm.img.xz``), you will need to modify the Clear Linux file name
(``clear-27230-kvm.img.xz``), you will need to modify the Clear Linux file name
and version number highlighted above (the ``-s 3,virtio-blk`` argument) to match
what you have downloaded above. Likewise, you may need to adjust the kernel file
name on the second line highlighted (check the exact name to be used using:

2
doc/tutorials/create-up2-images.sh
View File

@@ -103,7 +103,7 @@ create_uos_images() {
echo mount laag_image >> .cleanup
mkdir -p laag_image/clearlinux
ister.py -t $LAAG_JSON -V $MIRRORURL -C $MIRRORURL ||
ister.py -t $LAAG_JSON --format=staging -V $MIRRORURL -C $MIRRORURL ||
{
echo "ister create clearlinux.img failed"
return 1

8
doc/tutorials/using_sbl_on_up2.rst
View File

@@ -90,14 +90,14 @@ An example of the configuration file ``uos.json``:
{ "disk" : "clearlinux.img", "partition" : 2, "type" : "ext4" } ],
"PartitionMountPoints" : [ { "disk" : "clearlinux.img", "partition" : 1, "mount" : "/boot" },
{ "disk" : "clearlinux.img", "partition" : 2, "mount" : "/" } ],
"Version": 27050,
"Version": 27230,
"Bundles": ["kernel-iot-lts2018", "openssh-server", "software-defined-cockpit", "os-core", "os-core-update"]
}
.. note::
To generate the image with a specified version, please modify
the "Version" argument, ``"Version": 26000`` instead
of ``"Version": 27050`` for example.
the "Version" argument, ``"Version": 2****`` instead
of ``"Version": 27230`` for example.
Clone the source code of ``acrn-hypervisor`` for building and use
``v0.5`` release for example:
@@ -118,7 +118,7 @@ Build SOS and LaaG image:
$ sudo -s
# ./acrn-hypervisor/devicemodel/samples/up2/create-up2-images.sh --images-type all \
--clearlinux-version 27050 --laag-json uos.json --acrn-code-path /path/to/acrn-hypervisor/
--clearlinux-version 27230 --laag-json uos.json --acrn-code-path /path/to/acrn-hypervisor/
.. note::
You must have root privileges to run ``create-up2-images.sh``.