diff --git a/misc/packaging/100_ACRN b/misc/packaging/100_ACRN index fec40ed3d..b05b4a0ce 100755 --- a/misc/packaging/100_ACRN +++ b/misc/packaging/100_ACRN @@ -27,10 +27,10 @@ while IFS= read -r line; do fi done < <(blkid |grep ext4 |grep ${type}) -if ls /boot/vmlinuz*acrn-sos* 1> /dev/null 2>&1;then - sos_kernel=$(ls -tr /boot/vmlinuz-*acrn-sos* | tail -1) +if ls /boot/vmlinuz*acrn-service-vm* 1> /dev/null 2>&1;then + service_vm_kernel=$(ls -tr /boot/vmlinuz-*acrn-service-vm* | tail -1) else - sos_kernel=$(ls /boot/vmlinuz-* | tail -1) + service_vm_kernel=$(ls /boot/vmlinuz-* | tail -1) fi if [ -z "$menu" ];then @@ -51,6 +51,6 @@ EOF fi sed -i '/Linux_bzImage/d' ${filename} || true -sed -i '/multiboot2 \/boot/a\module2 '$sos_kernel' Linux_bzImage' ${filename} +sed -i '/multiboot2 \/boot/a\module2 '$service_vm_kernel' Linux_bzImage' ${filename} sync diff --git a/misc/packaging/README.rst b/misc/packaging/README.rst index 4b1e1df9b..c9fece6f5 100644 --- a/misc/packaging/README.rst +++ b/misc/packaging/README.rst @@ -44,7 +44,7 @@ in the ``misc/packaging`` folder, so let's go there:: Configure Debian Packaging Details ********************************** -The build and packaging script ``install_uSoS.py`` does all the work to +The build and packaging script ``install_uServiceVM.py`` does all the work to build and make the Debian packages. You configure what the script does by editing its configuration file, ``release.json``. Comments in the JSON file document how you can adjust things to your specific needs. For @@ -66,7 +66,7 @@ Here's the default ``release.json`` configuration: Run the Package-Building Script ******************************* -The ``install_uSoS.py`` Python script does all the work to install +The ``install_uServiceVM.py`` Python script does all the work to install needed tools (such as make, gnu-efi, libssl-dev, libpciaccess-dev, uuid-dev, and more). It also verifies that tool versions (such as the gcc compiler) are appropriate (as configured in the ``release.json`` @@ -75,7 +75,7 @@ file). The script runs without further user input, and must be run with ``sudo``:: - sudo python3 install_uSoS.py + sudo python3 install_uServiceVM.py With the default ``release.json`` configuration, this script will run for about 30 minutes, but could take longer depending on your internet diff --git a/misc/packaging/install_uSoS.py b/misc/packaging/install_uServiceVM.py similarity index 100% rename from misc/packaging/install_uSoS.py rename to misc/packaging/install_uServiceVM.py diff --git a/misc/packaging/release.json b/misc/packaging/release.json index 1e2531f2c..3668647b7 100644 --- a/misc/packaging/release.json +++ b/misc/packaging/release.json @@ -1,5 +1,5 @@ { - "//":"release ubuntu as sos verion", + "//":"release ubuntu as Service VM OS verion", "install_package":"true", "gcc_version":"7.3.0", "binutils":"2.27", @@ -56,7 +56,7 @@ }, "kernel_release_version":"remotes/origin/release_2.1", - "sos_kernel_repo":"https://github.com/projectacrn/acrn-kernel.git", + "service_vm_os_kernel_repo":"https://github.com/projectacrn/acrn-kernel.git", "acrn_kernel_deb_package":"true", "install_acrn_kernel_deb":"false", "//":"misc",