fix: cs cannot be built on Armbian, so let's not depend on it (mainsa…

…il-crew#288)
mryel00 · Jan 30, 2025 · acee8b3 · acee8b3
1 parent dafb6f6
commit acee8b3
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 1 deletion.
diff --git a/bin/build.sh b/bin/build.sh
@@ -99,6 +99,14 @@ is_ubuntu_arm() {
     fi
 }
 
+is_armbian() {
+    if grep -q "Armbian" /etc/os-release; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
 ### Get avail mem
 get_avail_mem() {
     grep "MemTotal" /proc/meminfo | awk '{print $2}'
@@ -136,7 +144,8 @@ clone_cstreamer() {
     [[ -n "${CROWSNEST_UNATTENDED}" ]] || CROWSNEST_UNATTENDED="0"
     if { [[ "$(is_raspberry_pi)" = "0" ]] ||
     [[ "$(is_pi5)" = "1" ]] ||
-    [[ "$(is_ubuntu_arm)" = "1" ]]; } &&
+    [[ "$(is_ubuntu_arm)" = "1" ]] ||
+    [[ "$(is_armbian)" = "1" ]]; } &&
     [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then
         printf "Device is not supported! Cloning camera-streamer ... [SKIPPED]\n"
         return

diff --git a/libs/core.sh b/libs/core.sh
@@ -97,6 +97,7 @@ function check_apps {
     ## Avoid dependency check if non rpi sbc
     if [[ "$(is_raspberry_pi)" = "1" ]] &&
     [[ "$(is_ubuntu_arm)" = "0" ]] &&
+    [[ "$(is_armbian)" = "0" ]] &&
     [[ "$(is_pi5)" = "0" ]]; then
         if [[ -x "${BASE_CN_PATH}/${cstreamer}" ]]; then
             log_msg "Dependency: '${cstreamer##*/}' found in ${cstreamer}."

diff --git a/libs/hwhandler.sh b/libs/hwhandler.sh
@@ -185,3 +185,11 @@ is_ubuntu_arm() {
         echo "0"
     fi
 }
+
+is_armbian() {
+    if grep -q "Armbian" /etc/os-release; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
diff --git a/libs/init_stream.sh b/libs/init_stream.sh
@@ -29,6 +29,7 @@ function construct_streamer {
             [mM]ulti | camera-streamer)
                 if [[ "$(is_raspberry_pi)" = "1" ]] &&
                 [[ "$(is_ubuntu_arm)" = "0" ]] &&
+                [[ "$(is_armbian)" = "0" ]] &&
                 [[ "$(is_pi5)" = "0" ]]; then
                     MULTI_INSTANCES+=( "${cams}" )
                 else

diff --git a/libs/versioncontrol.sh b/libs/versioncontrol.sh
@@ -44,6 +44,7 @@ versioncontrol() {
         local cur_ver avail_ver
         if [[ "$(is_raspberry_pi)" = "1" ]] &&
         [[ "$(is_ubuntu_arm)" = "0" ]] &&
+        [[ "$(is_armbian)" = "0" ]] &&
         [[ "$(is_pi5)" = "0" ]]; then
             pushd "${BASE_CN_PATH}"/bin/camera-streamer &> /dev/null || exit 1
                 avail_ver="($(git describe --tags --always))"

diff --git a/tools/libs/core.sh b/tools/libs/core.sh
@@ -85,6 +85,14 @@ is_ubuntu_arm() {
     fi
 }
 
+is_armbian() {
+    if grep -q "Armbian" /etc/os-release; 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
@@ -129,6 +137,14 @@ shallow_cs_dependencies_check() {
     fi
     status_msg "Checking if device is not running Ubuntu ..." "0"
 
+    msg "Checking if device is not running Armbian ...\n"
+    if [[ "$(is_armbian)" = "1" ]]; then
+        status_msg "Checking if device is not running Armbian ..." "3"
+        msg "This device is running Armbian therefore camera-streeamer cannot be installed ..."
+        return 1
+    fi
+    status_msg "Checking if device is not running Armbian ..." "0"
+
     msg "Checking for required kernel module ...\n"
     SHALLOW_CHECK_MODULESLIST="bcm2835_codec"
     if [[ "$(test_load_module ${SHALLOW_CHECK_MODULESLIST})" = "0" ]]; then