Install overhaul

Limit AASDK build jobs on RPi3, and raise default

Author: breakingspell

install.sh

@@ -33,6 +33,8 @@ fi
 #check if /etc/rpi-issue exists, if not set the install Args to be false
 if [ -f /etc/rpi-issue ]
 then
+  rpiModel=$(cat /sys/firmware/devicetree/base/model | awk '{print $3}')
+  echo "Detected Raspberry Pi Model $rpiModel"
   installArgs="-DRPI_BUILD=true"
   isRpi=true
 else
@@ -191,6 +193,9 @@ if [ $pulseaudio = false ]
   then
     echo -e skipping pulseaudio '\n'
   else
+    #change to project root
+    cd $script_path
+    
     echo Preparing to compile and install pulseaudio
     echo Grabbing pulseaudio deps
     sudo sed -i 's/#deb-src/deb-src/g' /etc/apt/sources.list
@@ -242,6 +247,9 @@ if [ $bluez = false ]
   then
     echo -e skipping bluez '\n'
   else
+    #change to project root
+    cd $script_path
+
     echo Installing bluez
     sudo apt-get install -y libdbus-1-dev libudev-dev libical-dev libreadline-dev libjson-c-dev
     wget www.kernel.org/pub/linux/bluetooth/bluez-5.63.tar.xz
@@ -258,8 +266,8 @@ fi
 if [ $aasdk = false ]; then
 	echo -e Skipping aasdk '\n'
 else
-  #change to parent directory
-  cd ..
+  #change to project root
+  cd $script_path
 
   #clone aasdk
   git clone $aasdkRepo
@@ -281,6 +289,10 @@ else
   echo -e moving to aasdk '\n'
   cd aasdk
 
+  #apply set_FIPS_mode patch
+  echo Apply set_FIPS_mode patch
+  git apply $script_path/patches/aasdk_openssl-fips-fix.patch
+
   #create build directory
   echo Creating aasdk build directory
   mkdir build
@@ -303,7 +315,12 @@ else
   fi
 
   #beginning make
-  make -j2
+  if [[ $rpiModel -lt 4 ]]; then
+    #limit jobs on RPi 3 and below to prevent OOM freeze
+    make -j1
+  else
+    make -j4
+  fi
 
   if [[ $? -eq 0 ]]; then
     echo -e Aasdk Make completed successfully '\n'
@@ -330,10 +347,10 @@ fi
 if [ $h264bitstream = false ]; then
 	echo -e Skipping h264bitstream '\n'
 else
-  #change to parent directory
-  cd ..
+  #change to project root
+  cd $script_path
 
-  #clone aasdk
+  #clone h264bitstream
   git clone $h264bitstreamRepo
   if [[ $? -eq 0 ]]; then
     echo -e h264bitstream Cloned ok '\n'
@@ -402,8 +419,8 @@ fi
 if [ $gstreamer = true ]; then
   echo installing gstreamer
 
-  #change to parent directory
-  cd ..
+  #change to project root
+  cd $script_path
 
   #clone gstreamer
   echo Cloning Gstreamer
@@ -435,6 +452,10 @@ if [ $gstreamer = true ]; then
   echo Apply greenline patch
   git apply $script_path/patches/greenline_fix.patch
 
+  #apply atomic patch
+  echo Apply atomic patch
+  git apply $script_path/patches/qt-gstreamer_atomic-load.patch
+
   #create build directory
   echo Creating Gstreamer build directory
   mkdir build
@@ -493,8 +514,11 @@ if [ $openauto = false ]; then
   echo -e skipping openauto'\n'
 else
   echo Installing openauto
-  cd ..
 
+  #change to project root
+  cd $script_path
+
+  #clone openauto
   echo -e cloning openauto'\n'
   git clone $openautoRepo
   if [[ $? -eq 0 ]]; then
@@ -561,6 +585,9 @@ if [ $dash = false ]; then
 	echo -e Skipping dash'\n'
 else
 
+  #change to project root
+  cd $script_path
+
   #create build directory
   echo Creating dash build directory
   mkdir build
@@ -608,34 +635,21 @@ else
       echo Dash make failed with error code $?
       exit 1
   fi
+  cd ../
 
-  #Setting openGL driver and GPU memory to 128mb
+  #Raspberry Pi addons 
   if $isRpi; then
-    sudo raspi-config nonint do_memory_split 128
-    if [[ $? -eq 0 ]]; then
-      echo -e Memory set to 128mb'\n'
+    read -p "Configure select Raspberry Pi enhancements? (y/N) " choice
+    if [[ $choice == "y" || $choice == "Y" ]]; then
+       ./rpi.sh
+       exit 0
     else
-      echo Setting memory failed with error code $? please set manually
-      exit 1
+       echo "Continuing"
     fi
-
-    sudo raspi-config nonint do_gldriver G2
-    if [[ $? -eq 0 ]]; then
-      echo -e OpenGL set ok'\n'
-    else
-      echo Setting openGL failed with error code $? please set manually
-      exit 1
-    fi
-
-    echo enabling krnbt to speed up boot and improve stability
-    cat <<EOT >> /boot/config.txt
-      dtparam=krnbt
-EOT
   fi
 
 
   #Start app
   echo Starting app
-  cd ../bin
-  ./dash
+  ./bin/dash
 fi

patches/aasdk_openssl-fips-fix.patch

@@ -0,0 +1,42 @@
+From 885a8c83ef4f813205fa21cd9e96228db94bcdd2 Mon Sep 17 00:00:00 2001
+From: "John EVANS (eva0034)" <[email protected]>
+Date: Sat, 6 Jan 2024 16:58:01 +1100
+Subject: [PATCH] Update SSLWrapper.cpp:
+
+fix sslwrapper.cpp for newer openssl compilation.
+---
+ src/Transport/SSLWrapper.cpp | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/Transport/SSLWrapper.cpp b/src/Transport/SSLWrapper.cpp
+index 6aca9b44..1c770bf8 100644
+--- a/src/Transport/SSLWrapper.cpp
++++ b/src/Transport/SSLWrapper.cpp
+@@ -33,13 +33,27 @@ SSLWrapper::SSLWrapper()
+ {
+     SSL_library_init();
+     SSL_load_error_strings();
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
++    /*
++    * ERR_load_*(), ERR_func_error_string(), ERR_get_error_line(), ERR_get_error_line_data(), ERR_get_state()
++    * OpenSSL now loads error strings automatically so these functions are not needed.
++    * SEE FOR MORE:
++    *   https://www.openssl.org/docs/manmaster/man7/migration_guide.html
++    *
++    */
++#else
+     ERR_load_BIO_strings();
++#endif
+     OpenSSL_add_all_algorithms();
+ }
+ 
+ SSLWrapper::~SSLWrapper()
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++    EVP_default_properties_enable_fips(nullptr, 0);
++#else
+     FIPS_mode_set(0);
++#endif
+     ENGINE_cleanup();
+     CONF_modules_unload(1);
+     EVP_cleanup();

patches/qt-gstreamer_atomic-load.patch

@@ -0,0 +1,13 @@
+diff --git a/elements/gstqtvideosink/gstqtvideosinkplugin.h b/elements/gstqtvideosink/gstqtvideosinkplugin.h
+index dc04671..a72c572 100644
+--- a/elements/gstqtvideosink/gstqtvideosinkplugin.h
++++ b/elements/gstqtvideosink/gstqtvideosinkplugin.h
+@@ -27,7 +27,7 @@ GST_DEBUG_CATEGORY_EXTERN(gst_qt_video_sink_debug);
+ #define DEFINE_TYPE_FULL(cpp_type, type_name, parent_type, additional_initializations) \
+     GType cpp_type::get_type() \
+     { \
+-        static volatile gsize gonce_data = 0; \
++        static gsize gonce_data = 0; \
+         if (g_once_init_enter(&gonce_data)) { \
+             GType type = 0; \
+             GTypeInfo info; \

rpi.sh

@@ -1,16 +1,14 @@
 #!/bin/bash
 
 #check if Raspian OS is active, otherwise kill script
-if [ -f /etc/rpi-issue ];
+if [ ! -f /etc/rpi-issue ]
 then
- echo "Great this script works for RaspberryPI OS"
-else
- echo "This script works only for an RaspberryPI OS"
+ echo "This script works only for Raspberry Pi OS"
  exit 1;
 fi
 
 display_version(){
-    echo "Version 0.2 RaspberryPI Dash additional install helpers"
+    echo "Version 0.3 Raspberry Pi Dash additional install helpers"
 }
 
 #########################
@@ -22,6 +20,9 @@ display_help() {
     echo "   -arb, --addrulebrightness        Add udev rules for brightness"
     echo "   -adi, --adddesktopicon           Add desktop icon"
     echo "   -asd, --autostartdaemon          Add autostart daemon"
+    echo "   -mem, --memorysplit              Set memory split"
+    echo "   -gl,  --gldriver                 Set GL driver"
+    echo "   -krn, --krnbt                    Set krnbt flag"
     echo "   -v, --version                    Show version of script"
     echo "   -h, --help                       Show help of script"
     echo
@@ -35,6 +36,16 @@ display_help() {
     echo "Example: Add autostart daemon on your RPI."
     echo "   rpi -asd"
     echo
+    echo "Example: Set memory split on your RPI."
+    echo "   rpi -mem 128"
+    echo
+    echo "Example: Set GL driver on your RPI."
+    echo "   rpi -gl [G2|G1]"
+    echo "   KMS (G2) / Fake KMS (G1)"
+    echo
+    echo "Example: Set krnbt flag on your RPI."
+    echo "   rpi -krn"
+    echo
     exit 1
 }
 
@@ -47,19 +58,35 @@ do
     #echo "$1"
     case "$1" in
         -arb | --addrulebrightness)
-            /bin/bash src/bash/brightness.sh
+            /bin/bash src/bash/rpi_helpers.sh setup_brightness_udev_rule
             exit 0
           ;;
         -adi | --adddesktopicon)
-            /bin/bash src/bash/desktop.sh
+            /bin/bash src/bash/rpi_helpers.sh add_desktop_icon
             exit 0
           ;;
         -asd | --autostartdaemon)
             if [ $# -ne 0 ]; then
-              /bin/bash src/bash/autostartdaemon.sh $2
+              /bin/bash src/bash/rpi_helpers.sh create_autostart_daemon $2
+              exit 0
+            fi
+          ;;
+        -mem | --memorysplit)
+            if [ $# -ne 0 ]; then
+              /bin/bash src/bash/rpi_helpers.sh set_memory_split $2
               exit 0
             fi
           ;;
+        -gl | --gldriver)
+            if [ $# -ne 0 ]; then
+              /bin/bash src/bash/rpi_helpers.sh set_opengl $2
+              exit 0
+            fi
+          ;;
+        -krn | --krnbt)
+            /bin/bash src/bash/rpi_helpers.sh enable_krnbt
+            exit 0
+          ;;          
         -h | --help)
             display_help  # Call your function
             exit 0
@@ -68,7 +95,10 @@ do
             display_version  # Call your function
             exit 0
           ;;
-
+        "")  # If $1 is blank, run display_help
+            display_help
+            exit 0
+          ;;
         --) # End of all options
             shift
             break