Merge branch '2.6-evo' into dev-release

.github/workflows/eventbuild.yml

@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false # Don't fail all if any of the jobs is failing
       matrix:
-        TARGET: [pi-bullseye, x86-minimal, x86-lunar, radxa-cm3, x20, radxa-zero3w, rock5b, rock5a] # <-- Add targets here!
-        #TARGET: [pi-bullseye,radxa-zero3w] # <-- Add targets here!
+        TARGET: [pi-bullseye, x86-minimal, x86-lunar, radxa-cm3, x20, radxa-zero3w, rock5b, rock5a, qcs405] # <-- Add targets here!
+        #TARGET: [qrb5165] # <-- Add targets here!
     steps:
     - name: Maximize build space
       uses: easimon/maximize-build-space@master

images/qcs405

@@ -0,0 +1,9 @@
+BASE_IMAGE_URL="http://fra1.digitaloceanspaces.com/openhd-images/BaseImages"
+BASE_IMAGE="qcs405-ext.img.xz"
+BASE_IMAGE_SHA256="4593d9adba4c7641fab6a5063b5df8e93a9a58aa7b07ca4a789036bbfb512b51"
+OS="ubuntu"
+DISTRO="focal"
+HAVE_BOOT_PART=false
+HAVE_CONF_PART=false
+ROOT_PART=1
+BIT="64"

images/qrb5165

@@ -0,0 +1,9 @@
+BASE_IMAGE_URL="https://fra1.digitaloceanspaces.com/openhd-images/BaseImages"
+BASE_IMAGE="rb5_15G.img.xz"
+BASE_IMAGE_SHA256="6e923b213be8a945353f41ddbb6654003e31f53039a1111fd0c665bf5432847b"
+OS="ubuntu"
+DISTRO="focal"
+HAVE_BOOT_PART=false
+HAVE_CONF_PART=false
+ROOT_PART=1
+BIT="64"

images/x20

@@ -1,6 +1,6 @@
 BASE_IMAGE_URL="https://fra1.digitaloceanspaces.com/openhd-images/BaseImages"
-BASE_IMAGE="x20_040524_config.img.xz"
-BASE_IMAGE_SHA256="71b93c393e2dd824066bfb205017ef3ed45591a30ef699d3da6ba2d2bed475ce"
+BASE_IMAGE="x20_250824_config.img.xz"
+BASE_IMAGE_SHA256="6c4bc3b4bcd0f118ccbf6fa2d53ccd77454963dcf23983c2033f828f4056d714"
 OS="debian-X20"
 DISTRO="bullseye"
 HAVE_BOOT_PART=false

scripts/uPart.sh

@@ -16,7 +16,7 @@ add_fat32_partition() {
   dd if=/dev/zero of=fat.img bs=1M count=300
   cat fat.img >> "${PREV_WORK_DIR}"/*.img
   rm -f fat.img
-  if [[ "${OS}" == "ubuntu-x86-minimal" ]] || [[ "${OS}" == "ubuntu-x86" ]] || [[ "${OS}" == "debian-X20" ]]; then
+  if [[ "${OS}" == "ubuntu-x86-minimal" ]] || [[ "${OS}" == "ubuntu-x86" ]] || [[ "${OS}" == "debian_x20" ]]; then
     echo "Video partition not supporte yet"
   elif [[ "${OS}" == "radxa-debian-rock-cm3" ]]; then
     sgdisk -e "${PREV_WORK_DIR}"/*.img

stages/02-Packages/00-run-chroot.sh

@@ -20,7 +20,6 @@ function install_x20_packages {
     PLATFORM_PACKAGES_REMOVE="*boost* locales guile-2.2-libs network-manager"
     PLATFORM_PACKAGES=""
 }
-
 # Raspbian-specific code
 function install_raspbian_packages {
     sudo apt update && apt remove -y dkms
@@ -34,7 +33,6 @@ function install_radxa-ubuntu_packages {
     BASE_PACKAGES="openhd-sys-utils openhd apt-transport-https apt-utils open-hd-web-ui"
     PLATFORM_PACKAGES="rsync procps gstreamer1.0-plugins-bad gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-tools gstreamer1.0-rockchip1 gstreamer1.0-gl mali-g610-firmware malirun rockchip-multimedia-config librist4 librist-dev rist-tools libv4l-0 libv4l2rds0 libv4lconvert0 libv4l-dev libv4l-rkmpp qv4l2 v4l-utils librockchip-mpp1 librockchip-mpp-dev librockchip-vpu0 rockchip-mpp-demos librga2 librga-dev libegl-mesa0 libegl1-mesa-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libglx-mesa0 mesa-common-dev mesa-vulkan-drivers mesa-utils libwidevinecdm"
 }
-
 function install_radxa-debian_packages {
     BASE_PACKAGES="openhd-sys-utils openhd qopenhd-rk3588 apt-transport-https apt-utils open-hd-web-ui"
     PLATFORM_PACKAGES_HOLD="task-rk356x task-rockchip radxa-system-config-rockchip 8852bu-dkms 8852be-dkms task-rockchip radxa-system-config-rockchip linux-image-rock-5a linux-image-5.10.110-6-rockchip linux-image-5.10.110-11-rockchip"
@@ -49,7 +47,7 @@ function install_radxa-debian_packages_rk3566 {
     mkdir -p /usr/local/share/openhd_platform/rock/rk3566
     BASE_PACKAGES="dosfstools gstreamer1.0-plugins-rtp gstreamer1.0-rockchip1 gstreamer1.0-vaapi libavahi-glib1 libdrm-cursor linux-headers-5.10.160-radxa-rk356x linux-image-5.10.160-radxa-rk356x openhd-sys-utils openhd qopenhd-rk3566 apt-transport-https apt-utils open-hd-web-ui"
     PLATFORM_PACKAGES_REMOVE="gvfs gvfs-backends gvfs-fuse plymouth plymouth-theme-breeze plymouth-themes vulkan-tools xdg-desktop-portal xdg-desktop-portal-gtk xdg-user-dirs xdg-user-dirs-gtk xdg-utils task-xfce-desktop thunar-volman xfce4-clipman xfce4-notifyd xfce4-power-manager xfce4-screenshooter xfce4-terminal xiccd aha breeze-cursor-theme clinfo codium cups desktop-base firefox-esr fonts-noto-cjk fprintd fwupd maliit-keyboard"
-    PLATFORM_PACKAGES_HOLD="task-rk356x task-rockchip radxa-system-config-rockchip task-radxa-cm3-rpi-cm4-io radxa-firmware"
+    PLATFORM_PACKAGES_HOLD="libdvbv5-0 libv4l2rds0 libv4lconvert0 xserver-common xserver-xorg-core xserver-xorg-legacy linux-headers-radxa-zero3 linux-image-radxa-zero3 task-rk356x task-rockchip radxa-system-config-rockchip task-radxa-cm3-rpi-cm4-io radxa-firmware"
     # PLATFORM_PACKAGES_HOLD="u-boot-radxa-zero3 radxa-system-config-common radxa-system-config-kernel-cmdline-ttyfiq0 radxa-firmware radxa-system-config-bullseye 8852be-dkms task-rockchip radxa-system-config-rockchip linux-image-radxa-cm3-rpi-cm4-io linux-headers-radxa-cm3-rpi-cm4-io linux-image-5.10.160-12-rk356x linux-headers-5.10.160-12-rk356x"
     PLATFORM_PACKAGES="dialog pv net-tools isc-dhcp-client network-manager glances rockchip-iq-openhd-r3 librga2=2.2.0-1 procps camera-engine-rkaiq mpp-rk3566 fpv-rk3566"
 }
@@ -58,8 +56,6 @@ function install_packages-core3566 {
     PLATFORM_PACKAGES="dialog pv gst-latest net-tools isc-dhcp-client network-manager glances rockchip-iq-openhd-r3 librga2=2.2.0-1 linux-image-5.10.160-core3566-rk356x linux-headers-5.10.160-core3566-rk356x linux-libc-dev-5.10.160-core3566-rk356x procps camera-engine-rkaiq"
     PLATFORM_PACKAGES_REMOVE="firefox* dkms sddm plymouth plasma-desktop kde*"
 }
-
-
 # Ubuntu-x86-specific code
 function install_ubuntu_x86_packages {
         CLEAN=false
@@ -78,15 +74,13 @@ function install_ubuntu_x86_minimal_packages {
     PLATFORM_PACKAGES_HOLD="grub-efi-amd64-bin grub-efi-amd64-signed linux-generic linux-headers-generic linux-image-generic linux-libc-dev"
     PLATFORM_PACKAGES_REMOVE=""
 }
-
 function clone_github_repos {
     cd /opt
     git clone --recursive --depth 1 https://github.com/OpenHD/OpenHD
     git clone --recursive --depth 1 https://github.com/OpenHD/QOpenHD
     git clone https://github.com/OpenHD/veye_raspberrypi.git
     chmod -R 777 /opt
 }
-
 function install_openhd {
         apt update && apt install libpoco-dev -y
     if [[ "${OS}" == "debian-X20" ]]; then
@@ -106,6 +100,7 @@ function install_openhd {
     elif [[ "${OS}" == "radxa-debian-rock-cm3" ]] ; then
         apt update
         install_radxa-debian_packages_rk3566
+        apt upgrade -y
     elif [[ "${OS}" == "radxa-debian-rock-cm3-core3566" ]] ; then
         apt update
         install_packages-core3566
@@ -220,6 +215,19 @@ else
 
 fi
 
+if [[ "${OS}" == "radxa-debian-rock-cm3" ]] ; then
+    # Check if librga2 is installed and display its version
+    if dpkg-query -W -f='${Status}' librga2 2>/dev/null | grep -q "install ok installed"; then
+        echo "Current installed version of librga2: $(dpkg-query -W -f='${Version}' librga2)"
+    else
+        echo "librga2 is not installed."
+    fi
+
+    # Hold the librga2 package
+    apt-mark hold librga2
+fi
+
+
 #
 # Write the openhd package version back to the base of the image and
 # in the work dir so the builder can use it in the image name

stages/03-Preconfiguration/00-run-chroot.sh

@@ -192,7 +192,7 @@ if [[ "${OS}" == "debian-X20" ]]; then
  echo "HdZero" >> /etc/modules-load.d/modules.conf
  sudo sed -i '/^\/dev\/mmcblk0p2/d' /etc/fstab
  sudo sed -i 's/,commit=600//g' /etc/fstab
- sudo echo "UUID=41ED-7F73 /external auto defaults 0 2" | sudo tee -a /etc/fstab
+ sudo echo "UUID=41ED-7F73  /external  auto  defaults  0  2" | sudo tee -a /etc/fstab
  sudo echo "UUID=e6c9676e-0cbc-41d4-8142-7d08a515c244  none  swap  sw  0  0" | sudo tee -a /etc/fstab
  sudo sed -i 's/c34bd5d7-bc89-4fa1-85b8-47954ecd28ee/9714ff09-1989-492f-a35e-29d9654c22d5/g' /etc/fstab
  sudo echo "while true; do journalctl > /boot/log_$(date +"\%Y-\%m-\%d_\%H-\%M-\%S").txt && sleep 120 || journalctl > /boot/log.txt && sleep 120; done" >> /root/.bashrc

stages/03-Preconfiguration/01-run-chroot.sh

@@ -48,7 +48,7 @@ echo "removed for now"
 # sudo systemctl disable ssh
 # sudo systemctl disable rsync
 # sudo systemctl disable systemd-journald.service
-sudo systemctl enable temperature_guardian
+# sudo systemctl enable temperature_guardian
 ls /usr/local/bin
 modprobe 88XXau_ohd
 fi