Enable Android CiV on Ubuntu 24.04

Fix vm-manager build errors, pip3 installation errors Tracked-On: OAM-125176 Signed-off-by: Basanagouda Nagappa Koppad <[email protected]>
projectceladon · Sep 19, 2024 · 9974cfe · 9974cfe
1 parent 58f719c
commit 9974cfe
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 0 deletions.
diff --git a/...vice/intel/civ/host/vm-manager/0055-Fix-vm-manager-build-error-pip3-install-failure.patch b/...vice/intel/civ/host/vm-manager/0055-Fix-vm-manager-build-error-pip3-install-failure.patch
@@ -0,0 +1,64 @@
+From ce0ab04b9298bfd27df8828a48c9b4edc4a7ac18 Mon Sep 17 00:00:00 2001
+From: Basanagouda Nagappa Koppad <[email protected]>
+Date: Thu, 19 Sep 2024 12:59:24 +0000
+Subject: [PATCH] Fix vm-manager build error, pip3 install failure
+
+FTXUI component build error fixed in cmake
+Fixed pip3 install failure with pipx
+
+Tracked-On: OAM-125176
+Signed-off-by: Basanagouda Nagappa Koppad <[email protected]>
+
+diff --git a/scripts/setup_host.sh b/scripts/setup_host.sh
+index ea3c1d2..4e5b74f 100755
+--- a/scripts/setup_host.sh
++++ b/scripts/setup_host.sh
+@@ -153,7 +153,7 @@ function install_vm_manager_deb(){
+     local os_ver=$(lsb_release -rs)
+     local vm_repo="https://github.com/projectceladon/vm_manager/"
+     local rtag=$(git ls-remote -t --refs ${vm_repo} | cut --delimiter='/' --fields=3  | tr '-' '~' | sort --version-sort | tail --lines=1)
+-    local rdeb=vm-manager_${rtag}_ubuntu-${os_ver}.deb
++    local rdeb=vm-manager_${rtag}.deb
+
+     [ -f ${rdeb} ] && rm -f ${rdeb}
+
+@@ -507,10 +507,12 @@ function ubu_update_wifi_fw(){
+
+ function set_sleep_inhibitor() {
+     sudo apt-get -y install python3-pip
+-    sudo pip3 install -U sleep-inhibitor
++    sudo apt install -y pipx
++    pipx ensurepath
++    sudo pipx install sleep-inhibitor
+
+     pythonversion="$(pip3 --version | grep -Po '^.*\(\K[^\)]*' | grep -Po '^.*\ \K[^\\n]*')"
+-    sudo sed -i 's/\/usr\/bin\/%p/\/usr\/local\/bin\/%p/' /usr/local/lib/python$pythonversion/dist-packages/sleep_inhibitor/sleep-inhibitor.service
++    sudo sed -i 's/\/usr\/bin\/%p/\/usr\/local\/bin\/%p/' /root/.local/share/pipx/venvs/sleep-inhibitor/lib/python$pythonversion/site-packages/sleep_inhibitor/sleep-inhibitor.service
+     #Download the plugin if not already
+     sudo echo "#! /bin/sh
+ if adb get-state 1>/dev/null 2>&1
+@@ -523,9 +525,9 @@ then
+         fi
+ else
+         exit 0
+-fi" > /usr/local/lib/python$pythonversion/dist-packages/sleep_inhibitor/plugins/is-wakelock-active
+-    sudo chmod a+x /usr/local/lib/python$pythonversion/dist-packages/sleep_inhibitor/plugins/is-wakelock-active
+-    sudo cp /usr/local/lib/python$pythonversion/dist-packages/sleep_inhibitor/sleep-inhibitor.conf /etc/.
++fi" > /root/.local/share/pipx/venvs/sleep-inhibitor/lib/python$pythonversion/site-packages/sleep_inhibitor/plugins/is-wakelock-active
++    sudo chmod a+x /root/.local/share/pipx/venvs/sleep-inhibitor/lib/python$pythonversion/site-packages/sleep_inhibitor/plugins/is-wakelock-active
++    sudo cp /root/.local/share/pipx/venvs/sleep-inhibitor/lib/python$pythonversion/site-packages/sleep_inhibitor/sleep-inhibitor.conf /etc/.
+     sudo echo "plugins:
+     #Inhibit sleep if wakelock is held
+     - path: is-wakelock-active
+@@ -533,7 +535,7 @@ fi" > /usr/local/lib/python$pythonversion/dist-packages/sleep_inhibitor/plugins/
+       what: sleep
+       period: 0.01" > /etc/sleep-inhibitor.conf
+     sudo sed -i 's/#*HandleSuspendKey=\w*/HandleSuspendKey=suspend/' /etc/systemd/logind.conf
+-    sudo cp /usr/local/lib/python$pythonversion/dist-packages/sleep_inhibitor/sleep-inhibitor.service /etc/systemd/system/.
++    sudo cp /root/.local/share/pipx/venvs/sleep-inhibitor/lib/python$pythonversion/site-packages/sleep_inhibitor/sleep-inhibitor.service /etc/systemd/system/.
+     reboot_required=1
+ }
+
+-- 
+2.34.1
+
diff --git a/host/vm-manager/0013-Fix-uninitialized-warning-in-vm-manager.patch b/host/vm-manager/0013-Fix-uninitialized-warning-in-vm-manager.patch
@@ -0,0 +1,36 @@
+From dd7c698c823fba249e7c343bb4b7db5860309ecb Mon Sep 17 00:00:00 2001
+From: Basanagouda Nagappa Koppad <[email protected]>
+Date: Wed, 18 Sep 2024 08:27:44 +0000
+Subject: [PATCH] Fix uninitialized warning in vm-manager
+
+Tracked-On: OAM-124185
+Signed-off-by: Basanagouda Nagappa Koppad <[email protected]>
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 182ae24..e1be000 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_subdirectory(services/protos)
+
+ set(PROJECT_NAME "vm-manager")
+ project(${PROJECT_NAME})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-result -Wno-unused-variable -Wno-narrowing -O2")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-result -Wno-maybe-uninitialized -Wno-unused-variable -Wno-narrowing -O2")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g1 -O3 -fstack-protector-strong -Wdate-time -D_FORTIFY_SOURCE=2" CACHE STRING "CXX Release Flags" FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2 -g3")
+
+diff --git a/src/cmake/FTXUICMake.cmake b/src/cmake/FTXUICMake.cmake
+index 60bf7cc..8aa69be 100644
+--- a/src/cmake/FTXUICMake.cmake
++++ b/src/cmake/FTXUICMake.cmake
+@@ -15,6 +15,7 @@ FetchContent_Declare(ftxui
+   #GIT_SHALLOW 1
+ )
+ set(FETCHCONTENT_QUIET OFF)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
+
+ FetchContent_GetProperties(ftxui)
+ if(NOT ftxui_POPULATED)
+-- 
+2.34.1
+