diff --git a/doc/getting-started/sample-app.rst b/doc/getting-started/sample-app.rst index a48f99ae8..db18cb83e 100644 --- a/doc/getting-started/sample-app.rst +++ b/doc/getting-started/sample-app.rst @@ -117,7 +117,7 @@ As a normal (e.g., **acrn**) user, follow these steps: cd ~/acrn-work/acrn-hypervisor git fetch --all - git checkout master + git checkout release_3.2 #. Build the ACRN sample application source code:: @@ -189,10 +189,10 @@ Make the RT_VM Image .. code-block:: console - linux-headers-5.15.44-rt46-acrn-kernel-rtvm+_5.15.44-rt46-acrn-kernel-rtvm+-1_amd64.deb - linux-image-5.15.44-rt46-acrn-kernel-rtvm+-dbg_5.15.44-rt46-acrn-kernel-rtvm+-1_amd64.deb - linux-image-5.15.44-rt46-acrn-kernel-rtvm+_5.15.44-rt46-acrn-kernel-rtvm+-1_amd64.deb - linux-libc-dev_5.15.44-rt46-acrn-kernel-rtvm+-1_amd64.deb + linux-headers-5.15.71-rt46-acrn-kernel-rtvm+_5.15.71-rt46-acrn-kernel-rtvm+-1_amd64.deb + linux-image-5.15.71-rt46-acrn-kernel-rtvm+-dbg_5.15.71-rt46-acrn-kernel-rtvm+-1_amd64.deb + linux-image-5.15.71-rt46-acrn-kernel-rtvm+_5.15.71-rt46-acrn-kernel-rtvm+-1_amd64.deb + linux-libc-dev_5.15.71-rt46-acrn-kernel-rtvm+-1_amd64.deb #. Make the RT VM image:: @@ -394,7 +394,7 @@ Build the ACRN Hypervisor and Service VM Images cd ~/acrn-work/acrn-hypervisor make clean - make BOARD=~/acrn-work/MyConfiguration/my_board.board.xml SCENARIO=~/acrn-work/MyConfiguration/scenario.xml + debian/debian_build.sh clean && debian/debian_build.sh -c ~/acrn-work/MyConfiguration The build typically takes about a minute. When done, the build generates a Debian package in the build directory with your board and @@ -411,7 +411,7 @@ Build the ACRN Hypervisor and Service VM Images cd ~/acrn-work/acrn-kernel git fetch --all - git checkout acrn-v3.1 + git checkout release_3.2 make distclean cp kernel_config_service_vm .config @@ -427,10 +427,10 @@ Build the ACRN Hypervisor and Service VM Images $ ls ../*acrn-service*.deb - linux-headers-5.15.44-acrn-service-vm_5.15.44-acrn-service-vm-1_amd64.deb - linux-image-5.15.44-acrn-service-vm_5.15.44-acrn-service-vm-1_amd64.deb - linux-image-5.15.44-acrn-service-vm-dbg_5.15.44-acrn-service-vm-1_amd64.deb - linux-libc-dev_5.15.44-acrn-service-vm-1_amd64.deb + linux-headers-5.15.71-acrn-service-vm_5.15.71-acrn-service-vm-1_amd64.deb + linux-image-5.15.71-acrn-service-vm_5.15.71-acrn-service-vm-1_amd64.deb + linux-image-5.15.71-acrn-service-vm-dbg_5.15.71-acrn-service-vm-1_amd64.deb + linux-libc-dev_5.15.71-acrn-service-vm-1_amd64.deb .. rst-class:: numbered-step @@ -440,69 +440,36 @@ Copy Files from the Development Computer to Your Target System 1. Copy all the files generated on the development computer to the target system. This includes the sample application executable files, HMI_VM and RT_VM images, Debian packages for the Service VM and - Hypervisor, launch scripts, and the iasl tool built following the - Getting Started Guide. You can use ``scp`` to copy across the local network, - or use a USB stick: + Hypervisor, and the launch scripts. - Option 1: use ``scp`` to copy files over the local network - Use ``scp`` to copy files from your development computer to the - ``~/acrn-work`` directory on the target (replace the IP address used in - this example with the target system's IP address you found earlier):: + Use ``scp`` to copy files from your development computer to the + ``~/acrn-work`` directory on the target (replace the IP address used in + this example with the target system's IP address you found earlier):: - cd ~/acrn-work + cd ~/acrn-work - scp acrn-hypervisor/misc/sample_application/image_builder/build/*_vm.img \ - acrn-hypervisor/build/acrn-my_board-MyConfiguration*.deb \ - *acrn-service-vm*.deb MyConfiguration/launch_user_vm_id*.sh \ - acpica-unix-20210105/generate/unix/bin/iasl \ - acrn@10.0.0.200:~/acrn-work + scp acrn-hypervisor/misc/sample_application/image_builder/build/*_vm.img \ + acrn-hypervisor*.deb *acrn-service-vm*.deb \ + MyConfiguration/launch_user_vm_id*.sh \ + acrn@10.0.0.200:~/acrn-work - Then on the target system, run these commands:: - - sudo cp ~/acrn-work/iasl /usr/sbin - sudo ln -s /usr/sbin/iasl /usr/bin/iasl - - Option 2: use a USB stick to copy files - Because the VM image files are large, format your USB stick with a file - system that supports files greater than 4GB: extFAT or NTFS, but not FAT32. - - Insert a USB stick into the development computer and run these commands:: - - disk="/media/$USER/"$(ls /media/$USER) - - cd ~/acrn-work - cp acrn-hypervisor/misc/sample_application/image_builder/build/*_vm.img rt_vm.img "$disk" - cp acrn-hypervisor/build/acrn-my_board-MyConfiguration*.deb "$disk" - cp *acrn-service-vm*.deb "$disk" - cp MyConfiguration/launch_user_vm_id*.sh "$disk" - cp acpica-unix-20210105/generate/unix/bin/iasl "$disk" - sync && sudo umount "$disk" - - Move the USB stick you just used to the target system and run - these commands to copy the files locally:: - - disk="/media/$USER/"$(ls /media/$USER) - - cp "$disk"/*_vm.img ~/acrn-work - cp "$disk"/acrn-my_board-MyConfiguration*.deb ~/acrn-work - cp "$disk"/*acrn-service-vm*.deb ~/acrn-work - cp "$disk"/launch_user_vm_id*.sh ~/acrn-work - sudo cp "$disk"/iasl /usr/sbin/ - sudo ln -s /usr/sbin/iasl /usr/bin/iasl - sync && sudo umount "$disk" .. rst-class:: numbered-step Install and Run ACRN on the Target System ***************************************** -1. On your target system, install the ACRN Debian package and ACRN +1. On the target system, configure your network according to instruction of below link: + + https://www.ubuntupit.com/how-to-configure-and-use-network-bridge-in-ubuntu-linux/ + +#. On your target system, install the ACRN Debian package and ACRN kernel Debian packages using these commands:: cd ~/acrn-work + cp ./acrn-hypervisor*.deb ./*acrn-service-vm*.deb /tmp sudo apt purge acrn-hypervisor - sudo apt install ./acrn-my_board-MyConfiguration*.deb - sudo apt install ./*acrn-service-vm*.deb + sudo apt install /tmp/acrn-hypervisor*.deb /tmp/*acrn-service-vm*.deb #. Enable networking services for sharing with the HMI User VM:: @@ -512,18 +479,10 @@ Install and Run ACRN on the Target System reboot -#. Confirm that you see the GRUB menu with the "ACRN multiboot2" entry. Select - it and press :kbd:`Enter` to proceed to booting ACRN. (It may be - auto-selected, in which case it will boot with this option automatically in 5 - seconds.) - - .. image:: images/samp-image016.png - :class: drop-shadow - :align: center - - This will boot the ACRN hypervisor and launch the Service VM. - -#. Log in to the Service VM (using the target's keyboard and HDMI monitor) using +#. The target system will boot automatically into the ACRN hypervisor and + launch the Service VM. + + Log in to the Service VM (using the target's keyboard and HDMI monitor) using the ``acrn`` username. #. Find the Service VM's IP address (the first IP address shown by this command): @@ -606,7 +565,7 @@ Install and Run ACRN on the Target System ubuntu login: root Password: - Welcome to Ubuntu 22.04.1 LTS (GNU/Linux 5.15.44-rt46-acrn-kernel-rtvm+ x86_64) + Welcome to Ubuntu 22.04.1 LTS (GNU/Linux 5.15.71-rt46-acrn-kernel-rtvm+ x86_64) . . .