All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 288292c5 authored by Alex Orange's avatar Alex Orange

Add patches and check for argument being empty (which is valid).

parent b357a56a
#!/bin/bash
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake g++ libboost-all-dev libgmp-dev swig python3-numpy python3-mako python3-sphinx python3-lxml doxygen libfftw3-dev libcomedi-dev libsdl1.2-dev libgsl-dev libqwt-qt5-dev libqt5opengl5-dev python3-pyqt5 liblog4cpp5-dev libzmq3-dev python3-yaml
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake g++ libboost-all-dev libgmp-dev swig python3-numpy python3-mako python3-sphinx python3-lxml doxygen libfftw3-dev libcomedi-dev libsdl1.2-dev libgsl-dev libqwt-qt5-dev libqt5opengl5-dev python3-pyqt5 liblog4cpp5-dev libzmq3-dev python3-yaml python3-click python3-click-plugins
sudo mkdir /opt/gnuradio
sudo chown `id -u` /opt/gnuradio
......@@ -8,6 +8,36 @@ sudo chown `id -u` /opt/gnuradio
cd /opt/gnuradio
git clone --recursive http://gnuradio.org/git/gnuradio.git src
cd src
patch gr-uhd/apps/uhd_fft <<END
--- uhd_fft.orig 2019-06-24 18:23:26.793828539 -0600
+++ uhd_fft 2019-06-24 18:23:58.666742913 -0600
@@ -82,7 +82,8 @@
self.top_grid_layout = Qt.QGridLayout()
self.top_layout.addLayout(self.top_grid_layout)
self.settings = Qt.QSettings("GNU Radio", "uhd_fft")
- self.restoreGeometry(self.settings.value("geometry"))
+ if self.settings.value("geometry") is not None:
+ self.restoreGeometry(self.settings.value("geometry"))
##################################################
# Parameters
END
patch gr-uhd/apps/uhd_siggen_gui <<END
--- uhd_siggen_gui.orig 2019-06-24 18:23:35.134069293 -0600
+++ uhd_siggen_gui 2019-06-24 18:24:12.875228041 -0600
@@ -85,7 +85,8 @@
self.top_grid_layout = Qt.QGridLayout()
self.top_layout.addLayout(self.top_grid_layout)
self.settings = Qt.QSettings("GNU Radio", "uhd_siggen_gui")
- self.restoreGeometry(self.settings.value("geometry"))
+ if self.settings.value("geometry"):
+ self.restoreGeometry(self.settings.value("geometry"))
##################################################
# Widgets + Controls
END
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/gnuradio ../
......
......@@ -138,6 +138,8 @@ for i, x310_radio in enumerate(params.x310_radios.split(",")):
for i, b210_aggregate_component in \
enumerate(params.b210_aggregate_component_list.split(",")):
if len(b210_aggregate_component) == 0:
continue
b210_aggregate, b210_component_id = b210_aggregate_component.split("|")
b210_nuc_pair(i, b210_aggregate, b210_component_id)
......
......@@ -71,6 +71,19 @@ patch cmake/modules/SRSLTE_install_configs.sh.in <<END
echo " - \$source_path doesn't exists. Skipping it."
END
patch lib/src/phy/ue/ue_ul.c <<END
--- ue_ul.c.orig 2019-06-25 14:20:07.153153137 -0600
+++ ue_ul.c 2019-06-25 14:20:24.977239827 -0600
@@ -235,6 +235,7 @@
if (amp*norm_factor < 0.1) {
norm_factor = 0.1/amp;
}
+ norm_factor *= 3.0;
return norm_factor;
}
END
mkdir build
cd build
cmake -DENABLE_GUI=ON -DPC_SRSGUI_INCLUDEDIR=/opt/srsGUI/include -DPC_SRSGUI_LIBDIR=/opt/srsGUI/lib -DCMAKE_INSTALL_PREFIX:PATH=/opt/srsLTE ../
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment