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

fix the sdrplay driver installation

Browse Source
This commit is contained in:
Jakob Ketterl 2019-01-22 17:25:46 +01:00
parent 8d10fc573f
commit 9953c7d1e1
3 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -5,7 +5,7 @@ ARCH=$(uname -m)
case $ARCH in case $ARCH in
x86_64) x86_64)
BASE_IMAGE=debian:stretch BASE_IMAGE=alpine
;; ;;
armv*) armv*)
BASE_IMAGE=arm32v6/alpine BASE_IMAGE=arm32v6/alpine

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

@ -20,7 +20,7 @@ BUILD_PACKAGES="git cmake make patch wget sudo udev gcc g++ libusb-dev"
apk add --no-cache $STATIC_PACKAGES apk add --no-cache $STATIC_PACKAGES
apk add --no-cache --virtual .build-deps $BUILD_PACKAGES apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
case $(arch) in case $(uname -m) in
x86_64) x86_64)
BINARY=SDRplay_RSP_API-Linux-2.13.1.run BINARY=SDRplay_RSP_API-Linux-2.13.1.run
;; ;;
@ -31,13 +31,13 @@ esac
wget http://www.sdrplay.com/software/$BINARY wget http://www.sdrplay.com/software/$BINARY
sh $BINARY --noexec --target sdrplay sh $BINARY --noexec --target sdrplay
patch -Np0 <<'EOF' patch --verbose -Np0 <<'EOF'
--- sdrplay/install_lib.sh 2018-06-20 23:57:02.000000000 +0000 --- sdrplay/install_lib.sh 2018-06-21 01:57:02.000000000 +0200
+++ sdrplay/install_lib_patched.sh 2019-01-13 17:52:56.723838354 +0000 +++ sdrplay/install_lib_patched.sh 2019-01-22 17:21:06.445804136 +0100
@@ -2,18 +2,6 @@ @@ -2,19 +2,7 @@
echo "Installing SDRplay RSP API library 2.13..." echo "Installing SDRplay RSP API library 2.13..."
-more sdrplay_license.txt -more sdrplay_license.txt
- -
-while true; do -while true; do
@ -50,9 +50,28 @@ patch -Np0 <<'EOF'
- esac - esac
-done -done
- -
export ARCH=`arch` -export ARCH=`arch`
+export ARCH=`uname -m`
export VERS="2.13" export VERS="2.13"
echo "Architecture: ${ARCH}"
@@ -60,16 +48,6 @@
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 from http://libusb.info"
- echo " "
- exit 1
-fi
#echo "Installing SoapySDRPlay..."
EOF EOF
cd sdrplay cd sdrplay
./install_lib.sh ./install_lib.sh

28
docker/scripts/install-lib.patch
View File

@ -1,6 +1,6 @@
--- sdrplay/install_lib.sh 2018-06-20 23:57:02.000000000 +0000 --- sdrplay/install_lib.sh 2018-06-21 01:57:02.000000000 +0200
+++ sdrplay/install_lib_patched.sh 2019-01-13 17:52:56.723838354 +0000 +++ sdrplay/install_lib_patched.sh 2019-01-22 17:21:06.445804136 +0100
@@ -2,18 +2,6 @@ @@ -2,19 +2,7 @@
echo "Installing SDRplay RSP API library 2.13..." echo "Installing SDRplay RSP API library 2.13..."
@ -16,7 +16,25 @@
- esac - esac
-done -done
- -
export ARCH=`arch` -export ARCH=`arch`
+export ARCH=`uname -m`
export VERS="2.13" export VERS="2.13"
echo "Architecture: ${ARCH}"
@@ -60,16 +48,6 @@
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 from http://libusb.info"
- echo " "
- exit 1
-fi
#echo "Installing SoapySDRPlay..."