From 69f72a15cb9ec1a5700b918d58e870b8c1a27761 Mon Sep 17 00:00:00 2001 From: Luigi Cruz Date: Wed, 12 Aug 2020 20:02:18 -0300 Subject: [PATCH] Fix GNU Radio installation path and UHD Udev rules. --- builder/stage4/05-pisdr-uhd/00-run.sh | 8 +++++--- builder/stage4/06-pisdr-gnuradio/00-run.sh | 6 ++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builder/stage4/05-pisdr-uhd/00-run.sh b/builder/stage4/05-pisdr-uhd/00-run.sh index 35b73f5..afe1575 100755 --- a/builder/stage4/05-pisdr-uhd/00-run.sh +++ b/builder/stage4/05-pisdr-uhd/00-run.sh @@ -15,8 +15,10 @@ cd build cmake -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \ -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \ -DCMAKE_ASM_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15" \ - -GNinja -DCMAKE_BUILD_TYPE=Release ../ + -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../ ninja install +cp /usr/lib/uhd/utils/uhd-usrp.rules /etc/udev/rules.d/ +udevadm control --reload-rules +udevadm trigger ldconfig -EOF - +EOF \ No newline at end of file diff --git a/builder/stage4/06-pisdr-gnuradio/00-run.sh b/builder/stage4/06-pisdr-gnuradio/00-run.sh index 5c27f85..c164fa9 100755 --- a/builder/stage4/06-pisdr-gnuradio/00-run.sh +++ b/builder/stage4/06-pisdr-gnuradio/00-run.sh @@ -13,9 +13,7 @@ git checkout maint-3.8 git submodule update --init --recursive mkdir -p build cd build -echo "export PYTHONPATH=/usr/local/lib/python3/dist-packages:\$PYTHONPATH" >> /home/${FIRST_USER_NAME}/.bashrc -cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 .. +cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. ninja install ldconfig -EOF - +EOF \ No newline at end of file