[Automated] Merged develop into target master

Author: meteyou

bin/build.sh

@@ -35,7 +35,7 @@ if [[ -z "${CROWSNEST_USTREAMER_REPO_SHIP}" ]]; then
     CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git"
 fi
 if [[ -z "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]]; then
-    CROWSNEST_USTREAMER_REPO_BRANCH="v6.31"
+    CROWSNEST_USTREAMER_REPO_BRANCH="v6.36"
 fi
 
 # Camera-streamer repo
@@ -65,47 +65,8 @@ show_help() {
 }
 
 ## Helper funcs
-### Check if device is Raspberry Pi
-is_raspberry_pi() {
-    if [[ -f /proc/device-tree/model ]] &&
-    grep -q "Raspberry" /proc/device-tree/model; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
-
-is_bookworm() {
-    if [[ -f /etc/os-release ]]; then
-        grep -cq "bookworm" /etc/os-release &> /dev/null && echo "1" || echo "0"
-    fi
-}
-
-is_pi5() {
-    if [[ -f /proc/device-tree/model ]] &&
-    grep -q "Raspberry Pi 5" /proc/device-tree/model; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
-
-is_ubuntu_arm() {
-    if [[ "$(is_raspberry_pi)" = "1" ]] &&
-    grep -q "ubuntu" /etc/os-release; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
-
-is_armbian() {
-    if grep -q "Armbian" /etc/os-release; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
+# shellcheck source=./libs/helper_fn.sh
+. "${BASE_CN_BIN_PATH}/../libs/helper_fn.sh"
 
 ### Get avail mem
 get_avail_mem() {
@@ -142,10 +103,7 @@ clone_ustreamer() {
 clone_cstreamer() {
     ## Special handling because only supported on Raspberry Pi
     [[ -n "${CROWSNEST_UNATTENDED}" ]] || CROWSNEST_UNATTENDED="0"
-    if { [[ "$(is_raspberry_pi)" = "0" ]] ||
-    [[ "$(is_pi5)" = "1" ]] ||
-    [[ "$(is_ubuntu_arm)" = "1" ]] ||
-    [[ "$(is_armbian)" = "1" ]]; } &&
+    if [[ "$(use_cs)" = "0" ]] &&
     [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then
         printf "Device is not supported! Cloning camera-streamer ... [SKIPPED]\n"
         return

custompios/README.md

@@ -95,10 +95,7 @@ function check_apps {
     fi
 
     ## Avoid dependency check if non rpi sbc
-    if [[ "$(is_raspberry_pi)" = "1" ]] &&
-    [[ "$(is_ubuntu_arm)" = "0" ]] &&
-    [[ "$(is_armbian)" = "0" ]] &&
-    [[ "$(is_pi5)" = "0" ]]; then
+    if [[ "$(use_cs)" = "1" ]]; then
         if [[ -x "${BASE_CN_PATH}/${cstreamer}" ]]; then
             log_msg "Dependency: '${cstreamer##*/}' found in ${cstreamer}."
         else

custompios/crowsnest/config

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+#### crowsnest - A webcam Service for multiple Cams and Stream Services.
+####
+#### Written by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
+#### Copyright 2025 - till today
+#### https://github.com/mainsail-crew/crowsnest
+####
+#### This File is distributed under GPLv3
+####
+
+# shellcheck enable=require-variable-braces
+
+# Exit on errors
+set -Ee
+
+# Debug
+# set -x
+
+is_raspios() {
+    if [[ -f /etc/rpi-issue ]]; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
+is_dietpi() {
+    if [[ -f /boot/config.txt ]] && [[ -d /boot/dietpi ]]; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
+is_buster() {
+    if [[ -f /etc/os-release ]]; then
+        grep -cq "buster" /etc/os-release &> /dev/null && echo "1" || echo "0"
+    fi
+}
+
+is_bookworm() {
+    if [[ -f /etc/os-release ]]; then
+        grep -cq "bookworm" /etc/os-release &> /dev/null && echo "1" || echo "0"
+    fi
+}
+
+is_raspberry_pi() {
+    if [[ -f /proc/device-tree/model ]] &&
+    grep -q "Raspberry" /proc/device-tree/model; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
+is_pi5() {
+    if [[ -f /proc/device-tree/model ]] &&
+    grep -q "Raspberry Pi 5" /proc/device-tree/model; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
+is_speederpad() {
+    if grep -q "Ubuntu 20.04." /etc/os-release &&
+    [[ "$(uname -rm)" = "4.9.191 aarch64" ]]; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
+use_cs() {
+    if { [[ "$(is_raspios)" = "1" ]] ||
+    [[ "$(is_dietpi)" = "1" ]]; } &&
+    [[ "$(is_pi5)" = "0" ]]; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}

custompios/crowsnest/start_chroot_script

@@ -158,38 +158,5 @@ detect_mjpeg() {
     v4l2-ctl -d "${dev}" --list-formats-ext | grep -c "Motion-JPEG, compressed"
 }
 
-## Check if device is raspberry sbc
-is_raspberry_pi() {
-    if [[ -f /proc/device-tree/model ]] &&
-    grep -q "Raspberry" /proc/device-tree/model; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
-
-is_pi5() {
-    if [[ -f /proc/device-tree/model ]] &&
-    grep -q "Raspberry Pi 5" /proc/device-tree/model; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
-
-is_ubuntu_arm() {
-    if [[ "$(is_raspberry_pi)" = "1" ]] &&
-    grep -q "ubuntu" /etc/os-release; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
-
-is_armbian() {
-    if grep -q "Armbian" /etc/os-release; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
+## Helper funcs
+. "${BASE_CN_PATH}/libs/helper_fn.sh"