Merge pull request #30 from luigifreitas/refresh.1

PiSDR 4.0 Refresh 1 - Summer Update
luigifcruz · Aug 1, 2020 · 17f9cff · 17f9cff
2 parents c37a60e + 8c599f8
commit 17f9cff
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 73 deletions.
diff --git a/builder/stage4/05-pisdr-gnuradio/00-run.sh b/builder/stage4/05-pisdr-gnuradio/00-run.sh
@@ -4,6 +4,22 @@ on_chroot << EOF
 mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
+if [ ! -d "volk" ]; then
+    git clone --recursive https://github.com/gnuradio/volk.git
+fi
+
+cd volk
+mkdir -p build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release ../
+make -j$(nproc) install
+ldconfig
+EOF
+
+on_chroot << EOF
+mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
 if [ ! -d "gnuradio" ]; then
     git clone --recursive https://github.com/gnuradio/gnuradio.git
 fi
@@ -12,7 +28,8 @@ cd gnuradio
 git checkout maint-3.7
 mkdir -p build
 cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python ../
+cmake -DENABLE_INTERNAL_VOLK=OFF -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python ../
 make -j$(nproc) install
 ldconfig
 EOF
+
diff --git a/builder/stage4/12-pisdr-plutosdr/00-run.sh b/builder/stage4/12-pisdr-plutosdr/00-run.sh
diff --git a/builder/stage4/12-pisdr-plutosdr/01-run.sh b/builder/stage4/12-pisdr-plutosdr/01-run.sh
diff --git a/builder/stage4/12-pisdr-plutosdr/02-run.sh b/builder/stage4/12-pisdr-plutosdr/02-run.sh
diff --git a/builder/stage4/12-pisdr-plutosdr/03-run.sh b/builder/stage4/12-pisdr-plutosdr/03-run.sh
diff --git a/builder/stage4/16-pisdr-sdrangel/00-run.sh b/builder/stage4/16-pisdr-sdrangel/00-run.sh
@@ -9,10 +9,10 @@ if [ ! -d "cm256cc" ]; then
 fi
 
 cd cm256cc
-git reset --hard f21e8bc1e9afdb0b28672743dcec111aec1d32d9
+git reset --hard c0e92b92aca3d1d36c990b642b937c64d363c559
 mkdir -p build
 cd build
 cmake ../
 make -j$(nproc) install
 ldconfig
-EOF
+EOF
diff --git a/builder/stage4/16-pisdr-sdrangel/03-run.sh b/builder/stage4/16-pisdr-sdrangel/03-run.sh
@@ -9,10 +9,10 @@ if [ ! -d "dsdcc" ]; then
 fi
 
 cd dsdcc
-git reset --hard "v1.8.6"
+git reset --hard "v1.9.0"
 mkdir -p build
 cd build
 cmake -DUSE_MBELIB=ON  ../
 make -j$(nproc) install
 ldconfig
-EOF
+EOF