integrate s6 service layer for sdrplay

docker/files/js8call/js8call-hamlib.patch

@@ -0,0 +1,43 @@
+diff -ur js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake js8call-2.1.1/CMake/Modules/Findhamlib.cmake
+--- js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake	2020-05-23 15:38:20.730349612 +0000
++++ js8call-2.1.1/CMake/Modules/Findhamlib.cmake	2020-05-23 15:39:28.829772207 +0000
+@@ -78,4 +78,4 @@
+ # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
+ # TRUE if all listed variables are TRUE
+ include (FindPackageHandleStandardArgs)
+-find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
++find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
+diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
+--- js8call-2.1.1-orig/CMakeLists.txt	2020-05-23 15:38:20.730349612 +0000
++++ js8call-2.1.1/CMakeLists.txt	2020-05-23 15:52:46.103389553 +0000
+@@ -683,7 +683,7 @@
+ #
+ # libhamlib setup
+ #
+-set (hamlib_STATIC 1)
++set (hamlib_STATIC 0)
+ find_package (hamlib 3 REQUIRED)
+ find_program (RIGCTL_EXE rigctl)
+ find_program (RIGCTLD_EXE rigctld)
+@@ -1106,20 +1106,6 @@
+   BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+   )
+ 
+-install (PROGRAMS
+-  ${RIGCTL_EXE}
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  #COMPONENT runtime
+-  RENAME rigctl-local${CMAKE_EXECUTABLE_SUFFIX}
+-  )
+-
+-install (PROGRAMS
+-  ${RIGCTLD_EXE}
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  #COMPONENT runtime
+-  RENAME rigctld-local${CMAKE_EXECUTABLE_SUFFIX}
+-  )
+-
+ install (FILES
+   README
+   COPYING
+Only in js8call-2.1.1/: hamlib.patch

docker/files/sdrplay/install-lib.aarch64.patch

@@ -0,0 +1,41 @@
+--- sdrplay/install_lib.sh
++++ sdrplay/install_lib_patched.sh
+@@ -4,20 +4,7 @@
+ export MAJVERS="3"
+ 
+ echo "Installing SDRplay RSP API library ${VERS}..."
+-read -p "Press RETURN to view the license agreement" ret
+ 
+-more sdrplay_license.txt
+-
+-while true; do
+-    echo "Press y and RETURN to accept the license agreement and continue with"
+-    read -p "the installation, or press n and RETURN to exit the installer [y/n] " yn
+-    case $yn in
+-        [Yy]* ) break;;
+-        [Nn]* ) exit;;
+-        * ) echo "Please answer y or n";;
+-    esac
+-done
+-
+ export ARCH=`uname -m`
+ 
+ echo "Architecture: ${ARCH}"
+@@ -46,17 +33,6 @@
+ 	echo "ERROR: udev rules directory not found, add udev support and run the"
+ 	echo "installer again. udev support can be added by running..."
+ 	echo "sudo apt-get install libudev-dev"
+-	echo " "
+-	exit 1
+-fi
+-
+-if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then
+-	echo "Libusb found, continuing..."
+-else
+-	echo " "
+-	echo "ERROR: Libusb cannot be found. Please install libusb and then run"
+-	echo "the installer again. Libusb can be installed by running..."
+-    echo "sudo apt-get install libusb-1.0.0-dev"
+ 	echo " "
+ 	exit 1
+ fi

docker/files/sdrplay/install-lib.armv7l.patch

@@ -0,0 +1,41 @@
+--- sdrplay/install_lib.sh
++++ sdrplay/install_lib_patched.sh
+@@ -4,20 +4,7 @@
+ export MAJVERS="3"
+ 
+ echo "Installing SDRplay RSP API library ${VERS}..."
+-read -p "Press RETURN to view the license agreement" ret
+ 
+-more sdrplay_license.txt
+-
+-while true; do
+-    echo "Press y and RETURN to accept the license agreement and continue with"
+-    read -p "the installation, or press n and RETURN to exit the installer [y/n] " yn
+-    case $yn in
+-        [Yy]* ) break;;
+-        [Nn]* ) exit;;
+-        * ) echo "Please answer y or n";;
+-    esac
+-done
+-
+ export ARCH=`uname -m`
+ 
+ echo "Architecture: ${ARCH}"
+@@ -44,17 +31,6 @@
+ 	echo "ERROR: udev rules directory not found, add udev support and run the"
+ 	echo "installer again. udev support can be added by running..."
+ 	echo "sudo apt-get install libudev-dev"
+-	echo " "
+-	exit 1
+-fi
+-
+-if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then
+-	echo "Libusb found, continuing..."
+-else
+-	echo " "
+-	echo "ERROR: Libusb cannot be found. Please install libusb and then run"
+-	echo "the installer again. Libusb can be installed by running..."
+-    echo "sudo apt-get install libusb-1.0.0-dev"
+ 	echo " "
+ 	exit 1
+ fi

docker/files/sdrplay/install-lib.x86_64.patch

@@ -0,0 +1,22 @@
+--- sdrplay/install_lib.sh
++++ sdrplay/install_lib_patched.sh
+@@ -4,19 +4,6 @@
+ MAJVERS="3"
+ 
+ echo "Installing SDRplay RSP API library ${VERS}..."
+-read -p "Press RETURN to view the license agreement" ret
+-
+-more sdrplay_license.txt
+-
+-while true; do
+-    echo "Press y and RETURN to accept the license agreement and continue with"
+-    read -p "the installation, or press n and RETURN to exit the installer [y/n] " yn
+-    case $yn in
+-        [Yy]* ) break;;
+-        [Nn]* ) exit;;
+-        * ) echo "Please answer y or n";;
+-    esac
+-done
+ 
+ ARCH=`uname -m`
+ OSDIST="Unknown"

docker/files/services/openwebrx/run

@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+/opt/openwebrx/docker/scripts/run.sh

docker/files/services/sdrplay/run

@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+/usr/local/bin/sdrplay_apiService