joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update sdrplay patches; fix sdrplay service

Browse Source
This commit is contained in:
Jakob Ketterl 2020-05-24 17:28:48 +02:00
parent 6c307d885f
commit a982c86794
6 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfiles/Dockerfile-base
View File

@ -13,6 +13,6 @@ WORKDIR /opt/openwebrx
VOLUME /etc/openwebrx VOLUME /etc/openwebrx
ADD docker/files/services/openwebrx /etc/services.d/openwebrx CMD /opt/openwebrx/docker/scripts/run.sh
EXPOSE 8073 EXPOSE 8073

30
docker/files/sdrplay/install-lib.aarch64.patch
View File

@ -1,11 +1,12 @@
--- sdrplay/install_lib.sh diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
+++ sdrplay/install_lib_patched.sh --- sdrplay-orig/install_lib.sh 2020-05-24 14:30:06.022483867 +0000
@@ -4,20 +4,7 @@ +++ sdrplay/install_lib.sh 2020-05-24 14:30:49.093435726 +0000
@@ -4,19 +4,6 @@
export MAJVERS="3" export MAJVERS="3"
echo "Installing SDRplay RSP API library ${VERS}..." echo "Installing SDRplay RSP API library ${VERS}..."
-read -p "Press RETURN to view the license agreement" ret -read -p "Press RETURN to view the license agreement" ret
-
-more sdrplay_license.txt -more sdrplay_license.txt
- -
-while true; do -while true; do
@ -17,25 +18,6 @@
- * ) echo "Please answer y or n";; - * ) echo "Please answer y or n";;
- esac - esac
-done -done
-
export ARCH=`uname -m` 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

51
docker/files/sdrplay/install-lib.armv7l.patch
View File

@ -1,11 +1,12 @@
--- sdrplay/install_lib.sh diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
+++ sdrplay/install_lib_patched.sh --- sdrplay-orig/install_lib.sh 2020-05-24 14:13:04.561271707 +0000
@@ -4,20 +4,7 @@ +++ sdrplay/install_lib.sh 2020-05-24 14:16:20.068329040 +0000
export MAJVERS="3" @@ -4,19 +4,6 @@
MAJVERS="3"
echo "Installing SDRplay RSP API library ${VERS}..." echo "Installing SDRplay RSP API library ${VERS}..."
-read -p "Press RETURN to view the license agreement" ret -read -p "Press RETURN to view the license agreement" ret
-
-more sdrplay_license.txt -more sdrplay_license.txt
- -
-while true; do -while true; do
@ -17,25 +18,23 @@
- * ) echo "Please answer y or n";; - * ) echo "Please answer y or n";;
- esac - esac
-done -done
-
export ARCH=`uname -m`
echo "Architecture: ${ARCH}" ARCH=`uname -m`
@@ -44,17 +31,6 @@
echo "ERROR: udev rules directory not found, add udev support and run the" @@ -141,16 +128,6 @@
echo "installer again. udev support can be added by running..." echo "SDRplay API ${VERS} Installation Finished"
echo "sudo apt-get install libudev-dev" echo " "
- echo " "
- exit 1 -while true; do
-fi - echo "Would you like to add SDRplay USB IDs to the local database for easier
- -"
-if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then - read -p "identification in applications such as lsusb? [y/n] " yn
- echo "Libusb found, continuing..." - case $yn in
-else - [Yy]* ) break;;
- echo " " - [Nn]* ) exit;;
- echo "ERROR: Libusb cannot be found. Please install libusb and then run" - * ) echo "Please answer y or n";;
- echo "the installer again. Libusb can be installed by running..." - esac
- echo "sudo apt-get install libusb-1.0.0-dev" -done
echo " " sudo cp scripts/sdrplay_usbids.sh ${INSTALLBINDIR}/.
exit 1 sudo chmod 755 ${INSTALLBINDIR}/sdrplay_usbids.sh
fi sudo cp scripts/sdrplay_ids.txt ${INSTALLBINDIR}/.

21
docker/files/sdrplay/install-lib.x86_64.patch
View File

@ -1,5 +1,6 @@
--- sdrplay/install_lib.sh diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
+++ sdrplay/install_lib_patched.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 @@ @@ -4,19 +4,6 @@
MAJVERS="3" MAJVERS="3"
@ -20,3 +21,19 @@
ARCH=`uname -m` ARCH=`uname -m`
OSDIST="Unknown" 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}/.

2
docker/files/services/openwebrx/run
View File

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

4
docker/scripts/install-dependencies-sdrplay.sh
View File

@ -18,8 +18,8 @@ function cmakebuild() {
cd /tmp cd /tmp
STATIC_PACKAGES="libusb-1.0.0 libudev1" STATIC_PACKAGES="libusb-1.0.0 udev"
BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-dev" BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev"
apt-get update apt-get update
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES