From a982c86794fa8e503cc819fd983a0c93dce402ec Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Sun, 24 May 2020 17:28:48 +0200 Subject: [PATCH] update sdrplay patches; fix sdrplay service --- docker/Dockerfiles/Dockerfile-base | 2 +- .../files/sdrplay/install-lib.aarch64.patch | 30 +++-------- docker/files/sdrplay/install-lib.armv7l.patch | 51 +++++++++---------- docker/files/sdrplay/install-lib.x86_64.patch | 21 +++++++- docker/files/services/openwebrx/run | 2 - .../scripts/install-dependencies-sdrplay.sh | 4 +- 6 files changed, 53 insertions(+), 57 deletions(-) delete mode 100755 docker/files/services/openwebrx/run diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base index 3797cc7..654bf02 100644 --- a/docker/Dockerfiles/Dockerfile-base +++ b/docker/Dockerfiles/Dockerfile-base @@ -13,6 +13,6 @@ WORKDIR /opt/openwebrx VOLUME /etc/openwebrx -ADD docker/files/services/openwebrx /etc/services.d/openwebrx +CMD /opt/openwebrx/docker/scripts/run.sh EXPOSE 8073 diff --git a/docker/files/sdrplay/install-lib.aarch64.patch b/docker/files/sdrplay/install-lib.aarch64.patch index 6f1323d..1f3dc57 100644 --- a/docker/files/sdrplay/install-lib.aarch64.patch +++ b/docker/files/sdrplay/install-lib.aarch64.patch @@ -1,11 +1,12 @@ ---- sdrplay/install_lib.sh -+++ sdrplay/install_lib_patched.sh -@@ -4,20 +4,7 @@ +diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh +--- sdrplay-orig/install_lib.sh 2020-05-24 14:30:06.022483867 +0000 ++++ sdrplay/install_lib.sh 2020-05-24 14:30:49.093435726 +0000 +@@ -4,19 +4,6 @@ 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 @@ -17,25 +18,6 @@ - * ) 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 diff --git a/docker/files/sdrplay/install-lib.armv7l.patch b/docker/files/sdrplay/install-lib.armv7l.patch index 775ef89..22a78f6 100644 --- a/docker/files/sdrplay/install-lib.armv7l.patch +++ b/docker/files/sdrplay/install-lib.armv7l.patch @@ -1,11 +1,12 @@ ---- sdrplay/install_lib.sh -+++ sdrplay/install_lib_patched.sh -@@ -4,20 +4,7 @@ - export MAJVERS="3" +diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh +--- sdrplay-orig/install_lib.sh 2020-05-24 14:13:04.561271707 +0000 ++++ sdrplay/install_lib.sh 2020-05-24 14:16:20.068329040 +0000 +@@ -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 @@ -17,25 +18,23 @@ - * ) 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 + ARCH=`uname -m` + +@@ -141,16 +128,6 @@ + echo "SDRplay API ${VERS} Installation Finished" + echo " " + +-while true; do +- echo "Would you like to add SDRplay USB IDs to the local database for easier +-" +- read -p "identification in applications such as lsusb? [y/n] " yn +- case $yn in +- [Yy]* ) break;; +- [Nn]* ) exit;; +- * ) echo "Please answer y or n";; +- esac +-done + sudo cp scripts/sdrplay_usbids.sh ${INSTALLBINDIR}/. + sudo chmod 755 ${INSTALLBINDIR}/sdrplay_usbids.sh + sudo cp scripts/sdrplay_ids.txt ${INSTALLBINDIR}/. diff --git a/docker/files/sdrplay/install-lib.x86_64.patch b/docker/files/sdrplay/install-lib.x86_64.patch index 0666bf4..d66023b 100644 --- a/docker/files/sdrplay/install-lib.x86_64.patch +++ b/docker/files/sdrplay/install-lib.x86_64.patch @@ -1,5 +1,6 @@ ---- sdrplay/install_lib.sh -+++ sdrplay/install_lib_patched.sh +diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh +--- sdrplay-orig/install_lib.sh 2020-05-24 13:56:56.622000041 +0000 ++++ sdrplay/install_lib.sh 2020-05-24 13:58:51.837801559 +0000 @@ -4,19 +4,6 @@ MAJVERS="3" @@ -20,3 +21,19 @@ ARCH=`uname -m` OSDIST="Unknown" +@@ -157,15 +144,6 @@ + echo " " + echo "SDRplay API ${VERS} Installation Finished" + echo " " +-while true; do +- echo "Would you like to add SDRplay USB IDs to the local database for easier" +- read -p "identification in applications such as lsusb? [y/n] " yn +- case $yn in +- [Yy]* ) break;; +- [Nn]* ) exit;; +- * ) echo "Please answer y or n";; +- esac +-done + sudo cp scripts/sdrplay_usbids.sh ${INSTALLBINDIR}/. + sudo chmod 755 ${INSTALLBINDIR}/sdrplay_usbids.sh + sudo cp scripts/sdrplay_ids.txt ${INSTALLBINDIR}/. diff --git a/docker/files/services/openwebrx/run b/docker/files/services/openwebrx/run deleted file mode 100755 index 2c2b7fd..0000000 --- a/docker/files/services/openwebrx/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/execlineb -P -/opt/openwebrx/docker/scripts/run.sh \ No newline at end of file diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh index 151c031..d18fcc0 100755 --- a/docker/scripts/install-dependencies-sdrplay.sh +++ b/docker/scripts/install-dependencies-sdrplay.sh @@ -18,8 +18,8 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libusb-1.0.0 libudev1" -BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-dev" +STATIC_PACKAGES="libusb-1.0.0 udev" +BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev" apt-get update apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES